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

Update the documentation of 1.2 release #176

Merged
merged 134 commits into from
Jul 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
fcc1924
Update readme with latest feedback (#39)
GalOshri Oct 31, 2018
e100472
Add THIRD-PARTY-NOTICES.txt and move CONTRIBUTING.md to root. (#40)
montebhoover Oct 31, 2018
8239922
Create CODE_OF_CONDUCT.md
ganik Nov 1, 2018
ad0af7c
Update issue templates
ganik Nov 1, 2018
19f4721
Create PULL_REQUEST_TEMPLATE.md
ganik Nov 1, 2018
1e16e64
Update issue templates
ganik Nov 1, 2018
007e624
Update issue templates
ganik Nov 1, 2018
110b0f9
Update issue templates
ganik Nov 1, 2018
0b5adef
Fixing link in CONTRIBUTING.md (#44)
justinormont Nov 2, 2018
a2ba6f5
Update contributing.md link. (#43)
montehoover Nov 4, 2018
45be3d7
Merge pull request #1 from Microsoft/master
ganik Nov 9, 2018
243325d
Initial checkin for ML.NET 0.7 upgrade
ganik Nov 9, 2018
cbfb439
fix tests
ganik Nov 9, 2018
653d8c1
put back columndropper
ganik Nov 10, 2018
1ae3060
fix tests
ganik Nov 10, 2018
10bd895
Update scikit-learn links to use https instead of http
Nov 19, 2018
bec566c
Merge pull request #56 from GalOshri/update-scikit-learn-https
justinormont Nov 20, 2018
725be2e
Merge pull request #2 from Microsoft/master
ganik Nov 23, 2018
f74b3c8
restart dotnetcore2 package work
ganik Nov 23, 2018
a9684bc
fix build
ganik Nov 23, 2018
0976828
fix mac & linux
ganik Nov 24, 2018
620d13d
fix build
ganik Nov 24, 2018
3e10cec
fix build
ganik Nov 24, 2018
04e87b7
dbg build
ganik Nov 24, 2018
98c8987
fix build
ganik Nov 24, 2018
d2e815f
fix build
ganik Nov 24, 2018
34c5f29
handle py 2.7
ganik Nov 24, 2018
bbb4c63
handle py27
ganik Nov 24, 2018
64da211
fix py27
ganik Nov 24, 2018
7ea0a25
fix build
ganik Nov 25, 2018
55308ec
fix build
ganik Nov 25, 2018
577d84e
fix build
ganik Nov 25, 2018
b571d22
ensure dependencies
ganik Nov 25, 2018
062d55a
ignore exceptions from ensure dependencies
ganik Nov 25, 2018
ace3cc9
Merge pull request #60 from ganik/ganik/dotnet2
ganik Nov 26, 2018
ab3d80d
up version
ganik Nov 26, 2018
36b4f48
Merge pull request #3 from Microsoft/master
ganik Nov 26, 2018
c2ce774
Merge branch 'master' into ganik/dotnet2
ganik Nov 26, 2018
d912ca5
Merge pull request #61 from ganik/ganik/dotnet2
ganik Nov 26, 2018
9fd5c3c
Update cv.py
zyw400 Nov 27, 2018
7c58875
Update cv.py
zyw400 Nov 27, 2018
1d02fc3
add a test for cv with data frame
zyw400 Nov 27, 2018
422bd8d
set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT to true to fix app domain e…
ganik Nov 28, 2018
c6704fd
Merge pull request #62 from zyw400/yiwzh/fix_cv
ganik Nov 28, 2018
9d3376c
fix build
ganik Nov 28, 2018
83db226
Merge pull request #4 from Microsoft/master
ganik Nov 28, 2018
e54535d
Merge branch 'master' into ganik/amldocker
ganik Nov 28, 2018
4c68428
up version
ganik Nov 28, 2018
52ad2d0
Merge pull request #63 from ganik/ganik/amldocker
ganik Nov 28, 2018
341e01a
Add instructions for editing docstrings. (#51)
montebhoover Dec 6, 2018
9a0b50e
Fix build failures caused by dotnetcore2 module. (#67)
montebhoover Dec 7, 2018
0d2e4e6
Reduce number of build legs for PR validations and add nightly build …
montebhoover Dec 7, 2018
f7b7ded
Merge pull request #5 from Microsoft/master
ganik Dec 12, 2018
19b240e
Merge branch 'master' into ganik/mlnet.7
ganik Dec 12, 2018
b45a953
Increase version to 0.6.5. (#71)
montebhoover Dec 12, 2018
f3eb0bb
Update clr helper function to search multiple folders for clr binarie…
montebhoover Dec 15, 2018
155696c
fix drop column param name
ganik Dec 16, 2018
c94568d
Merge pull request #6 from Microsoft/master
ganik Dec 16, 2018
453a940
Merge branch 'master' into ganik/mlnet.7
ganik Dec 16, 2018
f95b3ba
Remove restricted permissions on build.sh script.
Dec 18, 2018
7a5e6d9
Fix lightgbm test failures by updating runtime dependencies.
montebhoover Dec 18, 2018
7a46ce1
fix TensorFlowScorer model_location paramter name
ganik Dec 18, 2018
7b7692c
Fix build.sh defaults so that it detects when running on a mac.
Dec 18, 2018
492751f
Since OneHotHashVectorizer is broken for output kind Key in ML.NET 0.…
ganik Dec 20, 2018
66cb189
Merge pull request #75 from montebhoover/improve_mac_ux
justinormont Dec 20, 2018
eb2b39f
fix tests
ganik Dec 20, 2018
d71a31e
Merge pull request #7 from Microsoft/master
ganik Dec 20, 2018
27d4a6a
Merge branch 'master' into ganik/mlnet.7
ganik Dec 20, 2018
af76d08
Merge pull request #8 from ganik/master
ganik Dec 20, 2018
c779510
fix pyproj test
ganik Dec 20, 2018
2bdfa41
Merge branch 'ganik/mlnet.7' of https://github.com/ganik/NimbusML int…
ganik Dec 20, 2018
d23d696
fix win 3.6 build
ganik Dec 20, 2018
172c1e8
fix comments
ganik Dec 20, 2018
80ce48f
Merge pull request #55 from ganik/ganik/mlnet.7
ganik Dec 20, 2018
b5f1c2e
Merge pull request #1 from Microsoft/master
zyw400 Jan 4, 2019
bfaf819
expose "parallel" to the fit/fit_transform function by including **pa…
zyw400 Jan 5, 2019
eaeb24c
add a test for the parallel
zyw400 Jan 5, 2019
a5997db
update parallel thread
zyw400 Jan 7, 2019
67530ff
fix tests comparison
zyw400 Jan 7, 2019
066469f
Update thread, retry build
zyw400 Jan 7, 2019
a9596ca
modify tests
zyw400 Jan 7, 2019
13d7b35
specify pytest-cov version
zyw400 Jan 7, 2019
af577c4
update pytest-cov version in build command for linux
zyw400 Jan 7, 2019
4dc79e1
for windows use the latest pytest-cov
zyw400 Jan 7, 2019
d2535be
Merge pull request #86 from zyw400/yiwzh/add_nthreads_to_graph
zyw400 Jan 8, 2019
3079d56
Enabled strong naming for DoNetBridge.dll (to be used for InternalsVi…
Jan 8, 2019
a556f39
Changed the keys to be the same as other internal repos
Jan 8, 2019
0fd4f0e
Changed the key filename
Jan 8, 2019
4f7f22b
Merge branch 'master' into strongname
Jan 9, 2019
b0c1e3a
Merge pull request #87 from shmoradims/strongname
Jan 9, 2019
9e57f19
Update to ML.NET 0.10.preview (#77)
montebhoover Jan 16, 2019
7c9a1c6
Simplify by using six.string_types (#89)
cclauss Jan 18, 2019
e5f2b65
Removed ISchema from DotNetBridge (#90)
Jan 24, 2019
dca1157
add configuration for python 3.7 (#101)
xadupre Apr 11, 2019
3616e73
Removing 3.7 for now as its not in PyPI
ganik May 7, 2019
210b220
Upgrade to ML.NET version 1.0.0 (#100)
ganik May 27, 2019
b5eb937
Fix latest Windows build issues. (#105)
pieths May 27, 2019
c35536d
Fixes #50 - summary() fails if called a second time. (#107)
pieths May 30, 2019
8da35e1
Fixes #99. Do not use hardcoded file separator. (#108)
pieths May 30, 2019
b4ec723
Delete the cached summaries when refitting a pipeline or a predictor.…
pieths Jun 1, 2019
91478d1
Fix signature import error when using latest version of scikit-learn.…
pieths Jun 2, 2019
a580331
Package System.Drawing.Common.dll as its missing in dotnetcore2 (#120)
ganik Jun 4, 2019
7848487
Upgrade the pytest-remotedata package to fix missing attribute error.…
pieths Jun 4, 2019
32e2d67
Upgrade version (#122)
ganik Jun 4, 2019
d09a5c5
Support quoted strings by default (#124)
ganik Jun 4, 2019
b57cfcc
upgrade to ML.NET 1.1 (#126)
ganik Jun 5, 2019
b4931e4
Put long running tests in to their own folder to shorten build times.…
pieths Jun 13, 2019
7863ca0
Expose ML.NET SSA & IID spike & changepoint detectors. (#135)
pieths Jun 14, 2019
3c689c6
Fix a few minor issues with time series unit tests and examples. (#139)
pieths Jun 18, 2019
207a6b6
Skip Image.py and Image_df.py tests for Ubuntu 14 (#149)
Stephen0620 Jun 18, 2019
0ca2b29
* Fixed the script for generating the documentation (#144)
Stephen0620 Jun 18, 2019
3b46629
Rename time_series package to timeseries. (#150)
pieths Jun 18, 2019
19b27f0
Fixed the issue of Ubuntu14 not skipping Image.py and Image_df.py (#161)
Stephen0620 Jun 28, 2019
c5153c2
Updated CharTokenizer.py example (#153)
Stephen0620 Jun 28, 2019
c45edfe
Skip CharTokenizer.py for extended tests (#163)
Stephen0620 Jul 1, 2019
7893bfd
Add support for returning custom values when overriding Pipeline.pred…
pieths Jul 1, 2019
c4b26d9
Initial creation of the release-next.md file. (#165)
pieths Jul 1, 2019
3993365
Initial implementation of the SsaForecaster entry point. (#164)
pieths Jul 2, 2019
29af47a
Final updates for release 1.2.0 (#167)
pieths Jul 3, 2019
4822871
Revert change b5eb9376dd14da606e91f7f94f1bec7b7609a7a1 to see if it (…
pieths Jul 3, 2019
a2c3e1f
Bring back build.cmd commit. It did not fix the signed build issue. (…
pieths Jul 3, 2019
8bb0c0c
Bring back the build.cmd change from b5eb9376dd14da606e91f7f94f1bec7b…
pieths Jul 3, 2019
4dddfda
Use restored dotnet CLI for signing (#171)
safern Jul 3, 2019
8da13e7
Update README.md
ganik Jul 4, 2019
6d92b03
Initial checkin
ganik Oct 19, 2018
8e0cf51
Move to Hosted Mac pool
ganik Oct 19, 2018
05dda2a
Manually copied naming changes over from master.
montebhoover Oct 20, 2018
378be9b
merge master to temp/docs for updating the documentation (#134)
Stephen0620 Jun 12, 2019
0cd6644
Merge branch 'documentation' into temp/docs (#143)
Stephen0620 Jun 18, 2019
a699cce
Updated the documentation for time series (#158)
Stephen0620 Jul 1, 2019
e519421
Fixed estimator checks failed from ssa_forecasting's update (#166)
Stephen0620 Jul 2, 2019
c23f9be
fix test_ssaforecaster.py
Jul 4, 2019
18ae89a
Merge branch 'docs-1.2' of https://github.com/Stephen0620/NimbusML in…
Jul 5, 2019
da592bd
Merge branch 'Stephen0620-docs-1.2' into temp/docs
Jul 5, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Documentation can be found [here](https://docs.microsoft.com/en-us/NimbusML/over

`nimbusml` runs on Windows, Linux, and macOS.

`nimbusml` requires Python **2.7**, **3.5**, **3.6** 64 bit version only.
`nimbusml` requires Python **2.7**, **3.5**, **3.6**, **3.7** 64 bit version only.

Install `nimbusml` using `pip` with:

Expand Down
17 changes: 15 additions & 2 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ set RunTests=False
set RunExtendedTests=False
set BuildDotNetBridgeOnly=False
set SkipDotNetBridge=False
set AzureBuild=False

:Arg_Loop
if [%1] == [] goto :Build
Expand All @@ -45,17 +46,22 @@ if /i [%1] == [--buildDotNetBridgeOnly] (
if /i [%1] == [--skipDotNetBridge] (
set SkipDotNetBridge=True
shift && goto :Arg_Loop
)
if /i [%1] == [--azureBuild] (
set AzureBuild=True
shift && goto :Arg_Loop
) else goto :Usage

:Usage
echo "Usage: build.cmd [--configuration <Configuration>] [--runTests] [--includeExtendedTests] [--buildDotNetBridgeOnly] [--skipDotNetBridge]"
echo "Usage: build.cmd [--configuration <Configuration>] [--runTests] [--includeExtendedTests] [--buildDotNetBridgeOnly] [--skipDotNetBridge] [--azureBuild]"
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 " --includeExtendedTests Include the extended tests if the tests are run"
echo " --buildDotNetBridgeOnly Build only DotNetBridge"
echo " --skipDotNetBridge Build everything except DotNetBridge"
echo " --azureBuild Building in azure devops (adds dotnet CLI to the path)"
goto :Exit_Success

:Configuration
Expand Down Expand Up @@ -153,12 +159,19 @@ if /i [%1] == [DbgWinPy2.7] (
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"

set _dotnetRoot=%__currentScriptDir%cli

if "%AzureBuild%" == "True" (
:: Add dotnet CLI root to the PATH in azure devops agent
echo ##vso[task.prependpath]%_dotnetRoot%
)

:: Build managed code
echo ""
echo "#################################"
echo "Building DotNet Bridge ... "
echo "#################################"
set _dotnet=%__currentScriptDir%cli\dotnet.exe
set _dotnet=%_dotnetRoot%\dotnet.exe

if "%SkipDotNetBridge%" == "False" (
call "%_dotnet%" build -c %Configuration% -o "%BuildOutputDir%%Configuration%" --force "%__currentScriptDir%src\DotNetBridge\DotNetBridge.csproj"
Expand Down
2 changes: 1 addition & 1 deletion build/signed_build_phase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ phases:
continueOnError: false
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

- script: ./build.cmd --buildDotNetBridgeOnly --configuration $(BuildConfig)
- script: ./build.cmd --buildDotNetBridgeOnly --azureBuild --configuration $(BuildConfig)
displayName: Build DotNetBridgeOnly

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

## **New Features**

- **Time Series Spike And Change Point Detection**

[PR#135](https://github.com/microsoft/NimbusML/pull/135) added support
for time series spike and change point detection using the Independent
and identically distributed (IID) and Singular Spectrum Analysis (SSA)
algorithms.

**Spike Detection Examples**

- [IID using a pandas Series](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/examples_from_dataframe/IidSpikeDetector_df.py)
- [SSA using a pandas Series](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/examples_from_dataframe/SsaSpikeDetector_df.py)
- [IID using a FileDataStream](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/IidSpikeDetector.py)
- [SSA using a FileDataStream](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/SsaSpikeDetector.py)

**Change Point Detection Examples**

- [IID using a pandas Series](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/examples_from_dataframe/IidChangePointDetector_df.py)
- [SSA using a pandas Series](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/examples_from_dataframe/SsaChangePointDetector_df.py)
- [IID using a FileDataStream](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/IidChangePointDetector.py)
- [SSA using a FileDataStream](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/SsaChangePointDetector.py)

- **Time Series Forecasting**
[PR#164](https://github.com/microsoft/NimbusML/pull/164) exposes an API
for time series forecasting using Singular Spectrum Analysis(SSA).

**Forecasting Examples**
- [Using a pandas Series](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/examples_from_dataframe/SsaForecaster_df.py)
- [Using a FileDataStream](https://github.com/microsoft/NimbusML/tree/master/src/python/nimbusml/examples/SsaForecaster.py)

## **Bug Fixes**

None.

## **Breaking Changes**

None.

## **Enhancements**

None.

## **Documentation and Samples**

- Sample for CharTokenizer. [PR#153](https://github.com/microsoft/NimbusML/pull/153)

## **Remarks**

None.
25 changes: 25 additions & 0 deletions release-next.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# [NimbusML](https://docs.microsoft.com/en-us/nimbusml/overview) Next

## **New Features**

None.

## **Bug Fixes**

None.

## **Breaking Changes**

None.

## **Enhancements**

None.

## **Documentation and Samples**

None.

## **Remarks**

None.
22 changes: 11 additions & 11 deletions src/DotNetBridge/DotNetBridge.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ML" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.Mkl.Redist" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="0.13.0" />
<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" />
</ItemGroup>
</Project>
20 changes: 10 additions & 10 deletions src/Platforms/build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ML" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.CpuMath" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.EntryPoints" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.Mkl.Components" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.ImageAnalytics" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.LightGBM" Version="1.1.0" />
<PackageReference Include="Microsoft.ML.OnnxTransformer" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.TensorFlow" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.Ensemble" Version="0.13.0" />
<PackageReference Include="Microsoft.ML.TimeSeries" Version="0.13.0" />
<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.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" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/python/nimbusml.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
<Compile Include="nimbusml\internal\core\timeseries\_iidchangepointdetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\_iidspikedetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\_ssachangepointdetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\_ssaforecaster.py" />
<Compile Include="nimbusml\internal\core\timeseries\_ssaspikedetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\__init__.py" />
<Compile Include="nimbusml\internal\core\preprocessing\filter\_skipfilter.py" />
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Microsoft Machine Learning for Python
"""

__version__ = '1.1.0'
__version__ = '1.2.0'

# CoreCLR version of MicrosoftML is built on Windows.
# But file permissions are not preserved when it's copied to Linux.
Expand Down
26 changes: 17 additions & 9 deletions src/python/nimbusml/_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -2210,18 +2210,26 @@ def _validate_model_summary(self, model_summary):
"is expected ".format(
type(model_summary)))

str_bias = 'Bias'
str_classnames = 'ClassNames'
str_coefficients = 'Coefficients'
str_weights = 'Weights'
str_gains = 'Gains'
str_support_vectors = 'Support vectors.'
col_names = [
'Bias',
'ClassNames',
'Coefficients',
'PredictorName',
'Summary',
'VectorName'
]

col_name_prefixes = [
'Weights',
'Gains',
'Support vectors.',
'VectorData'
]

for col in model_summary.columns:
if col in (str_bias, str_classnames, str_coefficients):
if col in col_names:
pass
elif col.startswith(str_weights) or col.startswith(
str_gains) or col.startswith(str_support_vectors):
elif any([col.startswith(pre) for pre in col_name_prefixes]):
pass
else:
raise TypeError(
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/ensemble/_lightgbmbinaryclassifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def __init__(
unbalanced_sets=False,
weight_of_positive_examples=1.0,
sigmoid=0.5,
evaluation_metric='Logloss',
evaluation_metric='Default',
maximum_bin_count_per_feature=255,
verbose=False,
silent=True,
Expand Down
7 changes: 6 additions & 1 deletion src/python/nimbusml/ensemble/_lightgbmclassifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ class LightGbmClassifier(core, BasePredictor, ClassifierMixin):

:param caching: Whether trainer should cache input training data.

:param unbalanced_sets: Use for multi-class classification when training
data is not balanced.

:param use_softmax: Use softmax loss for the multi classification.

:param sigmoid: Parameter for the sigmoid function.
Expand Down Expand Up @@ -145,9 +148,10 @@ def __init__(
booster=None,
normalize='Auto',
caching='Auto',
unbalanced_sets=False,
use_softmax=None,
sigmoid=0.5,
evaluation_metric='Error',
evaluation_metric='Default',
maximum_bin_count_per_feature=255,
verbose=False,
silent=True,
Expand Down Expand Up @@ -198,6 +202,7 @@ def __init__(
booster=booster,
normalize=normalize,
caching=caching,
unbalanced_sets=unbalanced_sets,
use_softmax=use_softmax,
sigmoid=sigmoid,
evaluation_metric=evaluation_metric,
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/ensemble/_lightgbmranker.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def __init__(
caching='Auto',
custom_gains=[0, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095],
sigmoid=0.5,
evaluation_metric='NormalizedDiscountedCumulativeGain',
evaluation_metric='Default',
maximum_bin_count_per_feature=255,
verbose=False,
silent=True,
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/ensemble/_lightgbmregressor.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def __init__(
booster=None,
normalize='Auto',
caching='Auto',
evaluation_metric='RootMeanSquaredError',
evaluation_metric='Default',
maximum_bin_count_per_feature=255,
verbose=False,
silent=True,
Expand Down
29 changes: 13 additions & 16 deletions src/python/nimbusml/examples/SsaForecaster.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@

# define the training pipeline
pipeline = Pipeline([
SsaForecaster(forcasting_confident_lower_bound_column_name="cmin",
forcasting_confident_upper_bound_column_name="cmax",
series_length=6,
SsaForecaster(series_length=6,
train_size=8,
window_size=3,
horizon=2,
# max_growth={'TimeSpan': 1, 'Growth': 1}
columns={'t2_fc': 't2'})
])

Expand All @@ -35,15 +32,15 @@
print(result)

# Output
# t1 t2 t3 t2_fc.0 t2_fc.1 cmin.0 cmin.1 cmax.0 cmax.1
# 0 0.01 0.01 0.01 0.10 0.12 0.09 0.11 0.11 0.13
# 1 0.02 0.02 0.02 0.06 0.08 0.06 0.07 0.07 0.09
# 2 0.03 0.03 0.02 0.04 0.05 0.03 0.04 0.05 0.07
# 3 0.03 0.03 0.03 0.05 0.06 0.04 0.05 0.05 0.07
# 4 0.03 0.03 0.00 0.05 0.07 0.04 0.05 0.06 0.08
# 5 0.03 0.05 0.01 0.06 0.08 0.05 0.07 0.07 0.10
# 6 0.05 0.07 0.05 0.09 0.12 0.08 0.10 0.10 0.13
# 7 0.07 0.09 0.09 0.12 0.16 0.11 0.15 0.13 0.17
# 8 0.09 99.00 99.00 57.92 82.88 57.91 82.87 57.93 82.89
# 9 1.10 0.10 0.10 60.50 77.18 60.49 77.17 60.50 77.19

#
# t1 t2 t3 t2_fc.0 t2_fc.1
# 0 0.01 0.01 0.01 0.10 0.12
# 1 0.02 0.02 0.02 0.06 0.08
# 2 0.03 0.03 0.02 0.04 0.05
# 3 0.03 0.03 0.03 0.05 0.06
# 4 0.03 0.03 0.00 0.05 0.07
# 5 0.03 0.05 0.01 0.06 0.08
# 6 0.05 0.07 0.05 0.09 0.12
# 7 0.07 0.09 0.09 0.12 0.16
# 8 0.09 99.00 99.00 57.92 82.88
# 9 1.10 0.10 0.10 60.50 77.18
Loading