Change *_mkldnn* test and build scenarios names to *_onednn* (#20034)

apache · Mar 24, 2021 · c7a8ccc · c7a8ccc
1 parent 50fb3e4
commit c7a8ccc
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 101 deletions.
diff --git a/ci/build_windows.py b/ci/build_windows.py
@@ -48,11 +48,11 @@
 
 class BuildFlavour(Enum):
     WIN_CPU = 'WIN_CPU'
-    WIN_CPU_MKLDNN = 'WIN_CPU_MKLDNN'
-    WIN_CPU_MKLDNN_MKL = 'WIN_CPU_MKLDNN_MKL'
+    WIN_CPU_ONEDNN = 'WIN_CPU_ONEDNN'
+    WIN_CPU_ONEDNN_MKL = 'WIN_CPU_ONEDNN_MKL'
     WIN_CPU_MKL = 'WIN_CPU_MKL'
     WIN_GPU = 'WIN_GPU'
-    WIN_GPU_MKLDNN = 'WIN_GPU_MKLDNN'
+    WIN_GPU_ONEDNN = 'WIN_GPU_ONEDNN'
 
 
 CMAKE_FLAGS = {
@@ -69,7 +69,7 @@ class BuildFlavour(Enum):
         '-DBUILD_CPP_EXAMPLES=ON '
         '-DCMAKE_BUILD_TYPE=Release')
 
-    , 'WIN_CPU_MKLDNN': (
+    , 'WIN_CPU_ONEDNN': (
         '-DCMAKE_C_COMPILER=cl '
         '-DCMAKE_CXX_COMPILER=cl '
         '-DUSE_CUDA=OFF '
@@ -82,7 +82,7 @@ class BuildFlavour(Enum):
         '-DUSE_ONEDNN=ON '
         '-DCMAKE_BUILD_TYPE=Release')
 
-    , 'WIN_CPU_MKLDNN_MKL': (
+    , 'WIN_CPU_ONEDNN_MKL': (
         '-DCMAKE_C_COMPILER=cl '
         '-DCMAKE_CXX_COMPILER=cl '
         '-DUSE_CUDA=OFF '
@@ -121,7 +121,7 @@ class BuildFlavour(Enum):
         '-DMXNET_CUDA_ARCH="5.2" '
         '-DCMAKE_BUILD_TYPE=Release')
 
-    , 'WIN_GPU_MKLDNN': (
+    , 'WIN_GPU_ONEDNN': (
         '-DCMAKE_C_COMPILER=cl '
         '-DCMAKE_CXX_COMPILER=cl '
         '-DUSE_CUDA=ON '

diff --git a/ci/dev_menu.py b/ci/dev_menu.py
@@ -141,14 +141,14 @@ def provision_virtualenv(venv_path=DEFAULT_PYENV):
         "ci/build.py --nvidiadocker --platform ubuntu_gpu /work/runtime_functions.sh build_ubuntu_gpu",
         "ci/build.py --nvidiadocker --platform ubuntu_gpu /work/runtime_functions.sh unittest_ubuntu_python3_gpu",
     ]),
-    ('[Docker] Python3 GPU+MKLDNN unittests',
+    ('[Docker] Python3 GPU+ONEDNN unittests',
     [
-        "ci/build.py --nvidiadocker --platform ubuntu_gpu /work/runtime_functions.sh build_ubuntu_gpu_cmake_mkldnn",
+        "ci/build.py --nvidiadocker --platform ubuntu_gpu /work/runtime_functions.sh build_ubuntu_gpu_onednn",
         "ci/build.py --nvidiadocker --platform ubuntu_gpu /work/runtime_functions.sh unittest_ubuntu_python3_gpu",
     ]),
-    ('[Docker] Python3 CPU Intel MKLDNN unittests',
+    ('[Docker] Python3 CPU Intel ONEDNN 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_ONEDNN_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/.