Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Fix build and test failures in the aml branch. (#418)
Browse files Browse the repository at this point in the history
* Draft, adding CategoryImputer, ToKeyImputer, ToString transformers

* add tests

* prelim commit

* update manifest, fix unit tests/examples

* upgrade version

* fix tests

* temp hack fix for native libs

* copy libFeaturizers.so

* fix version

* fix cp

* fix version

* Update ML.Net version number.

* Update the examples and unit tests.

* Update to latest version of the Featurizers library.

* Fix test_tostring unit test.

* Temporarily skip the estimator checks unit tests.

* Upgrade pip to the latest version when installing the Python
packages on Windows. This fixes an issue I had where scikit-learn
would not install when building NimbusML with the RlsWinPy3.6
configuration because it could not find one of the test data sets.

* Update test_estimator_checks for the three new transformers.

* Remove extra comma from test_estimator_checks.

* Update the ML.Net version.

* Add TimeSeriesImputer

* Add country param to DateTimeSplitter

* Upgrade TensorFlow.NET version. Required by latest version of Microsoft.ML.Dnn.

* Update ML.Net version and import new AutoMLFeaturizers package.

* Add back in the accidentally removed tests from test_data_with_missing.py.

* Update the DateTimeSplitter examples.

* Update the ToKeyImputer examples.

* Update the ToString examples.

* Update build to support latest nuget packages and updates.

* Remove copy of libFeaturizers from linux build script.

* Add TimeSeriesImputer to the NimbusML project.

* Add initial DataFrame based example for TimeSeriesImputer.

* Update to the latest version of manifest.json.

* Add missing project include for the TimeSeriesImputer example.

* Update the DateTimeSplitter examples.

* Update build files to copy over the Data folder which is required for the country support in the DateTimeSplitter transform.

* Add a unit test for testing the holiday name return value for DateTimeSplitter.

* Add unit test for ToKeyImputer.

* Update to latest version of manifest.json. Makes grain input required for TimeSeriesImputer.

* Update TimeSeriesImputer_df example.

* Remove TimeSeriesImputer from test_estimator_checks.

* Update nuget.config to point to relative directory for ml.net packages.

* Add unit test for TimeSeriesImputer.

* Use environmental variable to specify the local ml.net nuget package directory.

* Update to the latest version of ml.net.

* Add latest version of nuget packages for building.

* Update to the latest windows ml.net binaries.

* Add linux ml.net binaries.

* adding correct nuget packages/location

* adding correct ML.NET signed packages

* adding correct ML.NET signed packages

* Update the referenced ML.Net versions.

* Update to the latest version of the manifest.

* Add RobustScaler to the public API.

* Fix spacing bug in RobustScalar in manifest.json.

* Update to the latest version of manifest.json which contains naming fix for RobustScaler.

* Update to latest unsigned nuget packages for testing RobustScaler and latest master features.

* Add RobustScaler unit tests and examples.

* Update to the latest signed ML.Net nugets.

* Fix RobustScaler checks in test_estimator_checks.

* up version

* Update to the latest version of ML.Net.

* Whitespace change to start a new CI run to see if the mac build is working again.

* Initial implementation of DateTimeSplitter. Ported from the aml branch.

* Fix missing import in test_datetimesplitter.

* Fix issue with ColumnSelector when dropping columns after DateTimeSplitter.

* Use latest ML.Net dev packages from MachineLearning feed.

* Re-enable the default nuget.org feed. It does not appear to cause
any conflicts with getting the latest packages so long as the * is
used in the PackageReference Version attributes. Keeping this enabled
will allow other packages which are not part of the the MachineLearning
feed to be retrieved (ie. Microsoft.MLFeaturizers).

* Add whitespace change to restart CI build. Linux timed out.

* Fix build issue when using pip version >= 20.0.0

* Remove local-nuget-packages, fix build and test_estimator_checks failures.

* Remove DateTimeSplitter duplicates in nimbusml.pyproj

* Remove duplicate ML.Featurizers import.

Co-authored-by: Gani Nazirov <ganinz@hotmail.com>
Co-authored-by: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 27, 2020
1 parent dab5805 commit 3da3c11
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 24 deletions.
26 changes: 14 additions & 12 deletions src/DotNetBridge/DotNetBridge.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,20 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ML" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.17.0-preview2" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.Vision" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.17.0-preview2" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.DataPrep" Version="0.0.3.2-preview2" />
<PackageReference Include="Microsoft.ML" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.17.0-preview*" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.Vision" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.17.0-preview*" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.Featurizers" Version="0.17.0-preview*" />
<PackageReference Include="Microsoft.MLFeaturizers" Version="0.3.5" />
<PackageReference Include="Microsoft.DataPrep" Version="0.0.3.2-preview" />
<PackageReference Include="TensorFlow.NET" Version="0.11.8.1" />
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.14.0" />
</ItemGroup>
Expand Down
24 changes: 12 additions & 12 deletions src/Platforms/build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.17.0-preview2" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.Vision" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.17.0-preview2" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.0-preview2" />
<PackageReference Include="Microsoft.ML.Featurizers" Version="0.17.0-preview2" />
<PackageReference Include="Microsoft.ML" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.17.0-preview*" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.Vision" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.17.0-preview*" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="1.5.0-preview*" />
<PackageReference Include="Microsoft.ML.Featurizers" Version="0.17.0-preview*" />
<PackageReference Include="Microsoft.MLFeaturizers" Version="0.3.5" />
<PackageReference Include="Microsoft.DataPrep" Version="0.0.3.2-preview" />
<PackageReference Include="TensorFlow.NET" Version="0.11.8.1" />
Expand Down
1 change: 1 addition & 0 deletions src/python/nimbusml.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
<Compile Include="nimbusml\examples\ColumnConcatenator.py" />
<Compile Include="nimbusml\examples\examples_from_dataframe\RobustScaler_df.py" />
<Compile Include="nimbusml\examples\examples_from_dataframe\TimeSeriesImputer_df.py" />
<Compile Include="nimbusml\examples\examples_from_dataframe\VotingRegressor.py" />
<Compile Include="nimbusml\examples\RobustScaler.py" />
<Compile Include="nimbusml\examples\examples_from_dataframe\NGramExtractor_df.py" />
<Compile Include="nimbusml\examples\examples_from_dataframe\PrefixColumnConcatenator_df.py" />
Expand Down

0 comments on commit 3da3c11

Please sign in to comment.