You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/05/07 18:16:13 UTC
[GitHub] piiswrong closed pull request #10629: [MXNET-343]fix Mkldnn with
msvc
piiswrong closed pull request #10629: [MXNET-343]fix Mkldnn with msvc
URL: https://github.com/apache/incubator-mxnet/pull/10629
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
index b4137dfc88e..0e7ca738866 160000
--- a/3rdparty/mkldnn
+++ b/3rdparty/mkldnn
@@ -1 +1 @@
-Subproject commit b4137dfc88e3bf5c6b62e833121802eb8c6696da
+Subproject commit 0e7ca738866d22cc700aa33b8de120b938f910d0
diff --git a/3rdparty/mshadow b/3rdparty/mshadow
index a8c650ce8a7..0b4cedd7015 160000
--- a/3rdparty/mshadow
+++ b/3rdparty/mshadow
@@ -1 +1 @@
-Subproject commit a8c650ce8a708608a282c4d1e251c57873a8db25
+Subproject commit 0b4cedd7015cc69191f8338a8feaacda90697758
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed96a6c8371..246ae995e90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,8 @@ mxnet_option(USE_SSE "Build with x86 SSE instruction support" ON)
mxnet_option(USE_F16C "Build with x86 F16C instruction support" ON) # autodetects support if ON
mxnet_option(USE_LAPACK "Build with lapack support" ON IF NOT MSVC)
mxnet_option(USE_MKL_IF_AVAILABLE "Use MKL if found" ON)
-mxnet_option(USE_MKLML_MKL "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND UNIX AND (NOT APPLE))
-mxnet_option(USE_MKLDNN "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND UNIX AND (NOT APPLE))
+mxnet_option(USE_MKLML_MKL "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND (NOT APPLE))
+mxnet_option(USE_MKLDNN "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND (NOT APPLE))
mxnet_option(USE_OPERATOR_TUNING "Enable auto-tuning of operators" ON IF NOT MSVC)
mxnet_option(USE_GPERFTOOLS "Build with GPerfTools support (if found)" ON)
mxnet_option(USE_JEMALLOC "Build with Jemalloc support" ON)
@@ -87,7 +87,6 @@ if(MSVC)
add_definitions(-DNNVM_EXPORTS)
add_definitions(-DDMLC_STRICT_CXX11)
add_definitions(-DNOMINMAX)
- set(SUPPORT_F16C FALSE)
if(USE_F16C)
message("F16C instruction set is not yet supported for MSVC")
endif()
@@ -185,34 +184,21 @@ if(USE_VTUNE)
list(APPEND mxnet_LINKER_LIBS dl)
endif()
-if(USE_MKL_IF_AVAILABLE)
- if(USE_MKLDNN)
- # We need to use generic archtecture. Otherwise, MKLDNN compiled in one
- # CPU architecture (e.g., C5) can't run on another architecture (e.g., g3).
+if(USE_MKLDNN)
+ include(cmake/MklDnn.cmake)
+ # CPU architecture (e.g., C5) can't run on another architecture (e.g., g3).
+ if(NOT MSVC)
set(ARCH_OPT_FLAGS "-mtune=generic")
- add_subdirectory(3rdparty/mkldnn)
- include_directories(3rdparty/mkldnn/include)
- add_definitions(-DMXNET_USE_MKLDNN=1)
- list(APPEND mxnet_LINKER_LIBS mkldnn)
- endif()
- find_package(MKL)
-
- if(MKL_FOUND)
- include_directories(${MKL_INCLUDE_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/operator/mkl)
-
- add_definitions(-DUSE_MKL=1)
- add_definitions(-DCUB_MKL=1)
- list(APPEND mxnet_LINKER_LIBS ${MKL_LIBRARIES})
-
- if(NOT MSVC)
- list(APPEND mxnet_LINKER_LIBS dl)
- endif()
- # If using MKL, use the Intel OMP libraries
- list(APPEND mxnet_LINKER_LIBS iomp5)
- else()
- message(STATUS " MKL not found")
endif()
+ set(WITH_TEST OFF)
+ set(WITH_EXAMPLE OFF)
+ add_subdirectory(3rdparty/mkldnn)
+
+ include_directories(3rdparty/mkldnn/include)
+ add_definitions(-DUSE_MKL=1)
+ add_definitions(-DCUB_MKL=1)
+ add_definitions(-DMXNET_USE_MKLDNN=1)
+ list(APPEND mxnet_LINKER_LIBS mkldnn)
endif()
# Allow Cuda compiles outside of src tree to find things in 'src' and 'include'
diff --git a/Jenkinsfile b/Jenkinsfile
index 7a08acc38a5..38bb235dfa1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -313,7 +313,7 @@ try {
bat """mkdir build_vc14_cpu
call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
cd build_vc14_cpu
- cmake -G \"Visual Studio 14 2015 Win64\" -DUSE_CUDA=0 -DUSE_CUDNN=0 -DUSE_NVRTC=0 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 ${env.WORKSPACE}"""
+ cmake -G \"Visual Studio 14 2015 Win64\" -DUSE_CUDA=0 -DUSE_CUDNN=0 -DUSE_NVRTC=0 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DUSE_MKL_IF_AVAILABLE=0 ${env.WORKSPACE}"""
bat 'C:\\mxnet\\build_vc14_cpu.bat'
bat '''rmdir /s/q pkg_vc14_cpu
@@ -347,7 +347,7 @@ try {
bat """mkdir build_vc14_gpu
call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
cd build_vc14_gpu
- cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1 -DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG" -DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
+ cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1 -DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG" -DCMAKE_BUILD_TYPE=Release -DUSE_MKL_IF_AVAILABLE=0 ${env.WORKSPACE}"""
bat 'C:\\mxnet\\build_vc14_gpu.bat'
bat '''rmdir /s/q pkg_vc14_gpu
mkdir pkg_vc14_gpu\\lib
@@ -370,6 +370,47 @@ try {
}
}
},
+ 'Build GPU MKLDNN windows':{
+ node('mxnetwindows-cpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ ws('workspace/build-gpu') {
+ withEnv(['OpenBLAS_HOME=C:\\mxnet\\openblas', 'OpenCV_DIR=C:\\mxnet\\opencv_vc14', 'CUDA_PATH=C:\\CUDA\\v8.0','BUILD_NAME=vc14_gpu_mkldnn']) {
+ init_git_win()
+ bat """mkdir build_%BUILD_NAME%
+ call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
+ cd build_%BUILD_NAME%
+ copy ${env.WORKSPACE}\\3rdparty\\mkldnn\\config_template.vcxproj.user ${env.WORKSPACE}\\config_template.vcxproj.user /y
+ cmake -G \"NMake Makefiles JOM\" -DUSE_CUDA=1 -DUSE_CUDNN=1 -DUSE_NVRTC=1 -DUSE_OPENCV=1 -DUSE_OPENMP=1 -DUSE_PROFILER=1 -DUSE_BLAS=open -DUSE_LAPACK=1 -DUSE_DIST_KVSTORE=0 -DCUDA_ARCH_NAME=All -DUSE_MKLDNN=1 -DCMAKE_CXX_FLAGS_RELEASE="/FS /MD /O2 /Ob2 /DNDEBUG" -DCMAKE_BUILD_TYPE=Release ${env.WORKSPACE}"""
+ bat '''
+ call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\x86_amd64\\vcvarsx86_amd64.bat"
+ cd build_%BUILD_NAME%
+ set /a cores=%NUMBER_OF_PROCESSORS% * 2
+ jom -j %cores%
+ '''
+ bat '''rmdir /s/q pkg_%BUILD_NAME%
+ mkdir pkg_%BUILD_NAME%\\lib
+ mkdir pkg_%BUILD_NAME%\\python
+ mkdir pkg_%BUILD_NAME%\\include
+ mkdir pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\libmxnet.lib pkg_%BUILD_NAME%\\lib
+ copy build_%BUILD_NAME%\\libmxnet.dll pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\3rdparty\\mkldnn\\src\\mkldnn.dll pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\libiomp5md.dll pkg_%BUILD_NAME%\\build
+ copy build_%BUILD_NAME%\\mklml.dll pkg_%BUILD_NAME%\\build
+ xcopy python pkg_%BUILD_NAME%\\python /E /I /Y
+ xcopy include pkg_%BUILD_NAME%\\include /E /I /Y
+ xcopy 3rdparty\\dmlc-core\\include pkg_%BUILD_NAME%\\include /E /I /Y
+ xcopy 3rdparty\\mshadow\\mshadow pkg_%BUILD_NAME%\\include\\mshadow /E /I /Y
+ xcopy 3rdparty\\nnvm\\include pkg_%BUILD_NAME%\\nnvm\\include /E /I /Y
+ del /Q *.7z
+ 7z.exe a %BUILD_NAME%.7z pkg_%BUILD_NAME%\\
+ '''
+ stash includes: 'vc14_gpu_mkldnn.7z', name: 'vc14_gpu_mkldnn'
+ }
+ }
+ }
+ }
+ },
'NVidia Jetson / ARMv8':{
node('mxnetlinux-cpu') {
ws('workspace/build-jetson-armv8') {
@@ -679,6 +720,24 @@ try {
}
}
}
+ },
+ 'Python 3: MKLDNN-GPU Win':{
+ node('mxnetwindows-gpu') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ ws('workspace/ut-python-gpu') {
+ init_git_win()
+ unstash 'vc14_gpu_mkldnn'
+ bat '''rmdir /s/q pkg_vc14_gpu_mkldnn
+ 7z x -y vc14_gpu_mkldnn.7z'''
+ bat """xcopy C:\\mxnet\\data data /E /I /Y
+ xcopy C:\\mxnet\\model model /E /I /Y
+ call activate py3
+ set PYTHONPATH=${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python
+ del /S /Q ${env.WORKSPACE}\\pkg_vc14_gpu_mkldnn\\python\\*.pyc
+ C:\\mxnet\\test_gpu.bat"""
+ }
+ }
+ }
}
}
diff --git a/cmake/FirstClassLangCuda.cmake b/cmake/FirstClassLangCuda.cmake
index f4dcbbe448d..a70d63e2a60 100644
--- a/cmake/FirstClassLangCuda.cmake
+++ b/cmake/FirstClassLangCuda.cmake
@@ -126,7 +126,7 @@ endif ()
function(mshadow_select_nvcc_arch_flags out_variable)
set(CUDA_ARCH_LIST "Auto" CACHE STRING "Select target NVIDIA GPU achitecture.")
- set_property( CACHE CUDA_ARCH_LIST PROPERTY STRINGS "" "All" "Common" ${CUDA_KNOWN_GPU_ARCHITECTURES} )
+ set_property( CACHE CUDA_ARCH_LIST PROPERTY STRINGS "" "Auto" "All" "Common" ${CUDA_KNOWN_GPU_ARCHITECTURES} )
mark_as_advanced(CUDA_ARCH_NAME)
diff --git a/cmake/MklDnn.cmake b/cmake/MklDnn.cmake
new file mode 100644
index 00000000000..acaf878b2f4
--- /dev/null
+++ b/cmake/MklDnn.cmake
@@ -0,0 +1,44 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#this file download mklml
+
+message(STATUS "download mklml")
+if(MSVC)
+ set(MKL_NAME "mklml_win_2018.0.3.20180406")
+ file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.14/${MKL_NAME}.zip" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" EXPECTED_MD5 "8DD73E7D3F19F004551809824C4E8970" SHOW_PROGRESS)
+ file(DOWNLOAD "https://github.com/apache/incubator-mxnet/releases/download/utils/7z.exe" "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" EXPECTED_MD5 "E1CF766CF358F368EC97662D06EA5A4C" SHOW_PROGRESS)
+
+ execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z2.exe" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
+ execute_process(COMMAND "${CMAKE_CURRENT_BINARY_DIR}/mklml/7z.exe" "x" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.zip" "-o${CMAKE_CURRENT_BINARY_DIR}/mklml/" "-y")
+ set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
+ include_directories(${MKLROOT}/include)
+ file(COPY ${MKLROOT}/lib/libiomp5md.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${MKLROOT}/lib/mklml.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${CMAKE_SOURCE_DIR}/3rdparty/mkldnn/config_template.vcxproj.user DESTINATION ${CMAKE_SOURCE_DIR})
+elseif(UNIX)
+ set(MKL_NAME "mklml_lnx_2018.0.3.20180406")
+ file(DOWNLOAD "https://github.com/intel/mkl-dnn/releases/download/v0.14/${MKL_NAME}.tgz" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" EXPECTED_MD5 "DAF7EFC3C1C0036B447213004467A8AE" SHOW_PROGRESS)
+ execute_process(COMMAND "tar" "-xzf" "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}.tgz" "-C" "${CMAKE_CURRENT_BINARY_DIR}/mklml/")
+ set(MKLROOT "${CMAKE_CURRENT_BINARY_DIR}/mklml/${MKL_NAME}")
+ include_directories(${MKLROOT}/include)
+ file(COPY ${MKLROOT}/lib/libiomp5.so DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${MKLROOT}/lib/libmklml_gnu.so DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${MKLROOT}/lib/libmklml_intel.so DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+else()
+ message(FATAL_ERROR "not support now")
+endif()
diff --git a/python/mxnet/libinfo.py b/python/mxnet/libinfo.py
index 3220b5a3352..ba2530679f0 100644
--- a/python/mxnet/libinfo.py
+++ b/python/mxnet/libinfo.py
@@ -22,6 +22,7 @@
import platform
import logging
+
def find_lib_path():
"""Find MXNet dynamic library files.
@@ -37,6 +38,8 @@ def find_lib_path():
logging.warning("MXNET_LIBRARY_PATH should be an absolute path, instead of: %s",
lib_from_env)
else:
+ if os.name == 'nt':
+ os.environ['PATH'] = os.environ['PATH'] + ';' + os.path.dirname(lib_from_env)
return [lib_from_env]
else:
logging.warning("MXNET_LIBRARY_PATH '%s' doesn't exist", lib_from_env)
@@ -60,7 +63,7 @@ def find_lib_path():
os.environ['PATH'] = os.path.dirname(__file__) + ';' + os.environ['PATH']
dll_path = [os.path.join(p, 'libmxnet.dll') for p in dll_path]
elif platform.system() == 'Darwin':
- dll_path = [os.path.join(p, 'libmxnet.dylib') for p in dll_path]+ \
+ dll_path = [os.path.join(p, 'libmxnet.dylib') for p in dll_path] + \
[os.path.join(p, 'libmxnet.so') for p in dll_path]
else:
dll_path.append('../../../')
@@ -69,6 +72,8 @@ def find_lib_path():
if len(lib_path) == 0:
raise RuntimeError('Cannot find the MXNet library.\n' +
'List of candidates:\n' + str('\n'.join(dll_path)))
+ if os.name == 'nt':
+ os.environ['PATH'] = os.environ['PATH'] + ';' + os.path.dirname(lib_path[0])
return lib_path
diff --git a/src/operator/nn/mkldnn/mkldnn_base.cc b/src/operator/nn/mkldnn/mkldnn_base.cc
index c0e1ee6aaa6..2528d097d7f 100644
--- a/src/operator/nn/mkldnn/mkldnn_base.cc
+++ b/src/operator/nn/mkldnn/mkldnn_base.cc
@@ -129,7 +129,7 @@ void CommitOutput(const NDArray &arr, const mkldnn_output_t &res) {
// We have to allocate new memory for the sum result.
auto sum_res = TmpMemMgr::Get()->Alloc(
res.second->get_primitive_desc());
- op::Sum(*res.second, *mem, *sum_res);
+ op::MKLDNNSum(*res.second, *mem, *sum_res);
const_cast<NDArray &>(arr).CopyFrom(*sum_res);
}
}
@@ -219,6 +219,7 @@ mkldnn_memory_format_t GetDefaultFormat(const mkldnn::memory::desc &desc) {
case mkldnn_hwio:
case mkldnn_OIhw8i8o:
case mkldnn_OIhw16i16o:
+ case mkldnn_OIhw4i16o4i:
case mkldnn_OIhw8i16o2i:
case mkldnn_OIhw8o16i2o:
case mkldnn_OIhw8o8i:
@@ -239,6 +240,7 @@ mkldnn_memory_format_t GetDefaultFormat(const mkldnn::memory::desc &desc) {
case mkldnn_goihw:
case mkldnn_gOIhw8i8o:
case mkldnn_gOIhw16i16o:
+ case mkldnn_gOIhw4i16o4i:
case mkldnn_gOIhw8i16o2i:
case mkldnn_gOIhw8o16i2o:
case mkldnn_gOIhw8o8i:
@@ -349,7 +351,11 @@ static bool SimilarArray(const mxnet::NDArray &arr1, const mxnet::NDArray &arr2,
arr2.IsMKLDNNData() ? buf2.data().dptr_: arr2.data().dptr_);
std::atomic<bool> success(true);
#pragma omp parallel for
+#ifdef _MSC_VER
+ for (int64_t i = 0; i < arr1.shape().Size(); i++) {
+#else
for (size_t i = 0; i < arr1.shape().Size(); i++) {
+#endif
if (std::abs(data1[i] - data2[i]) > atol + rtol * std::abs(data2[i]))
success.store(false);
}
diff --git a/src/operator/nn/mkldnn/mkldnn_copy.cc b/src/operator/nn/mkldnn/mkldnn_copy.cc
index 71d540c969c..4bfb7faad96 100644
--- a/src/operator/nn/mkldnn/mkldnn_copy.cc
+++ b/src/operator/nn/mkldnn/mkldnn_copy.cc
@@ -44,7 +44,7 @@ void MKLDNNCopy(const nnvm::NodeAttrs& attrs, const OpContext &ctx,
if (out_mem == nullptr)
out_mem = out_data.GetMKLDNNData();
auto sum_res = TmpMemMgr::Get()->Alloc(out_mem->get_primitive_desc());
- Sum(*in_mem, *out_mem, *sum_res);
+ MKLDNNSum(*in_mem, *out_mem, *sum_res);
const_cast<NDArray &>(out_data).CopyFrom(*sum_res);
} else {
const_cast<NDArray &>(out_data).CopyFrom(*in_mem);
diff --git a/src/operator/nn/mkldnn/mkldnn_ops-inl.h b/src/operator/nn/mkldnn/mkldnn_ops-inl.h
index 9149cb0c6a9..50937706d93 100644
--- a/src/operator/nn/mkldnn/mkldnn_ops-inl.h
+++ b/src/operator/nn/mkldnn/mkldnn_ops-inl.h
@@ -104,7 +104,7 @@ void MKLDNNActivationBackward(const nnvm::NodeAttrs& attrs, const OpContext &ctx
const NDArray &out_grad, const NDArray &in_data,
const OpReqType &req, const NDArray &in_grad);
-void Sum(const mkldnn::memory &arr1, const mkldnn::memory &arr2,
+void MKLDNNSum(const mkldnn::memory &arr1, const mkldnn::memory &arr2,
const mkldnn::memory &out);
} // namespace op
diff --git a/src/operator/nn/mkldnn/mkldnn_sum.cc b/src/operator/nn/mkldnn/mkldnn_sum.cc
index ccad068e423..361ce58af07 100644
--- a/src/operator/nn/mkldnn/mkldnn_sum.cc
+++ b/src/operator/nn/mkldnn/mkldnn_sum.cc
@@ -31,7 +31,7 @@
namespace mxnet {
namespace op {
-void Sum(const mkldnn::memory &arr1, const mkldnn::memory &arr2,
+void MKLDNNSum(const mkldnn::memory &arr1, const mkldnn::memory &arr2,
const mkldnn::memory &out) {
std::vector<mkldnn::memory::primitive_desc> input_pds(2);
std::vector<float> scales(2, 1);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4dd409d979e..3b5135e2be5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -58,6 +58,6 @@ if(GTEST_FOUND AND NOT MSVC)
add_test(AllTestsIn${PROJECT_NAME}UnitTests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}_unit_tests)
else()
- message(WARNING "Google Test not found")
+ message(STATUS "Google Test not found")
endif()
diff --git a/tests/cpp/operator/mkldnn.cc b/tests/cpp/operator/mkldnn.cc
index 58ad894e36b..c20cd75e07d 100644
--- a/tests/cpp/operator/mkldnn.cc
+++ b/tests/cpp/operator/mkldnn.cc
@@ -82,9 +82,9 @@ TEST(MKLDNN_UTIL_FUNC, AlignMem) {
TEST(MKLDNN_UTIL_FUNC, MemFormat) {
// Check whether the number of format is correct.
- CHECK_EQ(mkldnn_format_last, 56);
+ CHECK_EQ(mkldnn_format_last, 67);
CHECK_EQ(mkldnn_nchw, 5);
- CHECK_EQ(mkldnn_oihw, 12);
+ CHECK_EQ(mkldnn_oihw, 15);
}
// Init arrays with the default layout.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services