From 3c77a8e1a8438ac42ec515b5b568525283ad9e51 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Sat, 20 Feb 2021 01:29:11 +0000 Subject: [PATCH 1/5] change cd mxnetlib task to use g4 node --- cd/mxnet_lib/mxnet_lib_pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd/mxnet_lib/mxnet_lib_pipeline.groovy b/cd/mxnet_lib/mxnet_lib_pipeline.groovy index 27064a3a21f6..e85536a02c78 100644 --- a/cd/mxnet_lib/mxnet_lib_pipeline.groovy +++ b/cd/mxnet_lib/mxnet_lib_pipeline.groovy @@ -74,7 +74,7 @@ def get_environment(mxnet_variant) { // to run a step def get_jenkins_node_label(mxnet_variant) { if (mxnet_variant.startsWith('cu')) { - return NODE_LINUX_GPU + return NODE_LINUX_GPU_G4 } return NODE_LINUX_CPU } From 1692b560e0606909a8f234fa050d24a7018586a7 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Sat, 20 Feb 2021 01:41:43 +0000 Subject: [PATCH 2/5] add g4 mapping --- cd/Jenkinsfile_release_job | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cd/Jenkinsfile_release_job b/cd/Jenkinsfile_release_job index 6b7784be7ade..636f70cd2e8b 100644 --- a/cd/Jenkinsfile_release_job +++ b/cd/Jenkinsfile_release_job @@ -59,7 +59,8 @@ pipeline { linux_gpu: 'restricted-mxnetlinux-gpu', linux_gpu_p3: 'restricted-mxnetlinux-gpu-p3', windows_cpu: 'restricted-mxnetwindows-cpu', - windows_gpu: 'restricted-mxnetwindows-gpu' + windows_gpu: 'restricted-mxnetwindows-gpu', + linux_gpu_g4: 'mxnetlinux-gpu-g4' ) // Skip Jenkins state update jobs From 0de15d08994bb3bdcd8c758daeef190bd9f294d5 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Mon, 22 Feb 2021 20:00:57 +0000 Subject: [PATCH 3/5] revert changes --- cd/Jenkinsfile_release_job | 3 +-- cd/mxnet_lib/mxnet_lib_pipeline.groovy | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cd/Jenkinsfile_release_job b/cd/Jenkinsfile_release_job index 636f70cd2e8b..6b7784be7ade 100644 --- a/cd/Jenkinsfile_release_job +++ b/cd/Jenkinsfile_release_job @@ -59,8 +59,7 @@ pipeline { linux_gpu: 'restricted-mxnetlinux-gpu', linux_gpu_p3: 'restricted-mxnetlinux-gpu-p3', windows_cpu: 'restricted-mxnetwindows-cpu', - windows_gpu: 'restricted-mxnetwindows-gpu', - linux_gpu_g4: 'mxnetlinux-gpu-g4' + windows_gpu: 'restricted-mxnetwindows-gpu' ) // Skip Jenkins state update jobs diff --git a/cd/mxnet_lib/mxnet_lib_pipeline.groovy b/cd/mxnet_lib/mxnet_lib_pipeline.groovy index e85536a02c78..27064a3a21f6 100644 --- a/cd/mxnet_lib/mxnet_lib_pipeline.groovy +++ b/cd/mxnet_lib/mxnet_lib_pipeline.groovy @@ -74,7 +74,7 @@ def get_environment(mxnet_variant) { // to run a step def get_jenkins_node_label(mxnet_variant) { if (mxnet_variant.startsWith('cu')) { - return NODE_LINUX_GPU_G4 + return NODE_LINUX_GPU } return NODE_LINUX_CPU } From 1d4c90b90f80b2657686e86dc77303a4363ec84c Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Mon, 22 Feb 2021 17:35:40 -0800 Subject: [PATCH 4/5] Update runtime_functions.sh --- ci/docker/runtime_functions.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 7bffd41b0c69..9dd9271db386 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1311,13 +1311,17 @@ cd_pypi_publish() { cd_s3_publish() { set -ex - pip3 install --user awscli + pip3 install --upgrade --user awscli filepath=$(readlink -f wheel_build/dist/*.whl) filename=$(basename $filepath) variant=$(echo $filename | cut -d'-' -f1 | cut -d'_' -f2 -s) if [ -z "${variant}" ]; then variant="cpu" fi + echo $SHELL + echo $PATH + ls /usr/local/bin + set aws s3 cp ${filepath} s3://apache-mxnet/dist/python/${variant}/${filename} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers full=id=43f628fab72838a4f0b929d7f1993b14411f4b0294b011261bc6bd3e950a6822 } From 1b8462d34aec15c0e0c29e5f6b7b9b6b8e7f1f8f Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Mon, 22 Feb 2021 20:57:26 -0800 Subject: [PATCH 5/5] Update runtime_functions.sh --- ci/docker/runtime_functions.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 427a63dfdc16..fb9783db4dd2 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1314,10 +1314,7 @@ cd_s3_publish() { if [ -z "${variant}" ]; then variant="cpu" fi - echo $SHELL - echo $PATH - ls /usr/local/bin - set + export PATH=/usr/local/bin:$PATH aws s3 cp ${filepath} s3://apache-mxnet/dist/python/${variant}/${filename} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers full=id=43f628fab72838a4f0b929d7f1993b14411f4b0294b011261bc6bd3e950a6822 }