[release/3.0] fix #6949 (#6953)

* fix #6949

* add MoveForwardToAttribute to assembly.cs and fix search space sub namespace

---------

Co-authored-by: XiaoYun Zhang <[email protected]>

Author: github-actions[bot]

src/Microsoft.ML.Core/SearchSpace/BoolearnChoiceAttribute.cs

@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.ML.SearchSpace;
+
+/// <summary>
+/// Boolean choice attribute
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+public sealed class BooleanChoiceAttribute : Attribute
+{
+    /// <summary>
+    /// Create a <see cref="BooleanChoiceAttribute"/>.
+    /// </summary>
+    public BooleanChoiceAttribute()
+    {
+        DefaultValue = true;
+    }
+
+    /// <summary>
+    /// Create a <see cref="BooleanChoiceAttribute"/> with default value.
+    /// </summary>
+    /// <param name="defaultValue">default value for this option.</param>
+    public BooleanChoiceAttribute(bool defaultValue)
+    {
+        DefaultValue = defaultValue;
+    }
+
+    public bool DefaultValue { get; }
+}

src/Microsoft.ML.Core/SearchSpace/ChoiceAttribute.cs

@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Diagnostics.Contracts;
+using System.Linq;
+
+namespace Microsoft.ML.SearchSpace;
+
+/// <summary>
+/// Choice attribute
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+public sealed class ChoiceAttribute : Attribute
+{
+    /// <summary>
+    /// Create a <see cref="ChoiceAttribute"/> with <paramref name="candidates"/>.
+    /// </summary>
+    public ChoiceAttribute(params object[] candidates)
+    {
+        var candidatesType = candidates.Select(o => o.GetType()).Distinct();
+        Contract.Assert(candidatesType.Count() == 1, "multiple candidates type detected");
+        this.Candidates = candidates;
+        this.DefaultValue = null;
+    }
+
+    /// <summary>
+    /// Create a <see cref="ChoiceAttribute"/> with <paramref name="candidates"/> and <paramref name="defaultValue"/>.
+    /// </summary>
+    public ChoiceAttribute(object[] candidates, object defaultValue)
+    {
+        var candidatesType = candidates.Select(o => o.GetType()).Distinct();
+        Contract.Assert(candidatesType.Count() == 1, "multiple candidates type detected");
+        Contract.Assert(candidatesType.First() == defaultValue.GetType(), "candidates type doesn't match with defaultValue type");
+
+        this.Candidates = candidates;
+        this.DefaultValue = defaultValue;
+    }
+
+    /// <summary>
+    /// Get the candidates of this option.
+    /// </summary>
+    public object[] Candidates { get; }
+
+    /// <summary>
+    /// Get the default value of this option.
+    /// </summary>
+    public object DefaultValue { get; }
+}

src/Microsoft.ML.Core/SearchSpace/NestOptionAttribute.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.ML.SearchSpace;
+
+/// <summary>
+/// attribution class for nest option.
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+public sealed class NestOptionAttribute : Attribute
+{
+    /// <summary>
+    /// Create an <see cref="NestOptionAttribute"/>.
+    /// </summary>
+    public NestOptionAttribute()
+    {
+    }
+}

src/Microsoft.ML.Core/SearchSpace/RangeAttribute.cs

@@ -0,0 +1,88 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.ML.SearchSpace;
+
+/// <summary>
+/// Range attribute
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+public sealed class RangeAttribute : Attribute
+{
+    /// <summary>
+    /// Create a <see cref="RangeAttribute"/>
+    /// </summary>
+    public RangeAttribute(double min, double max, bool logBase = false)
+    {
+        this.Min = min;
+        this.Max = max;
+        this.Init = null;
+        this.LogBase = logBase;
+    }
+
+    /// <summary>
+    /// Create a <see cref="RangeAttribute"/>
+    /// </summary>
+    public RangeAttribute(double min, double max, double init, bool logBase = false)
+    {
+        this.Min = min;
+        this.Max = max;
+        this.Init = init;
+        this.LogBase = logBase;
+    }
+
+    /// <summary>
+    /// Create a <see cref="RangeAttribute"/>
+    /// </summary>
+    public RangeAttribute(int min, int max, bool logBase = false)
+    {
+        this.Min = min;
+        this.Max = max;
+        this.Init = null;
+        this.LogBase = logBase;
+    }
+
+    /// <summary>
+    /// Create a <see cref="RangeAttribute"/>
+    /// </summary>
+    public RangeAttribute(int min, int max, int init, bool logBase = false)
+    {
+        this.Min = min;
+        this.Max = max;
+        this.Init = init;
+        this.LogBase = logBase;
+    }
+
+    /// <summary>
+    /// Create a <see cref="RangeAttribute"/>
+    /// </summary>
+    public RangeAttribute(float min, float max, bool logBase = false)
+    {
+        this.Min = min;
+        this.Max = max;
+        this.Init = null;
+        this.LogBase = logBase;
+    }
+
+    /// <summary>
+    /// Create a <see cref="RangeAttribute"/>
+    /// </summary>
+    public RangeAttribute(float min, float max, float init, bool logBase = false)
+    {
+        this.Min = min;
+        this.Max = max;
+        this.Init = init;
+        this.LogBase = logBase;
+    }
+
+    public object Min { get; }
+
+    public object Max { get; }
+
+    public object Init { get; }
+
+    public bool LogBase { get; }
+}

src/Microsoft.ML.SearchSpace/Assembly.cs

@@ -8,3 +8,7 @@
 [assembly: InternalsVisibleTo("Microsoft.ML.SearchSpace.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
 [assembly: InternalsVisibleTo("Microsoft.ML.AutoML, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
 
+[assembly: TypeForwardedTo(typeof(Microsoft.ML.SearchSpace.BooleanChoiceAttribute))]
+[assembly: TypeForwardedTo(typeof(Microsoft.ML.SearchSpace.ChoiceAttribute))]
+[assembly: TypeForwardedTo(typeof(Microsoft.ML.SearchSpace.NestOptionAttribute))]
+[assembly: TypeForwardedTo(typeof(Microsoft.ML.SearchSpace.RangeAttribute))]

src/Microsoft.ML.SearchSpace/Attribute/BooleanChoiceAttribute.cs

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
   </ItemGroup>
 </Project>