From 1ddb1945112fa18a73513af618e67d0432f910e8 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 9 Oct 2019 19:18:21 +0800 Subject: [PATCH 1/3] refactor pipeline dependencies --- test/install-it-deps.sh | 11 +++++++++++ test/pipelines-it-local.yml | 10 ++-------- 2 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 test/install-it-deps.sh diff --git a/test/install-it-deps.sh b/test/install-it-deps.sh new file mode 100644 index 0000000000..c8d975bc4b --- /dev/null +++ b/test/install-it-deps.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -e + +python3 -m pip install scikit-learn==0.20.0 --user +python3 -m pip install torch==1.2.0 --user +python3 -m pip install torchvision==0.4.0 --user +python3 -m pip install keras==2.1.6 --user +python3 -m pip install tensorflow-gpu==1.12.0 --user +sudo apt-get install swig -y +PATH=$HOME/.local/bin:$PATH nnictl package install --name=SMAC +PATH=$HOME/.local/bin:$PATH nnictl package install --name=BOHB diff --git a/test/pipelines-it-local.yml b/test/pipelines-it-local.yml index 4f054546fc..1f26d8727e 100644 --- a/test/pipelines-it-local.yml +++ b/test/pipelines-it-local.yml @@ -8,14 +8,8 @@ jobs: source install.sh displayName: 'Install nni toolkit via source code' - script: | - python3 -m pip install scikit-learn==0.20.0 --user - python3 -m pip install torch==0.4.1 --user - python3 -m pip install torchvision==0.2.1 --user - python3 -m pip install keras==2.1.6 --user - python3 -m pip install tensorflow-gpu==1.12.0 --user - sudo apt-get install swig -y - PATH=$HOME/.local/bin:$PATH nnictl package install --name=SMAC - PATH=$HOME/.local/bin:$PATH nnictl package install --name=BOHB + cd test + ./install-it-deps.sh displayName: 'Install dependencies for integration tests' - script: | cd test From c63830cfd2686a6395f411171f8be218739f28a8 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 9 Oct 2019 19:22:19 +0800 Subject: [PATCH 2/3] updates --- test/pipelines-it-local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines-it-local.yml b/test/pipelines-it-local.yml index 1f26d8727e..34454a3c00 100644 --- a/test/pipelines-it-local.yml +++ b/test/pipelines-it-local.yml @@ -9,7 +9,7 @@ jobs: displayName: 'Install nni toolkit via source code' - script: | cd test - ./install-it-deps.sh + source install-it-deps.sh displayName: 'Install dependencies for integration tests' - script: | cd test From 430ed8eddc8c0c1f4651a7ccc977d4d9eef933f6 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 9 Oct 2019 19:36:47 +0800 Subject: [PATCH 3/3] updates --- test/install-it-deps.sh | 11 ----------- test/pipelines-it-kubeflow.yml | 5 ----- test/pipelines-it-local.yml | 10 ++++++++-- test/pipelines-it-pai.yml | 5 ----- 4 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 test/install-it-deps.sh diff --git a/test/install-it-deps.sh b/test/install-it-deps.sh deleted file mode 100644 index c8d975bc4b..0000000000 --- a/test/install-it-deps.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -e - -python3 -m pip install scikit-learn==0.20.0 --user -python3 -m pip install torch==1.2.0 --user -python3 -m pip install torchvision==0.4.0 --user -python3 -m pip install keras==2.1.6 --user -python3 -m pip install tensorflow-gpu==1.12.0 --user -sudo apt-get install swig -y -PATH=$HOME/.local/bin:$PATH nnictl package install --name=SMAC -PATH=$HOME/.local/bin:$PATH nnictl package install --name=BOHB diff --git a/test/pipelines-it-kubeflow.yml b/test/pipelines-it-kubeflow.yml index e9c160636c..3173a7312c 100644 --- a/test/pipelines-it-kubeflow.yml +++ b/test/pipelines-it-kubeflow.yml @@ -39,11 +39,6 @@ jobs: displayName: 'Install nni toolkit via source code' - script: | - python3 -m pip install scikit-learn==0.20.0 --user - python3 -m pip install torch==0.4.1 --user - python3 -m pip install torchvision==0.2.1 --user - python3 -m pip install keras==2.1.6 --user - python3 -m pip install tensorflow==1.12.0 --user sudo apt-get install swig -y PATH=$HOME/.local/bin:$PATH nnictl package install --name=SMAC PATH=$HOME/.local/bin:$PATH nnictl package install --name=BOHB diff --git a/test/pipelines-it-local.yml b/test/pipelines-it-local.yml index 34454a3c00..31a2e8cdb6 100644 --- a/test/pipelines-it-local.yml +++ b/test/pipelines-it-local.yml @@ -8,8 +8,14 @@ jobs: source install.sh displayName: 'Install nni toolkit via source code' - script: | - cd test - source install-it-deps.sh + python3 -m pip install scikit-learn==0.20.0 --user + python3 -m pip install torch==1.2.0 --user + python3 -m pip install torchvision==0.4.0 --user + python3 -m pip install keras==2.1.6 --user + python3 -m pip install tensorflow-gpu==1.12.0 --user + sudo apt-get install swig -y + PATH=$HOME/.local/bin:$PATH nnictl package install --name=SMAC + PATH=$HOME/.local/bin:$PATH nnictl package install --name=BOHB displayName: 'Install dependencies for integration tests' - script: | cd test diff --git a/test/pipelines-it-pai.yml b/test/pipelines-it-pai.yml index 5e44c7a6be..26c1e05cd8 100644 --- a/test/pipelines-it-pai.yml +++ b/test/pipelines-it-pai.yml @@ -39,11 +39,6 @@ jobs: displayName: 'Install nni toolkit via source code' - script: | - python3 -m pip install scikit-learn==0.20.0 --user - python3 -m pip install torch==0.4.1 --user - python3 -m pip install torchvision==0.2.1 --user - python3 -m pip install keras==2.1.6 --user - python3 -m pip install tensorflow-gpu==1.12.0 --user sudo apt-get install swig -y PATH=$HOME/.local/bin:$PATH nnictl package install --name=SMAC PATH=$HOME/.local/bin:$PATH nnictl package install --name=BOHB