diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2e68ac8ad..78917d879 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -141,7 +141,7 @@ jobs: powershell.exe -file install.ps1 displayName: 'Install nni toolkit via source code' - script: | - python -m pip install scikit-learn==0.20.0 --user + python -m pip install scikit-learn==0.23.2 --user python -m pip install keras==2.1.6 --user python -m pip install torch==1.5.0+cpu torchvision==0.6.0+cpu -f https://download.pytorch.org/whl/torch_stable.html --user python -m pip install tensorflow==1.15.2 --user diff --git a/deployment/docker/Dockerfile b/deployment/docker/Dockerfile index 5e33cc604..493cdba17 100644 --- a/deployment/docker/Dockerfile +++ b/deployment/docker/Dockerfile @@ -60,9 +60,9 @@ RUN python3 -m pip --no-cache-dir install torch==1.4.0 RUN python3 -m pip install torchvision==0.5.0 # -# sklearn 0.20.0 +# sklearn 0.23.2 # -RUN python3 -m pip --no-cache-dir install scikit-learn==0.20.0 +RUN python3 -m pip --no-cache-dir install scikit-learn==0.23.2 # # pandas==0.23.4 lightgbm==2.2.2 diff --git a/deployment/docker/README.md b/deployment/docker/README.md index aa8dae38a..1ee8d0b3b 100644 --- a/deployment/docker/README.md +++ b/deployment/docker/README.md @@ -11,7 +11,7 @@ scipy 1.1.0 tensorflow-gpu 1.15.0 keras 2.1.6 torch 1.4.0 -scikit-learn 0.20.0 +scikit-learn 0.23.2 pandas 0.23.4 lightgbm 2.2.2 nni diff --git a/deployment/docker/README_zh_CN.md b/deployment/docker/README_zh_CN.md index a2b243e47..9766f9213 100644 --- a/deployment/docker/README_zh_CN.md +++ b/deployment/docker/README_zh_CN.md @@ -47,4 +47,4 @@ 使用下列命令从 docker Hub 中拉取 NNI docker 映像。 - docker pull msranni/nni:latest \ No newline at end of file + docker pull msranni/nni:latest diff --git a/deployment/pypi/setup.py b/deployment/pypi/setup.py index 61f7ff017..8968686cd 100644 --- a/deployment/pypi/setup.py +++ b/deployment/pypi/setup.py @@ -63,7 +63,7 @@ setuptools.setup( 'scipy', 'coverage', 'colorama', - 'scikit-learn>=0.20,<0.22', + 'scikit-learn>=0.23.2', 'pkginfo', 'websockets' ], diff --git a/docs/requirements.txt b/docs/requirements.txt index 721a587a2..59706a60e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -13,6 +13,6 @@ peewee nbsphinx schema tensorboard -scikit-learn==0.20 +scikit-learn>=0.23.2 thop https://download.pytorch.org/whl/cpu/torch-1.3.1%2Bcpu-cp37-cp37m-linux_x86_64.whl diff --git a/setup.py b/setup.py index 30d4f448c..fc86bbc95 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ setup( 'schema', 'PythonWebHDFS', 'colorama', - 'scikit-learn>=0.20,<0.22', + 'scikit-learn>=0.23.2', 'pkginfo', 'websockets' ], diff --git a/src/sdk/pynni/nni/feature_engineering/gradient_selector/gradient_selector.py b/src/sdk/pynni/nni/feature_engineering/gradient_selector/gradient_selector.py index 9dea3e8a0..f7cb69f62 100644 --- a/src/sdk/pynni/nni/feature_engineering/gradient_selector/gradient_selector.py +++ b/src/sdk/pynni/nni/feature_engineering/gradient_selector/gradient_selector.py @@ -24,7 +24,7 @@ import numpy as np import pandas as pd from sklearn.base import BaseEstimator -from sklearn.feature_selection.base import SelectorMixin +from sklearn.feature_selection import SelectorMixin from sklearn.utils.validation import check_is_fitted import torch diff --git a/src/sdk/pynni/nni/feature_engineering/gradient_selector/requirements.txt b/src/sdk/pynni/nni/feature_engineering/gradient_selector/requirements.txt index 06d2241d5..2aafc0c86 100644 --- a/src/sdk/pynni/nni/feature_engineering/gradient_selector/requirements.txt +++ b/src/sdk/pynni/nni/feature_engineering/gradient_selector/requirements.txt @@ -1,4 +1,4 @@ numpy==1.14.3 -scikit-learn==0.20.0 +scikit-learn>=0.23.2 scipy==1.1.0 torch==1.1.0 diff --git a/src/sdk/pynni/nni/metis_tuner/requirments.txt b/src/sdk/pynni/nni/metis_tuner/requirments.txt index 05c74c49c..3dfc2232a 100644 --- a/src/sdk/pynni/nni/metis_tuner/requirments.txt +++ b/src/sdk/pynni/nni/metis_tuner/requirments.txt @@ -1 +1 @@ -scikit-learn==0.20 \ No newline at end of file +scikit-learn>=0.23.2 diff --git a/src/sdk/pynni/requirements.txt b/src/sdk/pynni/requirements.txt index 282f57263..ec1b8705f 100644 --- a/src/sdk/pynni/requirements.txt +++ b/src/sdk/pynni/requirements.txt @@ -8,4 +8,4 @@ scipy hyperopt==0.1.2 # metis tuner -scikit-learn==0.20 +scikit-learn>=0.23.2 diff --git a/test/pipelines/pipelines-it-local-tf2.yml b/test/pipelines/pipelines-it-local-tf2.yml index 26f3d4c87..2b9526c14 100644 --- a/test/pipelines/pipelines-it-local-tf2.yml +++ b/test/pipelines/pipelines-it-local-tf2.yml @@ -10,7 +10,7 @@ jobs: displayName: 'Install nni toolkit via source code' - script: | set -e - python3 -m pip install scikit-learn==0.20.0 --user + python3 -m pip install scikit-learn==0.23.2 --user python3 -m pip install torch==1.3.1 torchvision==0.4.2 -f https://download.pytorch.org/whl/torch_stable.html --user python3 -m pip install tensorflow-gpu==2.2.0 tensorflow-estimator==2.2.0 --force --user python3 -m pip install keras==2.4.2 --user diff --git a/test/pipelines/pipelines-it-local-windows.yml b/test/pipelines/pipelines-it-local-windows.yml index bfdf4eed2..4b791c762 100644 --- a/test/pipelines/pipelines-it-local-windows.yml +++ b/test/pipelines/pipelines-it-local-windows.yml @@ -7,7 +7,7 @@ jobs: powershell.exe -file install.ps1 displayName: 'Install nni toolkit via source code' - script: | - python -m pip install scikit-learn==0.20.0 --user + python -m pip install scikit-learn==0.23.2 --user python -m pip install keras==2.1.6 --user python -m pip install torchvision===0.4.1 torch===1.3.1 -f https://download.pytorch.org/whl/torch_stable.html --user python -m pip install tensorflow-gpu==1.15.2 tensorflow-estimator==1.15.1 --force --user diff --git a/test/pipelines/pipelines-it-local.yml b/test/pipelines/pipelines-it-local.yml index ec6735a47..eb72e4099 100644 --- a/test/pipelines/pipelines-it-local.yml +++ b/test/pipelines/pipelines-it-local.yml @@ -10,7 +10,7 @@ jobs: displayName: 'Install nni toolkit via source code' - script: | set -e - python3 -m pip install scikit-learn==0.20.0 --user + python3 -m pip install scikit-learn==0.23.2 --user python3 -m pip install torchvision==0.4.2 --user python3 -m pip install torch==1.3.1 --user python3 -m pip install keras==2.1.6 --user diff --git a/test/pipelines/pipelines-it-pai-windows.yml b/test/pipelines/pipelines-it-pai-windows.yml index 3bdb4ee69..176586882 100644 --- a/test/pipelines/pipelines-it-pai-windows.yml +++ b/test/pipelines/pipelines-it-pai-windows.yml @@ -62,7 +62,7 @@ jobs: displayName: 'Install nni toolkit via source code' - script: | set PATH=$(ENV_PATH) - python -m pip install scikit-learn==0.21.0 --user + python -m pip install scikit-learn==0.23.2 --user displayName: 'Install dependencies for integration tests' - script: | cd test @@ -71,4 +71,4 @@ jobs: mount -o anon $(pai_nfs_uri) $(local_nfs_uri) python nni_test/nnitest/generate_ts_config.py --ts pai --pai_token $(pai_token) --pai_host $(pai_host) --pai_user $(pai_user) --nni_docker_image $(docker_image) --pai_storage_config_name $(pai_storage_config_name) --nni_manager_nfs_mount_path $(nni_manager_nfs_mount_path) --container_nfs_mount_path $(container_nfs_mount_path) --nni_manager_ip $(nni_manager_ip) --vc $(virtual_cluster) python nni_test/nnitest/run_tests.py --config config/integration_tests.yml --ts pai - displayName: 'Examples and advanced features tests on pai' \ No newline at end of file + displayName: 'Examples and advanced features tests on pai' diff --git a/test/pipelines/pipelines-it-remote-windows-to-linux.yml b/test/pipelines/pipelines-it-remote-windows-to-linux.yml index 36a98a981..d87230201 100644 --- a/test/pipelines/pipelines-it-remote-windows-to-linux.yml +++ b/test/pipelines/pipelines-it-remote-windows-to-linux.yml @@ -16,7 +16,7 @@ jobs: powershell.exe -file install.ps1 displayName: 'Install nni toolkit via source code' - script: | - python -m pip install scikit-learn==0.20.1 --user + python -m pip install scikit-learn==0.23.2 --user displayName: 'Install dependencies for integration tests' - task: SSH@0 inputs: