From 7b6472f9ff1426496eeb1fcef9d3d9651ea0b003 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Thu, 31 Oct 2019 12:54:45 +0800 Subject: [PATCH 01/13] nni installation test pipeline --- test/pipelines-it-installation.yml | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 test/pipelines-it-installation.yml diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml new file mode 100644 index 0000000000..7394c6efd0 --- /dev/null +++ b/test/pipelines-it-installation.yml @@ -0,0 +1,54 @@ +jobs: +- job: 'pip_install_ubuntu_python36' + pool: + vmImage: 'ubuntu-16.04' + strategy: + matrix: + Python36: + PYTHON_VERSION: '3.6' + + steps: + - script: | + python3 -V + python3 -m pip install --upgrade nni --user + displayName: 'Install nni' + - script: | + cd examples/trials/mnist + nnictl create --config config.yml + displayName: 'mnist test' + +- job: 'pip_install_macOS_python36' + pool: + vmImage: 'macOS-10.13' + strategy: + matrix: + Python36: + PYTHON_VERSION: '3.6' + + steps: + - script: | + python3 -V + python3 -m pip install --upgrade nni --user + displayName: 'Install python tools' + - script: | + cd examples/trials/mnist + nnictl create --config config.yml + displayName: 'mnist test' + +- job: 'pip_install_windows_python36' + pool: + vmImage: 'windows-latest' + strategy: + matrix: + Python36: + PYTHON_VERSION: '3.6' + + steps: + - script: | + python -V + python -m pip install --upgrade nni --user + displayName: 'Install python tools' + - script: | + cd examples/trials/mnist + nnictl create --config config.yml + displayName: 'mnist test' From ea940a681c357dffd6c30feec5f49d4959b52935 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Thu, 31 Oct 2019 14:09:02 +0800 Subject: [PATCH 02/13] updates --- test/pipelines-it-installation.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 7394c6efd0..e737006ed8 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -10,7 +10,9 @@ jobs: steps: - script: | python3 -V + python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user + nnictl -v displayName: 'Install nni' - script: | cd examples/trials/mnist @@ -28,7 +30,9 @@ jobs: steps: - script: | python3 -V + python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user + nnictl -v displayName: 'Install python tools' - script: | cd examples/trials/mnist @@ -46,7 +50,9 @@ jobs: steps: - script: | python -V + python3 -m pip install --upgrade pip setuptools --user python -m pip install --upgrade nni --user + nnictl -v displayName: 'Install python tools' - script: | cd examples/trials/mnist From 03ffd792cf75d52ef90c0c4fdaefa967884968f8 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Thu, 31 Oct 2019 14:16:25 +0800 Subject: [PATCH 03/13] updates --- test/pipelines-it-installation.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index e737006ed8..efc21120c7 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -1,7 +1,7 @@ jobs: - job: 'pip_install_ubuntu_python36' pool: - vmImage: 'ubuntu-16.04' + vmImage: 'ubuntu-18.04' strategy: matrix: Python36: @@ -33,7 +33,9 @@ jobs: python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user nnictl -v - displayName: 'Install python tools' + cd examples/trials/mnist + nnictl create --config config.yml + displayName: 'Install nni' - script: | cd examples/trials/mnist nnictl create --config config.yml @@ -53,7 +55,9 @@ jobs: python3 -m pip install --upgrade pip setuptools --user python -m pip install --upgrade nni --user nnictl -v - displayName: 'Install python tools' + cd examples/trials/mnist + nnictl create --config config.yml + displayName: 'Install nni' - script: | cd examples/trials/mnist nnictl create --config config.yml From f77714fa4e96ce9b696512f1ee8e4497b4d50755 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Tue, 5 Nov 2019 18:07:14 +0800 Subject: [PATCH 04/13] updates --- test/pipelines-it-installation.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index efc21120c7..2f790f0dab 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -16,7 +16,7 @@ jobs: displayName: 'Install nni' - script: | cd examples/trials/mnist - nnictl create --config config.yml + ~/.local/bin/nnictl create --config config.yml displayName: 'mnist test' - job: 'pip_install_macOS_python36' @@ -32,13 +32,12 @@ jobs: python3 -V python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user - nnictl -v - cd examples/trials/mnist - nnictl create --config config.yml displayName: 'Install nni' - script: | cd examples/trials/mnist - nnictl create --config config.yml + $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '/Scripts/nnictl create --config config.yml' + echo $CMD + cmd.exe /c $CMD displayName: 'mnist test' - job: 'pip_install_windows_python36' @@ -54,11 +53,10 @@ jobs: python -V python3 -m pip install --upgrade pip setuptools --user python -m pip install --upgrade nni --user - nnictl -v - cd examples/trials/mnist - nnictl create --config config.yml displayName: 'Install nni' - script: | cd examples/trials/mnist - nnictl create --config config.yml + $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '\Scripts\nnictl.exe create --config config.yml' + echo $CMD + cmd.exe /c $CMD displayName: 'mnist test' From 8f8950414f7fc7c1ff28c75173c1268c254c124a Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Tue, 5 Nov 2019 18:16:12 +0800 Subject: [PATCH 05/13] updates --- test/pipelines-it-installation.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 2f790f0dab..4920c42ba7 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -12,7 +12,6 @@ jobs: python3 -V python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user - nnictl -v displayName: 'Install nni' - script: | cd examples/trials/mnist @@ -35,9 +34,10 @@ jobs: displayName: 'Install nni' - script: | cd examples/trials/mnist - $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '/Scripts/nnictl create --config config.yml' + BIN_FOLDER = $(python3 -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]).parents[2])')/bin + $CMD = $BIN_FOLDER + '/nnictl create --config config.yml' echo $CMD - cmd.exe /c $CMD + $CMD displayName: 'mnist test' - job: 'pip_install_windows_python36' @@ -58,5 +58,5 @@ jobs: cd examples/trials/mnist $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '\Scripts\nnictl.exe create --config config.yml' echo $CMD - cmd.exe /c $CMD + $CMD displayName: 'mnist test' From 03028dd7af23cf90f39c27071d82acf0ccc19cb5 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Tue, 5 Nov 2019 18:25:01 +0800 Subject: [PATCH 06/13] updates --- test/pipelines-it-installation.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 4920c42ba7..6cb17cd318 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -57,6 +57,5 @@ jobs: - script: | cd examples/trials/mnist $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '\Scripts\nnictl.exe create --config config.yml' - echo $CMD - $CMD + cmd.exe /c $CMD displayName: 'mnist test' From 3d58ad23024ac3b1f594e78c12357a034b698af2 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Tue, 5 Nov 2019 18:33:42 +0800 Subject: [PATCH 07/13] updates --- test/pipelines-it-installation.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 6cb17cd318..da7bd58277 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -34,7 +34,7 @@ jobs: displayName: 'Install nni' - script: | cd examples/trials/mnist - BIN_FOLDER = $(python3 -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]).parents[2])')/bin + $BIN_FOLDER = $(python3 -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]).parents[2])')/bin $CMD = $BIN_FOLDER + '/nnictl create --config config.yml' echo $CMD $CMD @@ -54,8 +54,8 @@ jobs: python3 -m pip install --upgrade pip setuptools --user python -m pip install --upgrade nni --user displayName: 'Install nni' - - script: | + - powershell: | cd examples/trials/mnist $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '\Scripts\nnictl.exe create --config config.yml' - cmd.exe /c $CMD + cmd /c $CMD displayName: 'mnist test' From b0b0531d047f0b059eac602d48443b6e69bbbfd0 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 6 Nov 2019 10:02:53 +0800 Subject: [PATCH 08/13] updates --- test/pipelines-it-installation.yml | 31 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index da7bd58277..3c8ad04b80 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -18,6 +18,25 @@ jobs: ~/.local/bin/nnictl create --config config.yml displayName: 'mnist test' +jobs: +- job: 'dev_install_ubuntu_python36' + pool: + vmImage: 'ubuntu-18.04' + strategy: + matrix: + Python36: + PYTHON_VERSION: '3.6' + + steps: + - script: | + make dev-install + displayName: 'make dev install' + - script: | + cd examples/trials/mnist + ~/.local/bin/nnictl create --config config.yml + displayName: 'mnist test' + + - job: 'pip_install_macOS_python36' pool: vmImage: 'macOS-10.13' @@ -32,13 +51,6 @@ jobs: python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user displayName: 'Install nni' - - script: | - cd examples/trials/mnist - $BIN_FOLDER = $(python3 -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]).parents[2])')/bin - $CMD = $BIN_FOLDER + '/nnictl create --config config.yml' - echo $CMD - $CMD - displayName: 'mnist test' - job: 'pip_install_windows_python36' pool: @@ -54,8 +66,3 @@ jobs: python3 -m pip install --upgrade pip setuptools --user python -m pip install --upgrade nni --user displayName: 'Install nni' - - powershell: | - cd examples/trials/mnist - $CMD = $(python -c 'import site; from pathlib import Path; print(Path(site.getsitepackages()[0]))') + '\Scripts\nnictl.exe create --config config.yml' - cmd /c $CMD - displayName: 'mnist test' From 3cdac40f4af94b5588631c25be9b4e78fef488a0 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 6 Nov 2019 10:04:25 +0800 Subject: [PATCH 09/13] updates --- test/pipelines-it-installation.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 3c8ad04b80..b6a3e96792 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -18,7 +18,6 @@ jobs: ~/.local/bin/nnictl create --config config.yml displayName: 'mnist test' -jobs: - job: 'dev_install_ubuntu_python36' pool: vmImage: 'ubuntu-18.04' From a0f3465e35edb7e5c7b8c892236568aac991ac70 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 6 Nov 2019 10:06:05 +0800 Subject: [PATCH 10/13] updates --- test/pipelines-it-installation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index b6a3e96792..c8ac16f685 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -28,6 +28,8 @@ jobs: steps: - script: | + python3 -V + python3 -m pip install --upgrade pip setuptools --user make dev-install displayName: 'make dev install' - script: | From c94413c531af6c307c63afbde5a7f5e1066fc61d Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Wed, 6 Nov 2019 10:26:06 +0800 Subject: [PATCH 11/13] updates --- test/pipelines-it-installation.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index c8ac16f685..2baf0ccb0d 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -18,26 +18,6 @@ jobs: ~/.local/bin/nnictl create --config config.yml displayName: 'mnist test' -- job: 'dev_install_ubuntu_python36' - pool: - vmImage: 'ubuntu-18.04' - strategy: - matrix: - Python36: - PYTHON_VERSION: '3.6' - - steps: - - script: | - python3 -V - python3 -m pip install --upgrade pip setuptools --user - make dev-install - displayName: 'make dev install' - - script: | - cd examples/trials/mnist - ~/.local/bin/nnictl create --config config.yml - displayName: 'mnist test' - - - job: 'pip_install_macOS_python36' pool: vmImage: 'macOS-10.13' From e15a3b0ec8db1ceaba23ecd6e56727bfacf34e0b Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Mon, 11 Nov 2019 11:27:09 +0800 Subject: [PATCH 12/13] updates --- test/pipelines-it-installation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 2baf0ccb0d..3b532290d1 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -44,6 +44,6 @@ jobs: steps: - script: | python -V - python3 -m pip install --upgrade pip setuptools --user + python -m pip install --upgrade pip setuptools --user python -m pip install --upgrade nni --user displayName: 'Install nni' From bf1efd1e38c6a7ed8cf55a4bfc1b35fe627fca24 Mon Sep 17 00:00:00 2001 From: Chengmin Chi Date: Mon, 11 Nov 2019 15:38:03 +0800 Subject: [PATCH 13/13] updates --- test/pipelines-it-installation.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/pipelines-it-installation.yml b/test/pipelines-it-installation.yml index 3b532290d1..a4fb28587b 100644 --- a/test/pipelines-it-installation.yml +++ b/test/pipelines-it-installation.yml @@ -13,10 +13,6 @@ jobs: python3 -m pip install --upgrade pip setuptools --user python3 -m pip install --upgrade nni --user displayName: 'Install nni' - - script: | - cd examples/trials/mnist - ~/.local/bin/nnictl create --config config.yml - displayName: 'mnist test' - job: 'pip_install_macOS_python36' pool: