Skip to content

[INTEL MKL] Code cleanup #21593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tensorflow-copybara merged 2 commits into from
Aug 31, 2018
Merged

[INTEL MKL] Code cleanup #21593

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
d680982
Renamed INTEL_MKL_ML and added deprecated warning for INTEL_MKL_ML_ONLY
agramesh1 Aug 14, 2018
8077ae1
Minor changes in comments
agramesh1 Aug 15, 2018
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
2 changes: 1 addition & 1 deletion tensorflow/contrib/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion tensorflow/core/kernels/mkl_pooling_ops_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/core/kernels/mkl_pooling_ops_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions tensorflow/core/util/mkl_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ limitations under the License.
#error "at most one of INTEL_MKL_ML_ONLY and INTEL_MKL_DNN_ONLY may be defined"
#endif

#ifdef INTEL_MKL_ML_ONLY
// Using pragma message since #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"
Expand Down