From d0a5ee5b46c6883e3537db7b50d2fbd0ee9d84a0 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Thu, 10 Oct 2019 23:00:49 +0000 Subject: [PATCH] Disable tests with MXNet 1.5 completely Instead of running tests for nightly version twice --- ci/jenkins/Jenkinsfile_py3_cpu_unittest | 70 +++++++++++----------- ci/jenkins/Jenkinsfile_py3_gpu_integration | 38 ++++++------ ci/jenkins/Jenkinsfile_py3_gpu_unittest | 54 ++++++++--------- env/cpu/py3.yml | 2 +- env/gpu/py3.yml | 2 +- 5 files changed, 83 insertions(+), 83 deletions(-) diff --git a/ci/jenkins/Jenkinsfile_py3_cpu_unittest b/ci/jenkins/Jenkinsfile_py3_cpu_unittest index 234f1d474a..0ccb6ce57c 100644 --- a/ci/jenkins/Jenkinsfile_py3_cpu_unittest +++ b/ci/jenkins/Jenkinsfile_py3_cpu_unittest @@ -31,39 +31,39 @@ node { } utils.assign_node_labels(linux_gpu: 'linux-gpu', linux_cpu: 'linux-cpu') -utils.main_wrapper( -core_logic: { - utils.parallel_stage('Sanity', [ - build_steps.sanity_lint('gluon-nlp-cpu-py3', 'cpu/py3', 'src/gluonnlp') - ]) +// utils.main_wrapper( +// core_logic: { +// utils.parallel_stage('Sanity', [ +// build_steps.sanity_lint('gluon-nlp-cpu-py3', 'cpu/py3', 'src/gluonnlp') +// ]) - utils.parallel_stage('Tests', [ - build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', - 'tests/unittest', 'src/gluonnlp', - 'not (gpu or serial)', - 4, false, false), - build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', - 'tests/unittest', 'src/gluonnlp', - '(not gpu) and serial', - 0, false, false), - build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'not (gpu or serial or integration)', - 4, false, false), - build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'not (gpu or integration) and serial', - 0, false, false), - build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'not (gpu or serial) and integration', - 4, false, false), - build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', - 'scripts/tests', 'src/gluonnlp', - '(not gpu) and serial and integration', - 0, false, false) - ]) -} -, -failure_handler: {} -) +// utils.parallel_stage('Tests', [ +// build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', +// 'tests/unittest', 'src/gluonnlp', +// 'not (gpu or serial)', +// 4, false, false), +// build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', +// 'tests/unittest', 'src/gluonnlp', +// '(not gpu) and serial', +// 0, false, false), +// build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'not (gpu or serial or integration)', +// 4, false, false), +// build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'not (gpu or integration) and serial', +// 0, false, false), +// build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'not (gpu or serial) and integration', +// 4, false, false), +// build_steps.test_unittest('gluon-nlp-cpu-py3', 'cpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// '(not gpu) and serial and integration', +// 0, false, false) +// ]) +// } +// , +// failure_handler: {} +// ) diff --git a/ci/jenkins/Jenkinsfile_py3_gpu_integration b/ci/jenkins/Jenkinsfile_py3_gpu_integration index e683f5f14d..1567c4c620 100644 --- a/ci/jenkins/Jenkinsfile_py3_gpu_integration +++ b/ci/jenkins/Jenkinsfile_py3_gpu_integration @@ -31,23 +31,23 @@ node { } utils.assign_node_labels(linux_gpu: 'linux-gpu', linux_cpu: 'linux-cpu') -utils.main_wrapper( -core_logic: { - utils.parallel_stage('Sanity', [ - build_steps.sanity_lint('gluon-nlp-gpu-py3', 'gpu/py3', 'scripts') - ]) +// utils.main_wrapper( +// core_logic: { +// utils.parallel_stage('Sanity', [ +// build_steps.sanity_lint('gluon-nlp-gpu-py3', 'gpu/py3', 'scripts') +// ]) - utils.parallel_stage('Scripts', [ - build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'gpu and (not serial) and integration', - 4, true, true), - build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'gpu and serial and integration', - 0, true, true) - ]) -} -, -failure_handler: {} -) +// utils.parallel_stage('Scripts', [ +// build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'gpu and (not serial) and integration', +// 4, true, true), +// build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'gpu and serial and integration', +// 0, true, true) +// ]) +// } +// , +// failure_handler: {} +// ) diff --git a/ci/jenkins/Jenkinsfile_py3_gpu_unittest b/ci/jenkins/Jenkinsfile_py3_gpu_unittest index 8430ca0a36..47882f2a34 100644 --- a/ci/jenkins/Jenkinsfile_py3_gpu_unittest +++ b/ci/jenkins/Jenkinsfile_py3_gpu_unittest @@ -31,31 +31,31 @@ node { } utils.assign_node_labels(linux_gpu: 'linux-gpu', linux_cpu: 'linux-cpu') -utils.main_wrapper( -core_logic: { - utils.parallel_stage('Sanity', [ - build_steps.sanity_lint('gluon-nlp-gpu-py3', 'gpu/py3', 'src/gluonnlp') - ]) +// utils.main_wrapper( +// core_logic: { +// utils.parallel_stage('Sanity', [ +// build_steps.sanity_lint('gluon-nlp-gpu-py3', 'gpu/py3', 'src/gluonnlp') +// ]) - utils.parallel_stage('Tests', [ - build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', - 'tests/unittest', 'src/gluonnlp', - 'gpu and not serial', - 4, true, false), - build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', - 'tests/unittest', 'src/gluonnlp', - 'gpu and serial', - 0, true, false), - build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'gpu and not (serial or integration)', - 4, true, false), - build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', - 'scripts/tests', 'src/gluonnlp', - 'gpu and serial and not integration', - 0, true, false) - ]) -} -, -failure_handler: {} -) +// utils.parallel_stage('Tests', [ +// build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', +// 'tests/unittest', 'src/gluonnlp', +// 'gpu and not serial', +// 4, true, false), +// build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', +// 'tests/unittest', 'src/gluonnlp', +// 'gpu and serial', +// 0, true, false), +// build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'gpu and not (serial or integration)', +// 4, true, false), +// build_steps.test_unittest('gluon-nlp-gpu-py3', 'gpu/py3', +// 'scripts/tests', 'src/gluonnlp', +// 'gpu and serial and not integration', +// 0, true, false) +// ]) +// } +// , +// failure_handler: {} +// ) diff --git a/env/cpu/py3.yml b/env/cpu/py3.yml index 81a47f9928..48948646e8 100644 --- a/env/cpu/py3.yml +++ b/env/cpu/py3.yml @@ -30,7 +30,7 @@ dependencies: - scipy=1.3.1 - pip: - pylint-quotes==0.2.1 - - mxnet-mkl>=1.6.0b20191006 + - mxnet-mkl>=1.5.0 - sacremoses - sentencepiece<0.2 - https://github.com/szha/mx-theme/tarball/master diff --git a/env/gpu/py3.yml b/env/gpu/py3.yml index 5dd4649fc4..b68fca389f 100644 --- a/env/gpu/py3.yml +++ b/env/gpu/py3.yml @@ -29,7 +29,7 @@ dependencies: - scipy=1.3.1 - pip: - pylint-quotes==0.2.1 - - mxnet-cu101mkl>=1.6.0b20191006 + - mxnet-cu101mkl>=1.5.0 - sacremoses - sentencepiece<0.2 - https://github.com/szha/mx-theme/tarball/master