Skip to content

Commit b790195

Browse files
authored
Rename the static pipeline namespace. (#1007)
* Microsoft.ML.Data.StaticPipe to Microsoft.ML.StaticPipe. * Columns now in StaticPipe as opposed to StaticPipe.Runtime.
1 parent 5874e16 commit b790195

File tree

56 files changed

+92
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+92
-82
lines changed

src/Microsoft.ML.Analyzer/TypeIsSchemaShapeAnalyzer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ internal static class ShapeParameterDiagnostic
4747
DiagnosticSeverity.Error, isEnabledByDefault: true, description: Description);
4848
}
4949

50-
private const string AttributeName = "Microsoft.ML.Data.StaticPipe.IsShapeAttribute";
51-
private const string LeafTypeName = "Microsoft.ML.Data.StaticPipe.Runtime.PipelineColumn";
50+
private const string AttributeName = "Microsoft.ML.StaticPipe.IsShapeAttribute";
51+
private const string LeafTypeName = "Microsoft.ML.StaticPipe.PipelineColumn";
5252

5353
public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics =>
5454
ImmutableArray.Create(ShapeDiagnostic.Rule, ShapeParameterDiagnostic.Rule);

src/Microsoft.ML.Data/DataLoadSave/Text/TextLoaderStatic.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using System;
66
using System.Collections.Generic;
77
using Microsoft.ML.Core.Data;
8-
using Microsoft.ML.Data.StaticPipe;
9-
using Microsoft.ML.Data.StaticPipe.Runtime;
8+
using Microsoft.ML.StaticPipe;
9+
using Microsoft.ML.StaticPipe.Runtime;
1010

1111
namespace Microsoft.ML.Runtime.Data
1212
{

src/Microsoft.ML.Data/Evaluators/BinaryClassifierEvaluator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using System;
66
using System.Collections.Generic;
77
using System.Linq;
8-
using Microsoft.ML.Data.StaticPipe;
9-
using Microsoft.ML.Data.StaticPipe.Runtime;
108
using Microsoft.ML.Runtime;
119
using Microsoft.ML.Runtime.CommandLine;
1210
using Microsoft.ML.Runtime.Data;

src/Microsoft.ML.Data/Evaluators/EvaluatorStaticExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6-
using Microsoft.ML.Data.StaticPipe;
7-
using Microsoft.ML.Data.StaticPipe.Runtime;
86
using Microsoft.ML.Runtime.Training;
7+
using Microsoft.ML.StaticPipe;
8+
using Microsoft.ML.StaticPipe.Runtime;
99

1010
namespace Microsoft.ML.Runtime.Data
1111
{

src/Microsoft.ML.Data/Evaluators/MulticlassClassifierEvaluator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Microsoft.ML.Data.StaticPipe;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
75
using Microsoft.ML.Runtime;
86
using Microsoft.ML.Runtime.CommandLine;
97
using Microsoft.ML.Runtime.Data;

src/Microsoft.ML.Data/Evaluators/RegressionEvaluator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
using System;
88
using System.Collections.Generic;
9-
using Microsoft.ML.Data.StaticPipe.Runtime;
10-
using Microsoft.ML.Data.StaticPipe;
119
using Microsoft.ML.Runtime;
1210
using Microsoft.ML.Runtime.CommandLine;
1311
using Microsoft.ML.Runtime.Data;

src/Microsoft.ML.Data/StaticPipe/Attributes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66

7-
namespace Microsoft.ML.Data.StaticPipe
7+
namespace Microsoft.ML.StaticPipe
88
{
99
/// <summary>
1010
/// An indicator to the analyzer that this type parameter ought to be a valid schema-shape object (e.g., a leaf-tuple, or

src/Microsoft.ML.Data/StaticPipe/DataReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime;
87
using Microsoft.ML.Runtime.Data;
8+
using Microsoft.ML.StaticPipe.Runtime;
99

10-
namespace Microsoft.ML.Data.StaticPipe
10+
namespace Microsoft.ML.StaticPipe
1111
{
1212
public sealed class DataReader<TIn, TTupleShape> : SchemaBearing<TTupleShape>
1313
{

src/Microsoft.ML.Data/StaticPipe/DataReaderEstimator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime;
87
using Microsoft.ML.Runtime.Data;
8+
using Microsoft.ML.StaticPipe.Runtime;
99

10-
namespace Microsoft.ML.Data.StaticPipe
10+
namespace Microsoft.ML.StaticPipe
1111
{
1212
public sealed class DataReaderEstimator<TIn, TTupleShape, TDataReader> : SchemaBearing<TTupleShape>
1313
where TDataReader : class, IDataReader<TIn>

src/Microsoft.ML.Data/StaticPipe/DataView.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using Microsoft.ML.Data;
56
using Microsoft.ML.Runtime;
67
using Microsoft.ML.Runtime.Data;
7-
using Microsoft.ML.Data.StaticPipe.Runtime;
8+
using Microsoft.ML.StaticPipe.Runtime;
89
using System.Collections.Generic;
910
using System;
1011

11-
namespace Microsoft.ML.Data.StaticPipe
12+
namespace Microsoft.ML.StaticPipe
1213
{
1314
public class DataView<TTupleShape> : SchemaBearing<TTupleShape>
1415
{

src/Microsoft.ML.Data/StaticPipe/Estimator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
using System;
66
using System.Collections.Generic;
77
using Microsoft.ML.Core.Data;
8-
using Microsoft.ML.Data.StaticPipe.Runtime;
98
using Microsoft.ML.Runtime;
109
using Microsoft.ML.Runtime.Data;
10+
using Microsoft.ML.StaticPipe.Runtime;
1111

12-
namespace Microsoft.ML.Data.StaticPipe
12+
namespace Microsoft.ML.StaticPipe
1313
{
1414
public sealed class Estimator<TTupleInShape, TTupleOutShape, TTransformer> : SchemaBearing<TTupleOutShape>
1515
where TTransformer : class, ITransformer

src/Microsoft.ML.Data/StaticPipe/PipelineColumn.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
using Microsoft.ML.Core.Data;
66
using Microsoft.ML.Runtime;
77
using Microsoft.ML.Runtime.Data;
8+
using Microsoft.ML.StaticPipe.Runtime;
89

9-
namespace Microsoft.ML.Data.StaticPipe.Runtime
10+
namespace Microsoft.ML.StaticPipe
1011
{
1112
/// <summary>
1213
/// This class is used as a type marker for <see cref="IDataView"/> producing structures for use in the statically

src/Microsoft.ML.Data/StaticPipe/Reconciler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Microsoft.ML.Runtime;
99
using Microsoft.ML.Runtime.Data;
1010

11-
namespace Microsoft.ML.Data.StaticPipe.Runtime
11+
namespace Microsoft.ML.StaticPipe.Runtime
1212
{
1313
/// <summary>
1414
/// An object for <see cref="PipelineColumn"/> instances to indicate to the analysis code for static pipelines that

src/Microsoft.ML.Data/StaticPipe/SchemaAssertionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using Microsoft.ML.Runtime.Data;
66

7-
namespace Microsoft.ML.Data.StaticPipe.Runtime
7+
namespace Microsoft.ML.StaticPipe.Runtime
88
{
99
/// <summary>
1010
/// An object for declaring a schema-shape. This is mostly commonly used in situations where a user is

src/Microsoft.ML.Data/StaticPipe/SchemaBearing.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System;
6-
using System.Collections.Generic;
7-
using System.Threading;
85
using Microsoft.ML.Core.Data;
9-
using Microsoft.ML.Data.StaticPipe.Runtime;
106
using Microsoft.ML.Runtime;
117
using Microsoft.ML.Runtime.Data;
8+
using Microsoft.ML.StaticPipe.Runtime;
9+
using System.Threading;
1210

13-
namespace Microsoft.ML.Data.StaticPipe
11+
namespace Microsoft.ML.StaticPipe
1412
{
1513
/// <summary>
1614
/// A base class for the statically-typed pipeline components, that are marked as producing

src/Microsoft.ML.Data/StaticPipe/StaticPipeExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
using Microsoft.ML.Runtime.Data;
66
using System;
7-
using Microsoft.ML.Data.StaticPipe.Runtime;
87
using Microsoft.ML.Runtime;
98
using Microsoft.ML.Core.Data;
9+
using Microsoft.ML.StaticPipe.Runtime;
1010

11-
namespace Microsoft.ML.Data.StaticPipe
11+
namespace Microsoft.ML.StaticPipe
1212
{
1313
public static class StaticPipeExtensions
1414
{

src/Microsoft.ML.Data/StaticPipe/StaticPipeInternalUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Microsoft.ML.Runtime;
1212
using Microsoft.ML.Runtime.Internal.Utilities;
1313

14-
namespace Microsoft.ML.Data.StaticPipe.Runtime
14+
namespace Microsoft.ML.StaticPipe.Runtime
1515
{
1616
/// <summary>
1717
/// Utility functions useful for the internal implementations of the key pipeline utilities.

src/Microsoft.ML.Data/StaticPipe/StaticPipeUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Microsoft.ML.Runtime;
1111
using Microsoft.ML.Runtime.Data;
1212

13-
namespace Microsoft.ML.Data.StaticPipe.Runtime
13+
namespace Microsoft.ML.StaticPipe.Runtime
1414
{
1515
/// <summary>
1616
/// Utility methods for components that want to expose themselves in the idioms of the statically-typed pipelines.

src/Microsoft.ML.Data/StaticPipe/StaticSchemaShape.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Microsoft.ML.Runtime;
1010
using Microsoft.ML.Runtime.Data;
1111

12-
namespace Microsoft.ML.Data.StaticPipe.Runtime
12+
namespace Microsoft.ML.StaticPipe.Runtime
1313
{
1414
/// <summary>
1515
/// A schema shape with names corresponding to a type parameter in one of the typed variants

src/Microsoft.ML.Data/StaticPipe/TrainerEstimatorReconciler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Microsoft.ML.Runtime.Data;
1010
using Microsoft.ML.Runtime.Internal.Utilities;
1111

12-
namespace Microsoft.ML.Data.StaticPipe.Runtime
12+
namespace Microsoft.ML.StaticPipe.Runtime
1313
{
1414
/// <summary>
1515
/// General purpose reconciler for a typical case with trainers, where they accept some generally

src/Microsoft.ML.Data/StaticPipe/Transformer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using Microsoft.ML.Core.Data;
66
using Microsoft.ML.Runtime;
77
using Microsoft.ML.Runtime.Data;
8-
using Microsoft.ML.Data.StaticPipe.Runtime;
8+
using Microsoft.ML.StaticPipe.Runtime;
99

10-
namespace Microsoft.ML.Data.StaticPipe
10+
namespace Microsoft.ML.StaticPipe
1111
{
1212
public sealed class Transformer<TTupleInShape, TTupleOutShape, TTransformer> : SchemaBearing<TTupleOutShape>
1313
where TTransformer : class, ITransformer

src/Microsoft.ML.Data/Transforms/ConcatEstimator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime.Internal.Utilities;
7+
using Microsoft.ML.StaticPipe;
8+
using Microsoft.ML.StaticPipe.Runtime;
89
using System;
910
using System.Collections.Generic;
1011
using System.Linq;

src/Microsoft.ML.Data/Transforms/KeyToValueTransform.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Reflection;
99
using System.Text;
1010
using Microsoft.ML.Core.Data;
11-
using Microsoft.ML.Data.StaticPipe.Runtime;
1211
using Microsoft.ML.Runtime;
1312
using Microsoft.ML.Runtime.CommandLine;
1413
using Microsoft.ML.Runtime.Data;
@@ -17,6 +16,8 @@
1716
using Microsoft.ML.Runtime.Internal.Utilities;
1817
using Microsoft.ML.Runtime.Model;
1918
using Microsoft.ML.Runtime.Model.Pfa;
19+
using Microsoft.ML.StaticPipe;
20+
using Microsoft.ML.StaticPipe.Runtime;
2021
using Newtonsoft.Json.Linq;
2122

2223
[assembly: LoadableClass(typeof(IDataTransform), typeof(KeyToValueTransform), typeof(KeyToValueTransform.Arguments), typeof(SignatureDataTransform),

src/Microsoft.ML.Data/Transforms/KeyToVectorTransform.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime;
87
using Microsoft.ML.Runtime.CommandLine;
98
using Microsoft.ML.Runtime.Data;
109
using Microsoft.ML.Runtime.Internal.Utilities;
1110
using Microsoft.ML.Runtime.Model;
1211
using Microsoft.ML.Runtime.Model.Onnx;
1312
using Microsoft.ML.Runtime.Model.Pfa;
13+
using Microsoft.ML.StaticPipe;
14+
using Microsoft.ML.StaticPipe.Runtime;
1415
using Newtonsoft.Json.Linq;
1516
using System;
1617
using System.Collections.Generic;

src/Microsoft.ML.Data/Transforms/NormalizeUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Microsoft.ML.Runtime.Model.Pfa;
1212
using Newtonsoft.Json.Linq;
1313
using System.Collections.Generic;
14-
using Microsoft.ML.Data.StaticPipe.Runtime;
14+
using Microsoft.ML.StaticPipe;
1515

1616
[assembly: LoadableClass(typeof(void), typeof(Normalize), null, typeof(SignatureEntryPointModule), "Normalize")]
1717

src/Microsoft.ML.Data/Transforms/NormalizerStaticExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime.Internal.Utilities;
7+
using Microsoft.ML.StaticPipe;
8+
using Microsoft.ML.StaticPipe.Runtime;
89
using System;
910
using System.Collections.Generic;
1011
using System.Collections.Immutable;

src/Microsoft.ML.Data/Transforms/TermEstimator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
6+
using Microsoft.ML.StaticPipe;
7+
using Microsoft.ML.StaticPipe.Runtime;
78
using System;
89
using System.Collections.Generic;
910
using System.Linq;

src/Microsoft.ML.Data/Transforms/TermStaticExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
6+
using Microsoft.ML.StaticPipe;
77

88
namespace Microsoft.ML.Runtime.Data
99
{

src/Microsoft.ML.Data/Transforms/TermStaticExtensions.tt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// See the LICENSE file in the project root for more information.
1010

1111
using System;
12-
using Microsoft.ML.Data.StaticPipe.Runtime;
12+
using Microsoft.ML.StaticPipe;
1313

1414
namespace Microsoft.ML.Runtime.Data
1515
{

src/Microsoft.ML.ImageAnalytics/ImageGrayscaleTransform.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime;
87
using Microsoft.ML.Runtime.CommandLine;
98
using Microsoft.ML.Runtime.Data;
109
using Microsoft.ML.Runtime.EntryPoints;
1110
using Microsoft.ML.Runtime.ImageAnalytics;
1211
using Microsoft.ML.Runtime.Internal.Utilities;
1312
using Microsoft.ML.Runtime.Model;
13+
using Microsoft.ML.StaticPipe;
14+
using Microsoft.ML.StaticPipe.Runtime;
1415
using System;
1516
using System.Collections.Generic;
1617
using System.Drawing;

src/Microsoft.ML.ImageAnalytics/ImageLoaderTransform.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
// See the LICENSE file in the project root for more information.
44

55
using Microsoft.ML.Core.Data;
6-
using Microsoft.ML.Data.StaticPipe.Runtime;
76
using Microsoft.ML.Runtime;
87
using Microsoft.ML.Runtime.CommandLine;
98
using Microsoft.ML.Runtime.Data;
109
using Microsoft.ML.Runtime.EntryPoints;
1110
using Microsoft.ML.Runtime.ImageAnalytics;
1211
using Microsoft.ML.Runtime.Internal.Utilities;
1312
using Microsoft.ML.Runtime.Model;
13+
using Microsoft.ML.StaticPipe;
14+
using Microsoft.ML.StaticPipe.Runtime;
1415
using System;
1516
using System.Collections.Generic;
1617
using System.Drawing;

src/Microsoft.ML.ImageAnalytics/ImagePixelExtractorTransform.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
using System.Linq;
99
using System.Text;
1010
using Microsoft.ML.Core.Data;
11-
using Microsoft.ML.Data.StaticPipe.Runtime;
1211
using Microsoft.ML.Runtime;
1312
using Microsoft.ML.Runtime.CommandLine;
1413
using Microsoft.ML.Runtime.Data;
1514
using Microsoft.ML.Runtime.EntryPoints;
1615
using Microsoft.ML.Runtime.ImageAnalytics;
1716
using Microsoft.ML.Runtime.Internal.Utilities;
1817
using Microsoft.ML.Runtime.Model;
18+
using Microsoft.ML.StaticPipe;
19+
using Microsoft.ML.StaticPipe.Runtime;
1920

2021
[assembly: LoadableClass(ImagePixelExtractorTransform.Summary, typeof(IDataTransform), typeof(ImagePixelExtractorTransform), typeof(ImagePixelExtractorTransform.Arguments), typeof(SignatureDataTransform),
2122
ImagePixelExtractorTransform.UserName, "ImagePixelExtractorTransform", "ImagePixelExtractor")]

src/Microsoft.ML.ImageAnalytics/ImageResizerTransform.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System.Linq;
99
using System.Text;
1010
using Microsoft.ML.Core.Data;
11-
using Microsoft.ML.Data.StaticPipe.Runtime;
1211
using Microsoft.ML.Runtime;
1312
using Microsoft.ML.Runtime.CommandLine;
1413
using Microsoft.ML.Runtime.Data;
@@ -17,6 +16,8 @@
1716
using Microsoft.ML.Runtime.Internal.Internallearn;
1817
using Microsoft.ML.Runtime.Internal.Utilities;
1918
using Microsoft.ML.Runtime.Model;
19+
using Microsoft.ML.StaticPipe;
20+
using Microsoft.ML.StaticPipe.Runtime;
2021

2122
[assembly: LoadableClass(ImageResizerTransform.Summary, typeof(IDataTransform), typeof(ImageResizerTransform), typeof(ImageResizerTransform.Arguments),
2223
typeof(SignatureDataTransform), ImageResizerTransform.UserName, "ImageResizerTransform", "ImageResizer")]

0 commit comments

Comments
 (0)