Change *_mkldnn* test and build scenarios names to *_onednn*

apache · Mar 16, 2021 · 55e4f6a · 55e4f6a
1 parent aa92db0
commit 55e4f6a
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 52 deletions.
diff --git a/ci/dev_menu.py b/ci/dev_menu.py
@@ -148,7 +148,7 @@ def provision_virtualenv(venv_path=DEFAULT_PYENV):
     ]),
     ('[Docker] Python3 CPU Intel MKLDNN unittests',
     [
-        "ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_mkldnn",
+        "ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh build_ubuntu_cpu_onednn",
         "ci/build.py --platform ubuntu_cpu /work/runtime_functions.sh unittest_ubuntu_python3_cpu",
     ]),
     ('[Docker] Python3 ARMv7 unittests (QEMU)',

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -273,7 +273,7 @@ build_centos7_cpu() {
     ninja
 }
 
-build_centos7_mkldnn() {
+build_centos7_onednn() {
     set -ex
     cd /work/build
     source /opt/rh/devtoolset-7/enable
@@ -483,7 +483,7 @@ build_ubuntu_cpu_clang_tidy() {
     ninja
 }
 
-build_ubuntu_cpu_clang6_mkldnn() {
+build_ubuntu_cpu_clang6_onednn() {
     set -ex
     cd /work/build
     export OpenBLAS_HOME=/usr/local/openblas-clang/
@@ -496,7 +496,7 @@ build_ubuntu_cpu_clang6_mkldnn() {
     ninja
 }
 
-build_ubuntu_cpu_clang100_mkldnn() {
+build_ubuntu_cpu_clang100_onednn() {
     set -ex
     cd /work/build
     export OpenBLAS_HOME=/usr/local/openblas-clang/
@@ -508,7 +508,7 @@ build_ubuntu_cpu_clang100_mkldnn() {
     ninja
 }
 
-build_ubuntu_cpu_mkldnn() {
+build_ubuntu_cpu_onednn() {
     set -ex
     cd /work/build
     CC=gcc-7 CXX=g++-7 cmake \
@@ -523,7 +523,7 @@ build_ubuntu_cpu_mkldnn() {
     ninja
 }
 
-build_ubuntu_cpu_mkldnn_mkl() {
+build_ubuntu_cpu_onednn_mkl() {
     set -ex
     cd /work/build
     CC=gcc-7 CXX=g++-7 cmake \
@@ -593,7 +593,7 @@ build_ubuntu_gpu_tensorrt() {
     ninja
 }
 
-build_ubuntu_gpu_mkldnn() {
+build_ubuntu_gpu_onednn() {
     set -ex
     cd /work/build
     CC=gcc-7 CXX=g++-7 cmake \
@@ -607,7 +607,7 @@ build_ubuntu_gpu_mkldnn() {
     ninja
 }
 
-build_ubuntu_gpu_mkldnn_nocudnn() {
+build_ubuntu_gpu_onednn_nocudnn() {
     set -ex
     cd /work/build
     CC=gcc-7 CXX=g++-7 cmake \
@@ -775,7 +775,7 @@ unittest_ubuntu_python3_cpu() {
     pytest -m 'serial' --durations=50 --cov-report xml:tests_unittest.xml --cov-append --verbose tests/python/unittest
 }
 
-unittest_ubuntu_python3_cpu_mkldnn() {
+unittest_ubuntu_python3_cpu_onednn() {
     set -ex
     export PYTHONPATH=./python/
     export MXNET_MKLDNN_DEBUG=0  # Ignored if not present
@@ -1291,7 +1291,7 @@ build_static_libmxnet() {
 # Tests CD PyPI packaging in CI
 ci_package_pypi() {
     set -ex
-    # copies mkldnn header files to 3rdparty/onednn/include/oneapi/dnnl/ as in CD
+    # copies onednn header files to 3rdparty/onednn/include/oneapi/dnnl/ as in CD
     mkdir -p 3rdparty/onednn/include/oneapi/dnnl
     cp include/onednn/oneapi/dnnl/dnnl_version.h 3rdparty/onednn/include/oneapi/dnnl/.
     cp include/onednn/oneapi/dnnl/dnnl_config.h 3rdparty/onednn/include/oneapi/dnnl/.

diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
@@ -48,9 +48,9 @@ def python3_ut(docker_container_name) {
   }
 }
 
-def python3_ut_mkldnn(docker_container_name) {
+def python3_ut_onednn(docker_container_name) {
   timeout(time: max_time, unit: 'MINUTES') {
-    utils.docker_run(docker_container_name, 'unittest_ubuntu_python3_cpu_mkldnn', false)
+    utils.docker_run(docker_container_name, 'unittest_ubuntu_python3_cpu_onednn', false)
   }
 }
 
@@ -161,55 +161,55 @@ def compile_unix_mkl_cpu(lib_name) {
     }]
 }
 
-def compile_unix_mkldnn_cpu(lib_name) {
+def compile_unix_onednn_cpu(lib_name) {
     return ['CPU: MKLDNN': {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-mkldnn-cpu') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_mkldnn', false)
+            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_onednn', false)
             utils.pack_lib(lib_name, mx_mkldnn_lib, true)
           }
         }
       }
     }]
 }
 
-def compile_unix_mkldnn_mkl_cpu(lib_name) {
+def compile_unix_onednn_mkl_cpu(lib_name) {
     return ['CPU: MKLDNN_MKL': {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-mkldnn-cpu') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_mkldnn_mkl', false)
+            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_onednn_mkl', false)
             utils.pack_lib(lib_name, mx_mkldnn_lib, false)
           }
         }
       }
     }]
 }
 
-def compile_unix_mkldnn_gpu(lib_name) {
+def compile_unix_onednn_gpu(lib_name) {
     return ['GPU: MKLDNN': {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-mkldnn-gpu') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_gpu_cu111', 'build_ubuntu_gpu_mkldnn', false)
+            utils.docker_run('ubuntu_gpu_cu111', 'build_ubuntu_gpu_onednn', false)
             utils.pack_lib(lib_name, mx_mkldnn_lib)
           }
         }
       }
     }]
 }
 
-def compile_unix_mkldnn_nocudnn_gpu(lib_name) {
+def compile_unix_onednn_nocudnn_gpu(lib_name) {
     return ['GPU: MKLDNN_CUDNNOFF': {
        node(NODE_LINUX_CPU) {
          ws('workspace/build-mkldnn-gpu-nocudnn') {
            timeout(time: max_time, unit: 'MINUTES') {
              utils.init_git()
-             utils.docker_run('ubuntu_gpu_cu111', 'build_ubuntu_gpu_mkldnn_nocudnn', false)
+             utils.docker_run('ubuntu_gpu_cu111', 'build_ubuntu_gpu_onednn_nocudnn', false)
              utils.pack_lib(lib_name, mx_mkldnn_lib)
            }
          }
@@ -273,13 +273,13 @@ def compile_centos7_cpu(lib_name) {
     }]
 }
 
-def compile_centos7_cpu_mkldnn() {
+def compile_centos7_cpu_onednn() {
     return ['CPU: CentOS 7 MKLDNN': {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-centos7-mkldnn') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('centos7_cpu', 'build_centos7_mkldnn', false)
+            utils.docker_run('centos7_cpu', 'build_centos7_onednn', false)
           }
         }
       }
@@ -340,27 +340,27 @@ def compile_unix_clang_tidy_cpu() {
     }]
 }
 
-def compile_unix_clang_6_mkldnn_cpu() {
+def compile_unix_clang_6_onednn_cpu() {
     return ['CPU: Clang 6 MKLDNN': {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-cpu-mkldnn-clang6') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang6_mkldnn', false)
+            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang6_onednn', false)
           }
         }
       }
     }]
 }
 
 // TODO(leezu) delete once DUSE_DIST_KVSTORE=ON builds in -WError build
-def compile_unix_clang_10_mkldnn_cpu() {
+def compile_unix_clang_10_onednn_cpu() {
     return ['CPU: Clang 10 MKLDNN': {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-cpu-mkldnn-clang100') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang100_mkldnn', false)
+            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_clang100_onednn', false)
           }
         }
       }
@@ -518,7 +518,7 @@ def compile_windows_cpu(lib_name) {
     }]
 }
 
-def compile_windows_cpu_mkldnn(lib_name) {
+def compile_windows_cpu_onednn(lib_name) {
     return ['Build CPU MKLDNN windows':{
       node(NODE_WINDOWS_CPU) {
         ws('workspace/build-cpu-mkldnn') {
@@ -532,7 +532,7 @@ def compile_windows_cpu_mkldnn(lib_name) {
     }]
 }
 
-def compile_windows_cpu_mkldnn_mkl(lib_name) {
+def compile_windows_cpu_onednn_mkl(lib_name) {
     return ['Build CPU MKLDNN MKL windows':{
       node(NODE_WINDOWS_CPU) {
         ws('workspace/build-cpu-mkldnn-mkl') {
@@ -574,7 +574,7 @@ def compile_windows_gpu(lib_name) {
     }]
 }
 
-def compile_windows_gpu_mkldnn(lib_name) {
+def compile_windows_gpu_onednn(lib_name) {
     return ['Build GPU MKLDNN windows':{
       node(NODE_WINDOWS_CPU) {
         ws('workspace/build-gpu') {
@@ -724,13 +724,13 @@ def test_unix_python3_cpu_no_tvm_op(lib_name) {
     }]
 }
 
-def test_unix_python3_mkldnn_cpu(lib_name) {
+def test_unix_python3_onednn_cpu(lib_name) {
     return ['Python3: MKLDNN-CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/ut-python3-mkldnn-cpu') {
           try {
             utils.unpack_and_init(lib_name, mx_mkldnn_lib, true)
-            python3_ut_mkldnn('ubuntu_cpu')
+            python3_ut_onednn('ubuntu_cpu')
             utils.publish_test_coverage()
           } finally {
             utils.collect_test_results_unix('tests_unittest.xml', 'tests_python3_mkldnn_cpu_unittest.xml')
@@ -741,13 +741,13 @@ def test_unix_python3_mkldnn_cpu(lib_name) {
     }]
 }
 
-def test_unix_python3_mkldnn_mkl_cpu(lib_name) {
+def test_unix_python3_onednn_mkl_cpu(lib_name) {
     return ['Python3: MKLDNN-MKL-CPU': {
       node(NODE_LINUX_CPU) {
         ws('workspace/ut-python3-mkldnn-mkl-cpu') {
           try {
             utils.unpack_and_init(lib_name, mx_lib)
-            python3_ut_mkldnn('ubuntu_cpu')
+            python3_ut_onednn('ubuntu_cpu')
             utils.publish_test_coverage()
           } finally {
             utils.collect_test_results_unix('tests_unittest.xml', 'tests_python3_mkldnn_cpu_unittest.xml')
@@ -758,7 +758,7 @@ def test_unix_python3_mkldnn_mkl_cpu(lib_name) {
     }]
 }
 
-def test_unix_python3_mkldnn_gpu(lib_name) {
+def test_unix_python3_onednn_gpu(lib_name) {
     return ['Python3: MKLDNN-GPU': {
       node(NODE_LINUX_GPU_G4) {
         ws('workspace/ut-python3-mkldnn-gpu') {
@@ -774,7 +774,7 @@ def test_unix_python3_mkldnn_gpu(lib_name) {
     }]
 }
 
-def test_unix_python3_mkldnn_nocudnn_gpu(lib_name) {
+def test_unix_python3_onednn_nocudnn_gpu(lib_name) {
     return ['Python3: MKLDNN-GPU-NOCUDNN': {
       node(NODE_LINUX_GPU_G4) {
         ws('workspace/ut-python3-mkldnn-gpu-nocudnn') {
@@ -954,7 +954,7 @@ def test_windows_python3_gpu(lib_name) {
     }]
 }
 
-def test_windows_python3_gpu_mkldnn(lib_name) {
+def test_windows_python3_gpu_onednn(lib_name) {
     return ['Python 3: MKLDNN-GPU Win':{
       node(NODE_WINDOWS_GPU) {
         timeout(time: max_time, unit: 'MINUTES') {

diff --git a/ci/jenkins/Jenkinsfile_centos_cpu b/ci/jenkins/Jenkinsfile_centos_cpu
@@ -35,7 +35,7 @@ utils.main_wrapper(
 core_logic: {
   utils.parallel_stage('Build', [
     custom_steps.compile_centos7_cpu('centos7_cpu'),
-    custom_steps.compile_centos7_cpu_mkldnn(),
+    custom_steps.compile_centos7_cpu_onednn(),
     custom_steps.compile_static_python_cpu(),
     custom_steps.compile_static_cd_cpu('centos7_cpu_cd')
   ])

diff --git a/ci/jenkins/Jenkinsfile_clang b/ci/jenkins/Jenkinsfile_clang
@@ -37,8 +37,8 @@ core_logic: {
     custom_steps.compile_unix_clang_6_cpu(),
     custom_steps.compile_unix_clang_10_cpu(),
     custom_steps.compile_unix_clang_tidy_cpu(),
-    custom_steps.compile_unix_clang_6_mkldnn_cpu(),
-    custom_steps.compile_unix_clang_10_mkldnn_cpu()
+    custom_steps.compile_unix_clang_6_onednn_cpu(),
+    custom_steps.compile_unix_clang_10_onednn_cpu()
   ]) 
 }
 ,

diff --git a/ci/jenkins/Jenkinsfile_unix_cpu b/ci/jenkins/Jenkinsfile_unix_cpu
@@ -37,17 +37,17 @@ core_logic: {
     custom_steps.compile_unix_cpu_openblas('cpu'),
     custom_steps.compile_unix_openblas_debug_cpu('cpu_debug'),
     custom_steps.compile_unix_mkl_cpu('cpu_mkl'),
-    custom_steps.compile_unix_mkldnn_cpu('mkldnn_cpu'),
-    custom_steps.compile_unix_mkldnn_mkl_cpu('mkldnn_mkl_cpu'),
+    custom_steps.compile_unix_onednn_cpu('mkldnn_cpu'),
+    custom_steps.compile_unix_onednn_mkl_cpu('mkldnn_mkl_cpu'),
     custom_steps.compile_unix_int64_cpu('ubuntu_cpu'),
     custom_steps.compile_unix_openblas_cpu_no_tvm_op('cpu_openblas_no_tvm_op'),
   ])
 
   utils.parallel_stage('Tests', [
     custom_steps.test_unix_python3_cpu('cpu'),
     custom_steps.test_unix_python3_mkl_cpu('cpu_mkl'),
-    custom_steps.test_unix_python3_mkldnn_cpu('mkldnn_cpu'),
-    custom_steps.test_unix_python3_mkldnn_mkl_cpu('mkldnn_mkl_cpu'),
+    custom_steps.test_unix_python3_onednn_cpu('mkldnn_cpu'),
+    custom_steps.test_unix_python3_onednn_mkl_cpu('mkldnn_mkl_cpu'),
     /* disable onnx tests for now, until onnx work is forwarded-ported to master
     custom_steps.test_unix_onnx_cpu('cpu'),
     */

diff --git a/ci/jenkins/Jenkinsfile_unix_gpu b/ci/jenkins/Jenkinsfile_unix_gpu
@@ -34,8 +34,8 @@ utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu', linux_
 utils.main_wrapper(
 core_logic: {
   utils.parallel_stage('Build', [
-    custom_steps.compile_unix_mkldnn_gpu('mkldnn_gpu'),
-    custom_steps.compile_unix_mkldnn_nocudnn_gpu('mkldnn_gpu_nocudnn'),
+    custom_steps.compile_unix_onednn_gpu('mkldnn_gpu'),
+    custom_steps.compile_unix_onednn_nocudnn_gpu('mkldnn_gpu_nocudnn'),
     custom_steps.compile_unix_full_gpu('gpu'),
     custom_steps.compile_unix_full_gpu_debug('gpu_debug'),
     custom_steps.compile_unix_tensorrt_gpu('tensorrt'),
@@ -44,8 +44,8 @@ core_logic: {
 
   utils.parallel_stage('Tests', [
     custom_steps.test_unix_python3_gpu('gpu'),
-    custom_steps.test_unix_python3_mkldnn_gpu('mkldnn_gpu'),
-    custom_steps.test_unix_python3_mkldnn_nocudnn_gpu('mkldnn_gpu_nocudnn'),
+    custom_steps.test_unix_python3_onednn_gpu('mkldnn_gpu'),
+    custom_steps.test_unix_python3_onednn_nocudnn_gpu('mkldnn_gpu_nocudnn'),
     // TODO(szha): fix and reenable the hanging issue. tracked in #18098
     // custom_steps.test_unix_distributed_kvstore_gpu('gpu'),
     custom_steps.test_unix_byteps_gpu('gpu'),

diff --git a/ci/jenkins/Jenkinsfile_windows_cpu b/ci/jenkins/Jenkinsfile_windows_cpu
@@ -35,8 +35,8 @@ utils.main_wrapper(
 core_logic: {
   utils.parallel_stage('Build', [
     custom_steps.compile_windows_cpu('windows_package_cpu'),
-    custom_steps.compile_windows_cpu_mkldnn('windows_package_cpu_mkldnn'),
-    custom_steps.compile_windows_cpu_mkldnn_mkl('windows_package_cpu_mkldnn_mkl'),
+    custom_steps.compile_windows_cpu_onednn('windows_package_cpu_mkldnn'),
+    custom_steps.compile_windows_cpu_onednn_mkl('windows_package_cpu_mkldnn_mkl'),
     custom_steps.compile_windows_cpu_mkl('windows_package_cpu_mkl')
   ])
 

diff --git a/ci/jenkins/Jenkinsfile_windows_gpu b/ci/jenkins/Jenkinsfile_windows_gpu
@@ -35,12 +35,12 @@ utils.main_wrapper(
 core_logic: {
   utils.parallel_stage('Build', [
     custom_steps.compile_windows_gpu('windows_package_gpu'),
-    custom_steps.compile_windows_gpu_mkldnn('windows_package_gpu_mkldnn')
+    custom_steps.compile_windows_gpu_onednn('windows_package_gpu_mkldnn')
   ])
 
   utils.parallel_stage('Tests', [
     custom_steps.test_windows_python3_gpu('windows_package_gpu'),
-    custom_steps.test_windows_python3_gpu_mkldnn('windows_package_gpu_mkldnn')
+    custom_steps.test_windows_python3_gpu_onednn('windows_package_gpu_mkldnn')
   ])
 }
 ,

diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries
@@ -34,7 +34,7 @@ core_logic: {
       node(NODE_LINUX_CPU) {
         ws('workspace/build-mkldnn-gpu') {
           utils.init_git()
-          utils.docker_run('ubuntu_gpu_cu111', 'build_ubuntu_gpu_mkldnn', false)
+          utils.docker_run('ubuntu_gpu_cu111', 'build_ubuntu_gpu_onednn', false)
           utils.pack_lib('gpu', mx_lib)
         }
       }