diff options
| -rw-r--r-- | tensorflow/contrib/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tensorflow/core/kernels/mkl_pooling_ops_common.cc | 2 | ||||
| -rw-r--r-- | tensorflow/core/kernels/mkl_pooling_ops_common.h | 2 | ||||
| -rw-r--r-- | tensorflow/core/util/mkl_util.h | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/tensorflow/contrib/cmake/CMakeLists.txt b/tensorflow/contrib/cmake/CMakeLists.txt index f6c928e2be..ebcabb4223 100644 --- a/tensorflow/contrib/cmake/CMakeLists.txt +++ b/tensorflow/contrib/cmake/CMakeLists.txt @@ -364,7 +364,7 @@ if (tensorflow_ENABLE_MKL_SUPPORT) list(APPEND tensorflow_EXTERNAL_DEPENDENCIES mkldnn_copy_shared_to_destination) include_directories(${mkldnn_INCLUDE_DIRS}) else (tensorflow_ENABLE_MKLDNN_SUPPORT) - add_definitions(-DINTEL_MKL_ML) + add_definitions(-DINTEL_MKL_ML_ONLY) endif() endif (tensorflow_ENABLE_MKL_SUPPORT) diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.cc b/tensorflow/core/kernels/mkl_pooling_ops_common.cc index d7ad3f9dcd..ab393ee5f8 100644 --- a/tensorflow/core/kernels/mkl_pooling_ops_common.cc +++ b/tensorflow/core/kernels/mkl_pooling_ops_common.cc @@ -24,7 +24,7 @@ limitations under the License. namespace tensorflow { -#ifndef INTEL_MKL_ML +#ifndef INTEL_MKL_ML_ONLY using mkldnn::pooling_avg; using mkldnn::pooling_avg_exclude_padding; diff --git a/tensorflow/core/kernels/mkl_pooling_ops_common.h b/tensorflow/core/kernels/mkl_pooling_ops_common.h index ec7af5092d..47a8afc081 100644 --- a/tensorflow/core/kernels/mkl_pooling_ops_common.h +++ b/tensorflow/core/kernels/mkl_pooling_ops_common.h @@ -32,7 +32,7 @@ using mkldnn::stream; namespace tensorflow { -#ifndef INTEL_MKL_ML +#ifndef INTEL_MKL_ML_ONLY using mkldnn::memory; using mkldnn::pooling_avg; diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h index 159a787d05..af0d0f3a32 100644 --- a/tensorflow/core/util/mkl_util.h +++ b/tensorflow/core/util/mkl_util.h @@ -33,6 +33,12 @@ limitations under the License. #endif #ifdef INTEL_MKL_ML_ONLY +// Using pragma as #warning doesn't work with all compilers +#pragma message("Compiling for INTEL MKL ML only will be deprecated soon.") +#pragma message("Please use MKL DNN (the default option for --config=mkl)") +#endif + +#ifdef INTEL_MKL_ML_ONLY #include "mkl_dnn.h" #include "mkl_dnn_types.h" #include "mkl_service.h" |