From 872f4f0641f8a80654ba6ade355b679c5fc9f22b Mon Sep 17 00:00:00 2001 From: Ivan Matantsev Date: Thu, 31 May 2018 13:14:49 -0700 Subject: [PATCH 1/3] add missing subcomponents --- src/Microsoft.ML.Sweeper/AsyncSweeper.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Microsoft.ML.Sweeper/AsyncSweeper.cs b/src/Microsoft.ML.Sweeper/AsyncSweeper.cs index 9edf1393e2..87ca777432 100644 --- a/src/Microsoft.ML.Sweeper/AsyncSweeper.cs +++ b/src/Microsoft.ML.Sweeper/AsyncSweeper.cs @@ -14,6 +14,10 @@ using Microsoft.ML.Runtime.Internal.Utilities; using Microsoft.ML.Runtime.Sweeper; +[assembly: LoadableClass(typeof(DeterministicSweeperAsync), typeof(DeterministicSweeperAsync.Arguments), typeof(SignatureAsyncSweeper), + "Asynchronous and Deterministic Sweeper", "DeterministicSweeper", "Deterministic")] +[assembly: LoadableClass(typeof(SimpleAsyncSweeper), typeof(RandomGridSweeper.Arguments), typeof(SignatureAsyncSweeper), + "Asynchronous Random Grid Sweeper", "RandomGridSweeper", "RandomGrid")] [assembly: LoadableClass(typeof(DeterministicSweeperAsync), typeof(DeterministicSweeperAsync.Arguments), typeof(SignatureAsyncSweeper), "Asynchronous and Deterministic Sweeper", "DeterministicSweeper", "Deterministic")] From c6b1b3634b6581ad983d2f50da41dcd6e597a47b Mon Sep 17 00:00:00 2001 From: Ivan Matantsev Date: Thu, 31 May 2018 13:19:17 -0700 Subject: [PATCH 2/3] right one --- src/Microsoft.ML.Sweeper/AsyncSweeper.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.ML.Sweeper/AsyncSweeper.cs b/src/Microsoft.ML.Sweeper/AsyncSweeper.cs index 87ca777432..e325846f6f 100644 --- a/src/Microsoft.ML.Sweeper/AsyncSweeper.cs +++ b/src/Microsoft.ML.Sweeper/AsyncSweeper.cs @@ -8,14 +8,13 @@ using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; -using Microsoft.ML; using Microsoft.ML.Runtime; using Microsoft.ML.Runtime.CommandLine; using Microsoft.ML.Runtime.Internal.Utilities; using Microsoft.ML.Runtime.Sweeper; -[assembly: LoadableClass(typeof(DeterministicSweeperAsync), typeof(DeterministicSweeperAsync.Arguments), typeof(SignatureAsyncSweeper), - "Asynchronous and Deterministic Sweeper", "DeterministicSweeper", "Deterministic")] +[assembly: LoadableClass(typeof(SimpleAsyncSweeper), typeof(SweeperBase.ArgumentsBase), typeof(SignatureAsyncSweeper), + "Asynchronous Uniform Random Sweeper", "UniformRandomSweeper", "UniformRandom")] [assembly: LoadableClass(typeof(SimpleAsyncSweeper), typeof(RandomGridSweeper.Arguments), typeof(SignatureAsyncSweeper), "Asynchronous Random Grid Sweeper", "RandomGridSweeper", "RandomGrid")] [assembly: LoadableClass(typeof(DeterministicSweeperAsync), typeof(DeterministicSweeperAsync.Arguments), typeof(SignatureAsyncSweeper), From e9e051c4557bb0b816e3640e72923ae159cf8255 Mon Sep 17 00:00:00 2001 From: Ivan Matantsev Date: Thu, 31 May 2018 13:23:46 -0700 Subject: [PATCH 3/3] more cleanup --- src/Microsoft.ML.Sweeper/Algorithms/Grid.cs | 9 ++++++--- src/Microsoft.ML.Sweeper/Algorithms/Random.cs | 6 ------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Microsoft.ML.Sweeper/Algorithms/Grid.cs b/src/Microsoft.ML.Sweeper/Algorithms/Grid.cs index 6cb2b2b4c2..543f2ac718 100644 --- a/src/Microsoft.ML.Sweeper/Algorithms/Grid.cs +++ b/src/Microsoft.ML.Sweeper/Algorithms/Grid.cs @@ -2,16 +2,19 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Float = System.Single; -using System; using System.Collections.Generic; using System.Linq; -using Microsoft.ML; +using Microsoft.ML.Runtime; using Microsoft.ML.Runtime.CommandLine; using Microsoft.ML.Runtime.Internal.Utilities; using Microsoft.ML.Runtime.Sweeper; +[assembly: LoadableClass(typeof(RandomGridSweeper), typeof(RandomGridSweeper.Arguments), typeof(SignatureSweeper), + "Random Grid Sweeper", "RandomGridSweeper", "RandomGrid")] +[assembly: LoadableClass(typeof(RandomGridSweeper), typeof(RandomGridSweeper.Arguments), typeof(SignatureSweeperFromParameterList), + "Random Grid Sweeper", "RandomGridSweeperParamList", "RandomGridpl")] + namespace Microsoft.ML.Runtime.Sweeper { /// diff --git a/src/Microsoft.ML.Sweeper/Algorithms/Random.cs b/src/Microsoft.ML.Sweeper/Algorithms/Random.cs index e6673bb38e..fd40de3cda 100644 --- a/src/Microsoft.ML.Sweeper/Algorithms/Random.cs +++ b/src/Microsoft.ML.Sweeper/Algorithms/Random.cs @@ -2,14 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Float = System.Single; - -using System; -using System.Collections.Generic; using System.Linq; -using Microsoft.ML; using Microsoft.ML.Runtime; -using Microsoft.ML.Runtime.CommandLine; using Microsoft.ML.Runtime.Sweeper; [assembly: LoadableClass(typeof(UniformRandomSweeper), typeof(SweeperBase.ArgumentsBase), typeof(SignatureSweeper),