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

Commit

Permalink
Merge master branch in to temp/docs branch. (#223)
Browse files Browse the repository at this point in the history
* Update readme with latest feedback (#39)

Updating readme with latest feedback.

* Add THIRD-PARTY-NOTICES.txt and move CONTRIBUTING.md to root. (#40)

* Initial checkin

* Move to Hosted Mac pool

* Update README.md

* Manually copied naming changes over from master.

* Revert "Merge remote-tracking branch 'upstream/temp/docs'"

This reverts commit 93c7347, reversing
changes made to 2350069.

* Improve documentation regarding contributors.

* Fix email address.

* Create CODE_OF_CONDUCT.md

* Update issue templates

* Create PULL_REQUEST_TEMPLATE.md

* Update issue templates

* Update issue templates

* Update issue templates

* Fixing link in CONTRIBUTING.md (#44)

* Update contributing.md link. (#43)

* Initial checkin for ML.NET 0.7 upgrade

* fix tests

* put back columndropper

* fix tests

* Update scikit-learn links to use https instead of http

* restart dotnetcore2 package work

* fix build

* fix mac & linux

* fix build

* fix build

* dbg build

* fix build

* fix build

* handle py 2.7

* handle py27

* fix py27

* fix build

* fix build

* fix build

* ensure dependencies

* ignore exceptions from ensure dependencies

* up version

* Update cv.py

add case for X is data frame

* Update cv.py

add a space

* add a test for cv with data frame

* set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT to true to fix app domain error

* fix build

* up version

* Add instructions for editing docstrings. (#51)

* Add instructions for editing docstrings.

* Add footnote giving more information.

* Fix build failures caused by dotnetcore2 module. (#67)

* Fix importing of the dotnetcore2 module because it has inconsistent folder naming.

* Fix file check for unix platforms.

* Fix indentation levels.

* Reduce number of build legs for PR validations and add nightly build definition with more robust build matrix. (#69)

* Increase version to 0.6.5. (#71)

* Update clr helper function to search multiple folders for clr binaries. (#72)

* Update clr helper function to search multiple folders for clr binaries.

* Moved responsiblity for Python version checking to utility functions.

* Add clarifying comments.

* Fix call to get_nimbusml_libs()

* fix drop column param name

* Remove restricted permissions on build.sh script.

* Fix lightgbm test failures by updating runtime dependencies.

* fix TensorFlowScorer model_location paramter name

* Fix build.sh defaults so that it detects when running on a mac.

* Since OneHotHashVectorizer is broken for output kind Key in ML.NET 0.7, usse ToKey() for unit tests

* fix tests

* fix pyproj test

* fix win 3.6 build

* fix comments

* expose "parallel" to the fit/fit_transform function by including **param to the argument

* add a test for the parallel

* update parallel thread

* fix tests comparison

* Update thread, retry build

* modify tests

* specify pytest-cov version

* update pytest-cov version in build command for linux

* for windows use the latest pytest-cov

* Enabled strong naming for DoNetBridge.dll (to be used for InternalsVisibleTo in ML.NET)

* Changed the keys to be the same as other internal repos

* Changed the key filename

* Update to ML.NET 0.10.preview (#77)

* Updating ML.NET nugets to latest 0.9 preview.

* --generate_entrypoints phase 1

* Fixed Models.CrossValidator

* Updated all entrypoints

* New manifest.json, picket from Monte's branch

* Updated API codegen

* Replace ISchema and SchemaImpl with Schema and SchemaBuilder.

* Revert "Replace ISchema and SchemaImpl with Schema and SchemaBuilder."

This reverts commit dcd749d.

* Refactor IRowCursor to RowCursor.

* Update ML.NET version in build.csproj.

* Update manifest.json to ml.net commit 92e762686989215ddf45d9db3f0a1c989ee54d11

* Updated RunGraph.cs to ml.net 0.10

* Refactor Vbuffer

* Added override to RowCursor methods

* Update to NimbusML-privileged nugets from ML.NET.

* Update to Microsoft.ML namespace without Runtime.

* Schema and VBuffer fixes in NativeDataInterop.

* API fixes for IRandom and IsText in RmlEnvironment and NativeDataView.

* Work on getting VBuffer pointers from Spans.

* Some VBuffer fixes

* fix some class names

* Fix Register Assembly names.

* Remove ML.PipelineInference

* fixed more classes

* Add back columndropper for backward compatability.

* Register Entrypoints assembly in environment.

* Fix homebrew update problem on VS Hosted Mac images.

* Updated all the nuget versions to be the same.

* Attempt to fix the dataframe unit tests

* Fixed test_pyproj

* Optimized VBuffer changes

* Changed bridge version value to 0.10

* Addressed PR comments

* Simplify by using six.string_types (#89)

* Simplify by using six.string_types

* Force a retest

* Removed ISchema from DotNetBridge (#90)

* Removed ISchema

* Fixed the tests

* Addressed PR comments

* Addressed Wei-Sheng's comments about documenting the purpose of Column.DetachedColumn.

* add configuration for python 3.7 (#101)

* add configuration for python 3.7

* fix broken unit test

* Update build.sh

* fix build for Windows

* Linux py3.7 build

* fix pytest version

* upgrade pytest

* fix pytest-cov version

* fix isinstance(., int) for python 2.7

* build urls for Mac

* final fixes

* fix libomp

* Removing 3.7 for now as its not in PyPI

* Upgrade to ML.NET version 1.0.0 (#100)

* ref v0.10 ML.NET

* fix build

* hook up to v0.11.0 ML.NET

* fix build errors

* fix build

* include Microsoft.Data.DataView.dll in build

* typo

* remove protobuf dll

* Regenerate code due to manifest changes

* fix missing ep

* Update to ML.NET 1.0.0-preview

* fix .net build

* update nuget for ML.NET

* remove Data namespace dll

* rollback nuget changes

* move to final RC ML.NET

* Regenerate classes as per updated manifest

* fix maximum_number_of_iterations param name

* fix parameter names

* fix names

* reference official v1.0 of ML.NET

* fix tests

* fix label column

* Fix tests

* fix lightgbm tests

* fix OLS

* fix tests

* fix more tests

* fix more tests

* fix weight column name

* more tests

* fix normalized metrics

* more errors

* Fix CV

* rename feature_column to feature_column_name

* fix cv ranker

* Fix lightgbm tests

* fix changes due to upgrade of NGramFeaturizer

* fix ngram featurizer

* fix FactorizationMachine assert error

* disable test which is not working now due to change in LightGbm version

* fix model name

* typo

* handle nan in arrays

* fix tests

* fix tests

* fix more tests

* fix data type

* fix AUC exception

* kick the build

* fix tests due to data change

* fix ngram test

* fix mutual info tests

* copy libiomp lib

* fix mac build

* disable SymSgdNative for now

* disable SymSgdBinary classifier tests for Linux

* fix linux tests

* fix linux tests

* try linux

* fix linux

* skip SymSgdBinaryClassifier checks

* fix entrypoint compiler

* fix entry point generation

* fix example tests run

* fix typo

* fix documentation regression

* fix parameter name

* fix examples

* fix examples

* fix tests

* fix tests

* fix linux

* kick build

* Fix code_fixer

* fix skip take filters

* fix estimator checks

* Fix latest Windows build issues. (#105)

* Fix build issue on Windows when VS2019 is installed.

Note: The -version option could not be added directly
to the FOR command due to a command script parsing issue.

* Add missing arguments to fix build issue with latest version of autoflake.

* Fixes #50 - summary() fails if called a second time. (#107)

* Fixes #50 - summary() fails if called a second time.

* Fixes #99. Do not use hardcoded file separator. (#108)

Fixes #99. Do not use hard coded file separator.

* Delete the cached summaries when refitting a pipeline or a predictor. (#109)

* Fix build issue on Windows when VS2019 is installed.

Note: The -version option could not be added directly
to the FOR command due to a command script parsing issue.

* Add missing arguments to fix build issue with latest version of autoflake.

* Delete the cached summaries when refitting a pipeline or a predictor.
Fixes #106

* Simplify the code that deletes cached summaries when calling fit.

* Fix signature import error when using latest version of scikit-learn. (#116)

* Fix signature import error when using latest version of scikit-learn.
Fixes #111

* Move the conditional import of the signature method in to the utils package.

* Package System.Drawing.Common.dll as its missing in dotnetcore2 (#120)

* package System.Drawings.Common.dll as its missing in dotnetcore2

* typo

* Add png for Image examples

* try linux fix

* rollback scikit learn version

* test

* debug

* rollback test

* rollback

* fix fontconfig err

* fix tests

* print platform

* get os names

* test

* test

* fix linux

* Upgrade the pytest-remotedata package to fix missing attribute error. (#121)

* Upgrade the pytest-remotedata package to fix missing attribute error.
Fixes #117

* Remove the RlsMacPy3.6 configuration from .vsts-ci.yml.

* Upgrade version (#122)

* package System.Drawings.Common.dll as its missing in dotnetcore2

* typo

* Add png for Image examples

* try linux fix

* rollback scikit learn version

* test

* debug

* rollback test

* rollback

* fix fontconfig err

* fix tests

* print platform

* get os names

* test

* test

* fix linux

* Upgrade version

* Support quoted strings by default (#124)

* upgrade to ML.NET 1.1 (#126)

* upgrade to ML.NET 1.1

* by default quote is +

* assert changes due to quote

* fix tensor flow example

* Put long running tests in to their own folder to shorten build times. (#136)

* Temporarily remove the dataframe examples from the test run
to see how much that effects the test length.

* Remove all examples from the tests to see how it impacts the CI run.

* Put long running tests in to their own folder to shorten build times.

* Update nimbusml.pyproj to reflect the newly moved test files.
Forgot to save the nimbusml.pyproj in visual studio.

* Expose ML.NET SSA & IID spike & changepoint detectors. (#135)

* Initial creation of the IidSpikeDetector files to see what works and
what doesn't.

* Import the Microsoft.ML.TimeSeries assembly in to the project.

* Use 'PassAs' in manifest.json to fix the source parameter name.

* Use float32 for data dtype in IidSpikeDetector example.

* Convert IidSpikeDetector to a standard transform. Add examples and tests.

* Add pre-transform to IidSpikeDetector to fix incompatible data types.

* Fix issues with the test_estimator_checks IidSpikeDetector tests.

* Remove unnecessary TypeConverter import in IidSpikeDetector example.

* Initial implementation of IidChangePointDetector.

* Initial implementation of SsaSpikeDetector.

* Initial implementation of SsaChangePointDetector.

* Fix incorrect SsaSpikeDetector instance in test_estimator_checks.

* Fix a few minor issues with time series unit tests and examples. (#139)

* Skip Image.py and Image_df.py tests for Ubuntu 14 (#149)

* * Fixed the script for generating the documentation (#144)

* Moved _static to ci_script to solve an error while using sphinx
* Removed amek_md.bat and merge the commands of it to make_yaml.bat
* Moved metrics.rst to concepts

* Rename time_series package to timeseries. (#150)

* Fixed the issue of Ubuntu14 not skipping Image.py and Image_df.py (#161)

* Updated CharTokenizer.py example (#153)

* Skip CharTokenizer.py for extended tests (#163)

* Add support for returning custom values when overriding Pipeline.predict. (#155)

* Initial creation of the release-next.md file. (#165)

* Initial creation of the release-next.md file.

* Point the time series example links to the head of the master branch.

* Initial implementation of the SsaForecaster entry point. (#164)

* Final updates for release 1.2.0 (#167)

* Update the LightGbm entry point with the latest version from the manifest.

* Add SsaForecasting examples to the release notes.

* Add documentation modification to the release notes.

* Create the official 1.2.0 release notes. They have been put in the
docs/release-notes folder to closely match the ml.net directory
structure.

* Add correct version to the release notes title.

* Re-enable the SsaForecaster tests.

* Update to the latest version of ml.net. Update the NimbusML version.

* Fix issues with the summary unit tests.

* Comment out the SymSgdBinaryClassifier summary test. It does not
appear to be working on linux.

* Revert change b5eb937 to see if it (#168)

fixes the signed build issue.

* Bring back build.cmd commit. It did not fix the signed build issue. (#169)

* Revert change b5eb937 to see if it
fixes the signed build issue.

* Bring back commit b5eb937. It did
not fixed the signed build issue.

* Bring back the build.cmd change from b5eb937. (#170)

It did not fix the signed build issue.

* Use restored dotnet CLI for signing (#171)

* Update README.md

* Enable LinearSvmBinaryClassifier (#180)

* Enable LinearSvmBinaryClassifier, add examples, add test, and update docs

* Add test for predict_proba() and decision_function()

* Setup destructors for data passed to python (#184)

* pass destructor to python

* indent

* Add azureml-dataprep support for dataflow objects (#181)

* draft code

* draft

* delete

* add dprep dependency

* rollback

* rollback

* rollback

* test & example on using DprepDataStream

* add dprep path

* add dprep path

* fix mlnetpath

* optional dependency on dprep

* run dprep tests optionally

* fix typo

* Up sdk version

* fix linux dprep tests

* up version (#188)

* Save the model file when pickling a NimbusML Pipeline. (#189)

* Save the model file when pickling a NimbusML Pipeline.

* Add version to the pickled Pipeline.

* Add the steps attribute to a pickled Pipeline instance.

* Add extra unit test for pickled nimbusml pipelines.

* Add export_version to pickled base_pipeline_items.
Remove unnecessary export_version attribute from an unpickled Pipeline.

* Remove stored references to X and y in BasePredictor. (#195)

* Remove stored references to X and y in BasePredictor.

* Remove unnecessary scikit-learn import.

* Add observation level feature contributions to Pipeline and BasePredictor (#196)

* Add get_feature_contributions to Pipeline and BasePredictor, add example

* Add tests

* Update release-next.md

* Add classes_ to Pipeline and/or predictor when calling predict_proba. (#200)

* Add classes_ to Pipeline and/or predictor when calling predict_proba.

* Update test_estimator_checks.py to skip the check_dict_unchanged
test for any estimator which supports predict_proba or decision_function.

* Update Handler, Filter, and Indicator to automatically convert the input columns to float before performing the transform. (#204)

Fixes #203.

* Combine models from transforms, predictors and pipelines in to one model. (#208)

* Initial test implementation of combining 2 or more models in to one.

* Added support to Pipeline.combine_models for combining other types of items
and transform only inputs.

* Combine Pipeline._evaluation_infer and _evaluation in to one method.
This fixes an issue where a classifier graph would not contain the
correct nodes after calling Pipeline._predict().

* Missing part of previous check-in.

* Fix the Pipeline.combine_models signature to work with Python 2.7.

* Fix build (#209)

* T

* Fix cert

* Update release-next.md. (#211)

* Update release-next.md

* Update release-next.md

* Update release-next.md

* Add classifier and FileDataStream unit tests to test_pipeline_combining. (#212)

Add classifier and FileDataStream unit tests to test_pipeline_combining.

* Update release-next.md

* up version (#210)

* up version

* Up the version

* renamed factorization lib

* remove matrix factorization lib ref

* dbg libs

* fix libtensorflow framework

* package more libs

* add mkl proxy

* Enable EnsembleClassifier and EnsembleRegressor (#207)

* Enable EnsembleClassifier

* nit

* Enable EnsembleRegressor

* Add output combiners

* Add sub model selectors

* Update examples

* Add documentation for components

* Add diversity measure

* Improve examples

* Add tests

* Fix test_estimator_checks

* Create release notes for version 1.3.0. (#214)

* Update release-1.3.0.md

* Add --installPythonPackages flag to build scripts (#215)

* Add --installPythonPackages flag to build scripts

* close if statement in build.sh

* fix --runTestsOnly

* Fix a bug with the classes_ attribute when no y input is specified during fitting. (#218)

Fixes #216

* Add NumSharp.Core.dll (#220)

* Add timeseries documentation to the master branch. (#221)

* Ensure manifest.json is the latest version and run entry point compiler.

* Remove the non-underscore files that were introduced during the merge.

* Fix remaining unintended differences between branch and master.

* Remove unnecessary underscores from nimbusml.pyproj
  • Loading branch information
pieths authored Aug 12, 2019
1 parent b2af596 commit 909bd6f
Show file tree
Hide file tree
Showing 152 changed files with 7,191 additions and 589 deletions.
27 changes: 21 additions & 6 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ set BoostRoot=%DependenciesDir%BoostDbg3.7
set PythonVersion=3.7
set PythonTag=cp37
set RunTests=False
set InstallPythonPackages=False
set RunExtendedTests=False
set BuildDotNetBridgeOnly=False
set SkipDotNetBridge=False
Expand All @@ -33,6 +34,11 @@ if /i [%1] == [--configuration] (
)
if /i [%1] == [--runTests] (
set RunTests=True
set InstallPythonPackages=True
shift && goto :Arg_Loop
)
if /i [%1] == [--installPythonPackages] (
set InstallPythonPackages=True
shift && goto :Arg_Loop
)
if /i [%1] == [--includeExtendedTests] (
Expand All @@ -58,6 +64,7 @@ echo ""
echo "Options:"
echo " --configuration <Configuration> Build Configuration (DbgWinPy3.7,DbgWinPy3.6,DbgWinPy3.5,DbgWinPy2.7,RlsWinPy3.7,RlsWinPy3.6,RlsWinPy3.5,RlsWinPy2.7)"
echo " --runTests Run tests after build"
echo " --installPythonPackages Install python packages after build"
echo " --includeExtendedTests Include the extended tests if the tests are run"
echo " --buildDotNetBridgeOnly Build only DotNetBridge"
echo " --skipDotNetBridge Build everything except DotNetBridge"
Expand Down Expand Up @@ -157,7 +164,7 @@ if /i [%1] == [DbgWinPy2.7] (
:Build
:: Install dotnet SDK version, see https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
echo Installing dotnet SDK ...
powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Version 2.1.200 -InstallDir ./cli"
powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Version 2.1.701 -InstallDir ./cli"

set _dotnetRoot=%__currentScriptDir%cli

Expand Down Expand Up @@ -328,6 +335,19 @@ md "%__currentScriptDir%target"
copy "%__currentScriptDir%src\python\dist\%WheelFile%" "%__currentScriptDir%target\%WheelFile%"
echo Python package successfully created: %__currentScriptDir%target\%WheelFile%

if "%InstallPythonPackages%" == "True" (
echo ""
echo "#################################"
echo "Installing python packages ... "
echo "#################################"
call "%PythonExe%" -m pip install --upgrade nose pytest graphviz imageio pytest-cov "jupyter_client>=4.4.0" "nbconvert>=4.2.0"
if %PythonVersion% == 2.7 ( call "%PythonExe%" -m pip install --upgrade pyzmq )
:: Run azureml-dataprep tests only in pyhon 3.7 as its an optional dependency
if %PythonVersion% == 3.7 ( call "%PythonExe%" -m pip install --upgrade azureml-dataprep )
call "%PythonExe%" -m pip install --upgrade "%__currentScriptDir%target\%WheelFile%"
call "%PythonExe%" -m pip install "scikit-learn==0.19.2"
)

if "%RunTests%" == "False" (
goto :Exit_Success
)
Expand All @@ -337,11 +357,6 @@ echo ""
echo "#################################"
echo "Running tests ... "
echo "#################################"
call "%PythonExe%" -m pip install --upgrade nose pytest graphviz imageio pytest-cov "jupyter_client>=4.4.0" "nbconvert>=4.2.0"
if %PythonVersion% == 2.7 ( call "%PythonExe%" -m pip install --upgrade pyzmq )
call "%PythonExe%" -m pip install --upgrade "%__currentScriptDir%target\%WheelFile%"
call "%PythonExe%" -m pip install "scikit-learn==0.19.2"

set PackagePath=%PythonRoot%\Lib\site-packages\nimbusml
set TestsPath1=%PackagePath%\tests
set TestsPath2=%__currentScriptDir%src\python\tests
Expand Down
28 changes: 23 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ usage()
echo "Options:"
echo " --configuration <Configuration> Build Configuration (DbgLinPy3.7,DbgLinPy3.6,DbgLinPy3.5,DbgLinPy2.7,RlsLinPy3.7,RlsLinPy3.6,RlsLinPy3.5,RlsLinPy2.7,DbgMacPy3.7,DbgMacPy3.6,DbgMacPy3.5,DbgMacPy2.7,RlsMacPy3.7,RlsMacPy3.6,RlsMacPy3.5,RlsMacPy2.7)"
echo " --runTests Run tests after build"
echo " --installPythonPackages Install python packages after build"
echo " --runTestsOnly Run tests on a wheel file in default build location (<repo>/target/)"
echo " --includeExtendedTests Include the extended tests if the tests are run"
echo " --buildNativeBridgeOnly Build only the native bridge code"
Expand All @@ -31,6 +32,7 @@ else
__configuration=DbgLinPy3.7
fi
__runTests=false
__installPythonPackages=false
__runExtendedTests=false
__buildNativeBridge=true
__buildDotNetBridge=true
Expand All @@ -48,6 +50,10 @@ while [ "$1" != "" ]; do
;;
--runtests)
__runTests=true
__installPythonPackages=true
;;
--installPythonPackages)
__installPythonPackages=true
;;
--includeextendedtests)
__runExtendedTests=true
Expand All @@ -56,6 +62,7 @@ while [ "$1" != "" ]; do
__buildNativeBridge=false
__buildDotNetBridge=false
__runTests=true
__installPythonPackages=true
;;
--buildnativebridgeonly)
__buildDotNetBridge=false
Expand Down Expand Up @@ -166,7 +173,7 @@ if [ ${__buildDotNetBridge} = true ]
then
# Install dotnet SDK version, see https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
echo "Installing dotnet SDK ... "
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -Version 2.1.200 -InstallDir ./cli
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -Version 2.1.701 -InstallDir ./cli

# Build managed code
echo "Building managed code ... "
Expand Down Expand Up @@ -199,6 +206,7 @@ then
cp "${BuildOutputDir}/${__configuration}"/DotNetBridge.dll "${__currentScriptDir}/src/python/nimbusml/internal/libs/"
cp "${BuildOutputDir}/${__configuration}"/pybridge.so "${__currentScriptDir}/src/python/nimbusml/internal/libs/"

# ls "${BuildOutputDir}/${__configuration}/Platform/${PublishDir}"/publish/
if [ ${PythonVersion} = 2.7 ]
then
cp "${BuildOutputDir}/${__configuration}/Platform/${PublishDir}"/publish/*.dll "${__currentScriptDir}/src/python/nimbusml/internal/libs/"
Expand Down Expand Up @@ -246,11 +254,11 @@ then
echo Python package successfully created: ${__currentScriptDir}/target/${WheelFile}
fi

if [ ${__runTests} = true ]
then
if [ ${__installPythonPackages} = true ]
then
echo ""
echo "#################################"
echo "Running tests ... "
echo "Installing Python packages ... "
echo "#################################"
Wheel=${__currentScriptDir}/target/nimbusml-${ProductVersion}-${PythonTag}-none-${PlatName}.whl
if [ ! -f ${Wheel} ]
Expand All @@ -266,10 +274,20 @@ then
elif [ ${PythonVersion} = 3.6 ] && [ "$(uname -s)" = "Darwin" ]
then
"${PythonExe}" -m pip install --upgrade pytest-remotedata
fi
elif [ ${PythonVersion} = 3.7 ]
then
"${PythonExe}" -m pip install --upgrade azureml-dataprep
fi
"${PythonExe}" -m pip install --upgrade "${Wheel}"
"${PythonExe}" -m pip install "scikit-learn==0.19.2"
fi

if [ ${__runTests} = true ]
then
echo ""
echo "#################################"
echo "Running tests ... "
echo "#################################"
PackagePath=${PythonRoot}/lib/python${PythonVersion}/site-packages/nimbusml
TestsPath1=${PackagePath}/tests
TestsPath2=${__currentScriptDir}/src/python/tests
Expand Down
9 changes: 7 additions & 2 deletions build/libs_linux.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
Newtonsoft.Json.dll
libCpuMathNative.so
libFactorizationMachineNative.so
libFastTreeNative.so
libLdaNative.so
libMklImports.so
libMklProxyNative.so
libSymSgdNative.so
lib_lightgbm.so
libtensorflow.so
libtensorflow_framework.so
libtensorflow_framework.so.1
libonnxruntime.so
System.Drawing.Common.dll
TensorFlow.NET.dll
NumSharp.Core.dll
Microsoft.DataPrep.dll
Microsoft.DPrep.*
Microsoft.ML.*
9 changes: 7 additions & 2 deletions build/libs_mac.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
Newtonsoft.Json.dll
libCpuMathNative.dylib
libFactorizationMachineNative.dylib
libFastTreeNative.dylib
libLdaNative.dylib
libMklImports.dylib
libMklProxyNative.dylib
libSymSgdNative.dylib
lib_lightgbm.dylib
libtensorflow.dylib
libtensorflow_framework.dylib
libonnxruntime.dylib
libtensorflow_framework.1.dylib
System.Drawing.Common.dll
TensorFlow.NET.dll
NumSharp.Core.dll
Microsoft.DataPrep.dll
Microsoft.DPrep.*
Microsoft.ML.*
6 changes: 5 additions & 1 deletion build/libs_win.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
Google.Protobuf.dll
Newtonsoft.Json.dll
CpuMathNative.dll
FactorizationMachineNative.dll
FastTreeNative.dll
LdaNative.dll
lib_lightgbm.dll
libiomp5md.dll
MklImports.dll
MklProxyNative.dll
SymSgdNative.dll
tensorflow.dll
TensorFlow.NET.dll
NumSharp.Core.dll
System.Drawing.Common.dll
Microsoft.DataPrep.dll
Microsoft.DPrep.*
Microsoft.ML.*
4 changes: 2 additions & 2 deletions build/sign.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net461</TargetFramework>
<OutDir Condition="'$(OutDir)' == ''">../x64/</OutDir>
</PropertyGroup>

Expand All @@ -15,7 +15,7 @@

<ItemGroup>
<FilesToSign Include="$(OutDir)**/DotNetBridge.dll">
<Authenticode>Microsoft</Authenticode>
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
</ItemGroup>

Expand Down
101 changes: 101 additions & 0 deletions docs/release-notes/release-1.3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# [NimbusML](https://docs.microsoft.com/en-us/nimbusml/overview) 1.3.0

## **New Features**

- **Save/Restore model when pickling Pipeline**

[PR#189](https://github.com/microsoft/NimbusML/pull/189) Save and restore
the underlying model file when pickling a nimbusml Pipeline.

- **Feature Contributions**

[PR#196](https://github.com/microsoft/NimbusML/pull/196) Added support for
observation level feature contributions. Exposes an API
`Pipeline.get_feature_contributions()` that provides scores for how much
each feature influenced a particular prediction, thereby allowing users to
inspect which features were most important in making the prediction.

- **Add `classes_` to Pipeline**

[PR#200](https://github.com/microsoft/NimbusML/pull/200) Add a `classes_`
attribute to a Pipeline and/or predictor instance when calling
`Pipeline.predict_proba()`.

- **Automatically Convert Input Of Handler, Filter and Indicator**

[PR#204](https://github.com/microsoft/NimbusML/pull/204) Update Handler,
Filter, and Indicator to automatically convert the input columns to float
before performing the transform.

- **Combine Models**

[PR#208](https://github.com/microsoft/NimbusML/pull/208) Add support for
combining models from transforms, predictors and pipelines in to one model.

- **Azureml-Dataprep integration**

[PR#181](https://github.com/microsoft/NimbusML/pull/181) Added support for
dataflow objects as a datasource for pipeline training/testing.

- **Linear SVM Binary Classifier**
[PR#180](https://github.com/microsoft/NimbusML/pull/180) Added
`LinearSvmBinaryClassifier` in `nimbusml.linear_model`.

- **Ensemble Training**

[PR#207](https://github.com/microsoft/NimbusML/pull/207) Enabled training of
Ensemble models by adding `nimbusml.ensemble.EnsembleRegressor` and
`nimbusml.ensemble.EnsembleClassifier`. Added components needed
to create ensemble models as new modules in `nimbusml.ensemble`. These
components are passed as arguments to the ensemble trainers.
- Preprocessing components for training multiple models to ensemble in
`nimbusml.ensemble.subset_selector` and `nimbusml.ensemble.feature_selector`.
- Post training components to create the ensemble from the trained models in
`nimbusml.ensemble.sub_model_selector` and `nimbusml.ensemble.output_combiner`.

## **Bug Fixes**

- **Fixed memory leak**

The [PR#184](https://github.com/microsoft/NimbusML/pull/184) fixed potentially
large memory leak when transforming pandas dataframe.

- **Remove Stored References To `X` and `y`**

[PR#195](https://github.com/microsoft/NimbusML/pull/195) Remove the stored
references to X and y in BasePredictor.

- **Fixed Explicit `evaltype`**

The [issue](https://github.com/microsoft/NimbusML/issues/193) where passing
in an explicit `evaltype` to `_predict` in a NimbusML pipeline causes errors
has been fixed with this
[commit](https://github.com/microsoft/NimbusML/commit/1f97c9ef55f5e257f989db5f375cca5c55880258).

## **Breaking Changes**

None.

## **Enhancements**

None.

## **Documentation and Samples**

[Feature Contributions Example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/PipelineWithFeatureContributions.py)

LinearSvmBinaryClassifier Examples:
- [FileDataStream example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/LinearSvmBinaryClassifier.py)
- [DataFrame example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/examples_from_dataframe/LinearSvmBinaryClassifier_df.py)

EnsembleClassifier Examples:
- [FileDataStream example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/EnsembleClassifier.py)
- [DataFrame example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/examples_from_dataframe/EnsembleClassifier_iris_df.py)

EnsembleRegressor Examples:
- [FileDataStream example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/EnsembleRegressor.py)
- [DataFrame example](https://github.com/microsoft/NimbusML/blob/master/src/python/nimbusml/examples/examples_from_dataframe/EnsembleRegressor_airquality_df.py)

## **Remarks**

None.
2 changes: 1 addition & 1 deletion release-next.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ None.

## **Documentation and Samples**

None.
None.

## **Remarks**

Expand Down
2 changes: 1 addition & 1 deletion src/DotNetBridge/Bridge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private static unsafe int GenericExec(EnvironmentBlock* penv, sbyte* psz, int cd
env.ComponentCatalog.RegisterAssembly(typeof(CategoricalCatalog).Assembly); // ML.Transforms
env.ComponentCatalog.RegisterAssembly(typeof(FastTreeRegressionTrainer).Assembly); // ML.FastTree

//env.ComponentCatalog.RegisterAssembly(typeof(EnsembleModelParameters).Assembly); // ML.Ensemble
env.ComponentCatalog.RegisterAssembly(typeof(EnsembleModelParameters).Assembly); // ML.Ensemble
env.ComponentCatalog.RegisterAssembly(typeof(KMeansModelParameters).Assembly); // ML.KMeansClustering
env.ComponentCatalog.RegisterAssembly(typeof(PcaModelParameters).Assembly); // ML.PCA
env.ComponentCatalog.RegisterAssembly(typeof(CVSplit).Assembly); // ML.EntryPoints
Expand Down
27 changes: 15 additions & 12 deletions src/DotNetBridge/DotNetBridge.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>x64</Platforms>
<DefineConstants>CORECLR</DefineConstants>
Expand Down Expand Up @@ -31,16 +31,19 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ML" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.14.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="1.2.0" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.14.0" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="1.2.0" />
<PackageReference Include="Microsoft.ML" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.15.1" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="1.3.1" />
<PackageReference Include="Microsoft.ML.Dnn" Version="0.15.1" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.15.1" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="1.3.1" />
<PackageReference Include="Microsoft.DataPrep" Version="0.0.1.5-preview" />
<PackageReference Include="TensorFlow.NET" Version="0.10.10" />
<PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.14.0" />
</ItemGroup>
</Project>
Loading

0 comments on commit 909bd6f

Please sign in to comment.