From b02efaa7f8b88ae8c10285a9b19ac1f1b4edf533 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 18 Oct 2019 10:36:50 -0700 Subject: [PATCH 01/12] move to nightly --- ci/docker/runtime_functions.sh | 8 ++++++++ cpp-package/tests/ci_test.sh | 2 -- tests/nightly/JenkinsfileForBinaries | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index ef496dfe8168..9fafcd67af88 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1391,6 +1391,14 @@ nightly_test_installation() { source ./tests/jenkins/run_test_installation_docs.sh docs/install/index.md 1 1686; ${1} } +# Runs Imagenet inference +nightly_test_imagenet_inference() { + set -ex + cp ../../build/cpp-package/example/imagenet_inference . + ./unit_test_imagenet_inference.sh +} + + #Runs a simple MNIST training example nightly_test_image_classification() { set -ex diff --git a/cpp-package/tests/ci_test.sh b/cpp-package/tests/ci_test.sh index 2ac9d6fcd741..39f9e06861b3 100755 --- a/cpp-package/tests/ci_test.sh +++ b/cpp-package/tests/ci_test.sh @@ -66,8 +66,6 @@ cp ../../build/cpp-package/example/test_regress_label . sh unittests/unit_test_mlp_csv.sh cd inference -cp ../../../build/cpp-package/example/imagenet_inference . -./unit_test_imagenet_inference.sh cp ../../../build/cpp-package/example/sentiment_analysis_rnn . ./unit_test_sentiment_analysis_rnn.sh diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 5158274010b3..5ecd3aac965e 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -69,6 +69,13 @@ core_logic: { } } }, + 'ImageNet Inference: GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/nt-ImageInferenceTest') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) + } + }, 'KVStore_SingleNode: GPU': { node('mxnetlinux-gpu-p3-8xlarge') { ws('workspace/nt-KVStoreTest') { From 0495d0d00c12b346c5f45a0564e4b9b7ca1fe773 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 18 Oct 2019 10:47:00 -0700 Subject: [PATCH 02/12] bracket fix --- tests/nightly/JenkinsfileForBinaries | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 5ecd3aac965e..92efa51614bd 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -75,6 +75,7 @@ core_logic: { utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) } + } }, 'KVStore_SingleNode: GPU': { node('mxnetlinux-gpu-p3-8xlarge') { From 217aef1ab012c21778418a727e2497cb81b578db Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 18 Oct 2019 11:34:17 -0700 Subject: [PATCH 03/12] test imgnet comment rest --- ci/docker/runtime_functions.sh | 2 +- tests/nightly/JenkinsfileForBinaries | 112 +++++++++++++-------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 9fafcd67af88..3014faceeec3 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1394,7 +1394,7 @@ nightly_test_installation() { # Runs Imagenet inference nightly_test_imagenet_inference() { set -ex - cp ../../build/cpp-package/example/imagenet_inference . + cp ./build/cpp-package/example/imagenet_inference . ./unit_test_imagenet_inference.sh } diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 92efa51614bd..41c0c74b5273 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -61,14 +61,14 @@ core_logic: { } stage('NightlyTests'){ - parallel 'ImageClassification: GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/nt-ImageClassificationTest') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_image_classification', true) - } - } - }, + // parallel 'ImageClassification: GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/nt-ImageClassificationTest') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_image_classification', true) + // } + // } + // }, 'ImageNet Inference: GPU': { node(NODE_LINUX_GPU) { ws('workspace/nt-ImageInferenceTest') { @@ -77,14 +77,14 @@ core_logic: { } } }, - 'KVStore_SingleNode: GPU': { - node('mxnetlinux-gpu-p3-8xlarge') { - ws('workspace/nt-KVStoreTest') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) - } - } - }, + // 'KVStore_SingleNode: GPU': { + // node('mxnetlinux-gpu-p3-8xlarge') { + // ws('workspace/nt-KVStoreTest') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) + // } + // } + // }, // https://github.com/apache/incubator-mxnet/issues/14980 /*'Test Large Tensor Size: CPU': { node(NODE_LINUX_CPU) { @@ -103,46 +103,46 @@ core_logic: { } } },*/ - 'StraightDope: Python2 Single-GPU': { - node(NODE_LINUX_GPU_P3) { - ws('workspace/straight_dope-single_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) - } - } - }, - 'StraightDope: Python2 Multi-GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/straight_dope-multi_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) - } - } - }, - 'StraightDope: Python3 Single-GPU': { - node(NODE_LINUX_GPU_P3) { - ws('workspace/straight_dope-single_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) - } - } - }, - 'StraightDope: Python3 Multi-GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/straight_dope-multi_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) - } - } - }, - 'Gluon estimator: GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/estimator-test-gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) - } - } - } + // 'StraightDope: Python2 Single-GPU': { + // node(NODE_LINUX_GPU_P3) { + // ws('workspace/straight_dope-single_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) + // } + // } + // }, + // 'StraightDope: Python2 Multi-GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/straight_dope-multi_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) + // } + // } + // }, + // 'StraightDope: Python3 Single-GPU': { + // node(NODE_LINUX_GPU_P3) { + // ws('workspace/straight_dope-single_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) + // } + // } + // }, + // 'StraightDope: Python3 Multi-GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/straight_dope-multi_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) + // } + // } + // }, + // 'Gluon estimator: GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/estimator-test-gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) + // } + // } + // } } } , From 231810bec391c80c78928f28e9ac80c452f36594 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 18 Oct 2019 13:27:28 -0700 Subject: [PATCH 04/12] br --- tests/nightly/JenkinsfileForBinaries | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 41c0c74b5273..99c7304a1837 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -69,14 +69,14 @@ core_logic: { // } // } // }, - 'ImageNet Inference: GPU': { + parallel 'ImageNet Inference: GPU': { node(NODE_LINUX_GPU) { ws('workspace/nt-ImageInferenceTest') { utils.unpack_and_init('gpu', mx_lib) utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) } } - }, + } // 'KVStore_SingleNode: GPU': { // node('mxnetlinux-gpu-p3-8xlarge') { // ws('workspace/nt-KVStoreTest') { From 6648a6b23282562c85c860371ed3253f5413c2c0 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 18 Oct 2019 14:17:42 -0700 Subject: [PATCH 05/12] change dir --- ci/docker/runtime_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 3014faceeec3..5ced05d099b6 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1394,7 +1394,7 @@ nightly_test_installation() { # Runs Imagenet inference nightly_test_imagenet_inference() { set -ex - cp ./build/cpp-package/example/imagenet_inference . + cp /work/build/cpp-package/example/imagenet_inference . ./unit_test_imagenet_inference.sh } From f6c2e293fe6ea7935dfaa60eac81682df6265159 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Fri, 18 Oct 2019 16:03:03 -0700 Subject: [PATCH 06/12] change lib --- ci/docker/runtime_functions.sh | 2 +- tests/nightly/JenkinsfileForBinaries | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 5ced05d099b6..0af38b5e4448 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1394,7 +1394,7 @@ nightly_test_installation() { # Runs Imagenet inference nightly_test_imagenet_inference() { set -ex - cp /work/build/cpp-package/example/imagenet_inference . + cp /work/mxnet/build/cpp-package/example/imagenet_inference . ./unit_test_imagenet_inference.sh } diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 99c7304a1837..2e186b8cf272 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -20,6 +20,7 @@ mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a' mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so' +mx_lib_cpp_examples = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so' node('utility') { // Loading the utilities requires a node context unfortunately @@ -72,7 +73,7 @@ core_logic: { parallel 'ImageNet Inference: GPU': { node(NODE_LINUX_GPU) { ws('workspace/nt-ImageInferenceTest') { - utils.unpack_and_init('gpu', mx_lib) + utils.unpack_and_init('gpu', mx_lib_cpp_examples) utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) } } From 9b6e0a2440b6aa931089afe6334cb3367f383f00 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 21 Oct 2019 12:07:31 -0700 Subject: [PATCH 07/12] uncomment other tests --- tests/nightly/JenkinsfileForBinaries | 116 +++++++++++++-------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 2e186b8cf272..6237d34b9ecf 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -62,30 +62,30 @@ core_logic: { } stage('NightlyTests'){ - // parallel 'ImageClassification: GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/nt-ImageClassificationTest') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_image_classification', true) - // } - // } - // }, - parallel 'ImageNet Inference: GPU': { + parallel 'ImageClassification: GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/nt-ImageClassificationTest') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_image_classification', true) + } + } + }, + 'ImageNet Inference: GPU': { node(NODE_LINUX_GPU) { ws('workspace/nt-ImageInferenceTest') { utils.unpack_and_init('gpu', mx_lib_cpp_examples) utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) } } - } - // 'KVStore_SingleNode: GPU': { - // node('mxnetlinux-gpu-p3-8xlarge') { - // ws('workspace/nt-KVStoreTest') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) - // } - // } - // }, + }, + 'KVStore_SingleNode: GPU': { + node('mxnetlinux-gpu-p3-8xlarge') { + ws('workspace/nt-KVStoreTest') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) + } + } + }, // https://github.com/apache/incubator-mxnet/issues/14980 /*'Test Large Tensor Size: CPU': { node(NODE_LINUX_CPU) { @@ -104,46 +104,46 @@ core_logic: { } } },*/ - // 'StraightDope: Python2 Single-GPU': { - // node(NODE_LINUX_GPU_P3) { - // ws('workspace/straight_dope-single_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) - // } - // } - // }, - // 'StraightDope: Python2 Multi-GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/straight_dope-multi_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) - // } - // } - // }, - // 'StraightDope: Python3 Single-GPU': { - // node(NODE_LINUX_GPU_P3) { - // ws('workspace/straight_dope-single_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) - // } - // } - // }, - // 'StraightDope: Python3 Multi-GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/straight_dope-multi_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) - // } - // } - // }, - // 'Gluon estimator: GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/estimator-test-gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) - // } - // } - // } + 'StraightDope: Python2 Single-GPU': { + node(NODE_LINUX_GPU_P3) { + ws('workspace/straight_dope-single_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) + } + } + }, + 'StraightDope: Python2 Multi-GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/straight_dope-multi_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) + } + } + }, + 'StraightDope: Python3 Single-GPU': { + node(NODE_LINUX_GPU_P3) { + ws('workspace/straight_dope-single_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) + } + } + }, + 'StraightDope: Python3 Multi-GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/straight_dope-multi_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) + } + } + }, + 'Gluon estimator: GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/estimator-test-gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) + } + } + } } } , From f46debe3318aae8e26d965ad22078bbb7bb7b087 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 21 Oct 2019 14:07:02 -0700 Subject: [PATCH 08/12] change lib for build --- ci/docker/runtime_functions.sh | 1 + tests/nightly/JenkinsfileForBinaries | 100 +++++++++++++-------------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 0af38b5e4448..1e3179a5b771 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1394,6 +1394,7 @@ nightly_test_installation() { # Runs Imagenet inference nightly_test_imagenet_inference() { set -ex + echo $PWD cp /work/mxnet/build/cpp-package/example/imagenet_inference . ./unit_test_imagenet_inference.sh } diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 6237d34b9ecf..577dbd1ea3a1 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -37,7 +37,7 @@ core_logic: { ws('workspace/build-gpu') { utils.init_git() utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7', false) - utils.pack_lib('gpu', mx_lib) + utils.pack_lib('gpu', mx_lib_cpp_examples) } } }/*, @@ -77,15 +77,15 @@ core_logic: { utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) } } - }, - 'KVStore_SingleNode: GPU': { - node('mxnetlinux-gpu-p3-8xlarge') { - ws('workspace/nt-KVStoreTest') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) - } - } - }, + }//, + // 'KVStore_SingleNode: GPU': { + // node('mxnetlinux-gpu-p3-8xlarge') { + // ws('workspace/nt-KVStoreTest') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) + // } + // } + // }, // https://github.com/apache/incubator-mxnet/issues/14980 /*'Test Large Tensor Size: CPU': { node(NODE_LINUX_CPU) { @@ -104,46 +104,46 @@ core_logic: { } } },*/ - 'StraightDope: Python2 Single-GPU': { - node(NODE_LINUX_GPU_P3) { - ws('workspace/straight_dope-single_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) - } - } - }, - 'StraightDope: Python2 Multi-GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/straight_dope-multi_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) - } - } - }, - 'StraightDope: Python3 Single-GPU': { - node(NODE_LINUX_GPU_P3) { - ws('workspace/straight_dope-single_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) - } - } - }, - 'StraightDope: Python3 Multi-GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/straight_dope-multi_gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) - } - } - }, - 'Gluon estimator: GPU': { - node(NODE_LINUX_GPU) { - ws('workspace/estimator-test-gpu') { - utils.unpack_and_init('gpu', mx_lib) - utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) - } - } - } + // 'StraightDope: Python2 Single-GPU': { + // node(NODE_LINUX_GPU_P3) { + // ws('workspace/straight_dope-single_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) + // } + // } + // }, + // 'StraightDope: Python2 Multi-GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/straight_dope-multi_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) + // } + // } + // }, + // 'StraightDope: Python3 Single-GPU': { + // node(NODE_LINUX_GPU_P3) { + // ws('workspace/straight_dope-single_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) + // } + // } + // }, + // 'StraightDope: Python3 Multi-GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/straight_dope-multi_gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) + // } + // } + // }, + // 'Gluon estimator: GPU': { + // node(NODE_LINUX_GPU) { + // ws('workspace/estimator-test-gpu') { + // utils.unpack_and_init('gpu', mx_lib) + // utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) + // } + // } + // } } } , From 4f1628be54eadf0c952724941a77245742069103 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 21 Oct 2019 14:20:51 -0700 Subject: [PATCH 09/12] remove extraneous libs --- tests/nightly/JenkinsfileForBinaries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 577dbd1ea3a1..7b2770403aac 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -20,7 +20,7 @@ mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a' mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so' -mx_lib_cpp_examples = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so' +mx_lib_cpp_example = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, build/cpp-package/example/imagenet_inference' node('utility') { // Loading the utilities requires a node context unfortunately From 07ed0ea6c7a3ec9568c4b48ef9a71db0094592e2 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 21 Oct 2019 14:52:37 -0700 Subject: [PATCH 10/12] add cd to access shell script --- ci/docker/runtime_functions.sh | 2 +- tests/nightly/JenkinsfileForBinaries | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 1e3179a5b771..f00a860ca58b 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1396,10 +1396,10 @@ nightly_test_imagenet_inference() { set -ex echo $PWD cp /work/mxnet/build/cpp-package/example/imagenet_inference . + cd /work/mxnet/build/cpp-package/example/inference ./unit_test_imagenet_inference.sh } - #Runs a simple MNIST training example nightly_test_image_classification() { set -ex diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 7b2770403aac..303c8841e4a6 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -37,7 +37,7 @@ core_logic: { ws('workspace/build-gpu') { utils.init_git() utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7', false) - utils.pack_lib('gpu', mx_lib_cpp_examples) + utils.pack_lib('gpu', mx_lib_cpp_example) } } }/*, From a9dc61722b86596703e83deec94b8b98dcf250d0 Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 21 Oct 2019 16:35:30 -0700 Subject: [PATCH 11/12] ready to merge --- tests/nightly/JenkinsfileForBinaries | 100 +++++++++++++-------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index 303c8841e4a6..a66159d0075b 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -73,19 +73,19 @@ core_logic: { 'ImageNet Inference: GPU': { node(NODE_LINUX_GPU) { ws('workspace/nt-ImageInferenceTest') { - utils.unpack_and_init('gpu', mx_lib_cpp_examples) + utils.unpack_and_init('gpu', mx_lib_cpp_example) utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_imagenet_inference', true) } } - }//, - // 'KVStore_SingleNode: GPU': { - // node('mxnetlinux-gpu-p3-8xlarge') { - // ws('workspace/nt-KVStoreTest') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) - // } - // } - // }, + }, + 'KVStore_SingleNode: GPU': { + node('mxnetlinux-gpu-p3-8xlarge') { + ws('workspace/nt-KVStoreTest') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_test_KVStore_singleNode', true) + } + } + }, // https://github.com/apache/incubator-mxnet/issues/14980 /*'Test Large Tensor Size: CPU': { node(NODE_LINUX_CPU) { @@ -104,46 +104,46 @@ core_logic: { } } },*/ - // 'StraightDope: Python2 Single-GPU': { - // node(NODE_LINUX_GPU_P3) { - // ws('workspace/straight_dope-single_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) - // } - // } - // }, - // 'StraightDope: Python2 Multi-GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/straight_dope-multi_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) - // } - // } - // }, - // 'StraightDope: Python3 Single-GPU': { - // node(NODE_LINUX_GPU_P3) { - // ws('workspace/straight_dope-single_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) - // } - // } - // }, - // 'StraightDope: Python3 Multi-GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/straight_dope-multi_gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) - // } - // } - // }, - // 'Gluon estimator: GPU': { - // node(NODE_LINUX_GPU) { - // ws('workspace/estimator-test-gpu') { - // utils.unpack_and_init('gpu', mx_lib) - // utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) - // } - // } - // } + 'StraightDope: Python2 Single-GPU': { + node(NODE_LINUX_GPU_P3) { + ws('workspace/straight_dope-single_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_single_gpu_tests', true) + } + } + }, + 'StraightDope: Python2 Multi-GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/straight_dope-multi_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python2_multi_gpu_tests', true) + } + } + }, + 'StraightDope: Python3 Single-GPU': { + node(NODE_LINUX_GPU_P3) { + ws('workspace/straight_dope-single_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_single_gpu_tests', true) + } + } + }, + 'StraightDope: Python3 Multi-GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/straight_dope-multi_gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_straight_dope_python3_multi_gpu_tests', true) + } + } + }, + 'Gluon estimator: GPU': { + node(NODE_LINUX_GPU) { + ws('workspace/estimator-test-gpu') { + utils.unpack_and_init('gpu', mx_lib) + utils.docker_run('ubuntu_nightly_gpu', 'nightly_estimator', true) + } + } + } } } , From daa88e6ff8f4e98742ea46bbe77085147bf2aeca Mon Sep 17 00:00:00 2001 From: ChaiBapchya Date: Mon, 21 Oct 2019 17:43:40 -0700 Subject: [PATCH 12/12] fix dir structure --- ci/docker/runtime_functions.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index f00a860ca58b..8999cda06e0e 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1396,8 +1396,7 @@ nightly_test_imagenet_inference() { set -ex echo $PWD cp /work/mxnet/build/cpp-package/example/imagenet_inference . - cd /work/mxnet/build/cpp-package/example/inference - ./unit_test_imagenet_inference.sh + /work/mxnet/cpp-package/example/inference/unit_test_imagenet_inference.sh } #Runs a simple MNIST training example