Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

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

Merged
merged 2 commits into from
Mar 24, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0122914
Change *_mkldnn* test and build scenarios names to *_onednn*
bartekkuncer Mar 16, 2021
d19963c
Merge branch 'master' into changeTBS
bartekkuncer Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ci/build_windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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 '
Expand All @@ -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 '
Expand Down Expand Up @@ -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 '
Expand Down
8 changes: 4 additions & 4 deletions ci/dev_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
bartekkuncer marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
18 changes: 9 additions & 9 deletions ci/docker/runtime_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand All @@ -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/
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/.
Expand Down
Loading