t p# This is a combination of 13 commits.

Disable tests with MXNet 1.5 completely Instead of running tests for nightly version twice Try fix 'Inline literal start-string without end-string' error Revert "Try fix 'Inline literal start-string without end-string' error" This reverts commit b3b9e66. Fix gpu_doc exit code Improve the fix Fix syntax Escape $ Don't escape { Revert "Don't escape {" This reverts commit 976d455. Revert "Escape $" This reverts commit 9fd9e54. Revert "Fix syntax" This reverts commit 4ba73f6. Revert "Improve the fix" This reverts commit f62b817. Revert "Fix gpu_doc exit code" This reverts commit 0a3080e.
dmlc · Oct 13, 2019 · c1e72d0 · c1e72d0
1 parent 8c92e03
commit c1e72d0
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 83 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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