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

Commit da61046

Browse files
committed
change mxnet_option behavior
fix omp with msvc with mkldnn
1 parent 100586a commit da61046

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mxnet_option(USE_SSE "Build with x86 SSE instruction support" ON IF
2929
mxnet_option(USE_F16C "Build with x86 F16C instruction support" ON) # autodetects support if ON
3030
mxnet_option(USE_LAPACK "Build with lapack support" ON)
3131
mxnet_option(USE_MKL_IF_AVAILABLE "Use MKL if found" ON)
32-
mxnet_option(USE_MKLML_MKL "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND (NOT APPLE))
32+
mxnet_option(USE_MKLML_MKL "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND (NOT APPLE) AND (NOT MSVC) )
3333
mxnet_option(USE_MKLDNN "Use MKLDNN variant of MKL (if MKL found)" ON IF USE_MKL_IF_AVAILABLE AND (NOT APPLE) AND (NOT MSVC) AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") AND (NOT CMAKE_CROSSCOMPILING))
3434
mxnet_option(USE_OPERATOR_TUNING "Enable auto-tuning of operators" ON IF NOT MSVC)
3535
mxnet_option(USE_GPERFTOOLS "Build with GPerfTools support" OFF)

cmake/Utils.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ function(mxnet_option variable description value)
216216
option(${variable} "${description}" ${__value})
217217
endif()
218218
else()
219-
unset(${variable} CACHE)
219+
option(${variable} "${description}" OFF)
220220
endif()
221221
endfunction()
222222

0 commit comments

Comments
 (0)