From 7b37dc6105052efb91f02b621b19e5ec9edacec0 Mon Sep 17 00:00:00 2001 From: Yufeng Li Date: Fri, 8 Feb 2019 07:14:37 -0800 Subject: [PATCH] Enable USE_MKLML_FOR_BLAS (#387) * Enable USE_MKLML_FOR_BLAS * add mklml include directory for onnxruntime_provider and onnxruntime_provider_cuda * add mklml_include_dir to include_directories --- cmake/CMakeLists.txt | 5 ++--- cmake/onnxruntime_providers.cmake | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index dba60444d0..e3b161d683 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -412,15 +412,14 @@ if (onnxruntime_USE_MKLDNN OR onnxruntime_USE_MKLML) endif() if (onnxruntime_USE_MKLML) - add_definitions(-DUSE_MKLML=1) - # USE_MKML_FOR_BLAS may cause numerical differences in tests so disable by default - #add_definitions(-DUSE_MKLML_FOR_BLAS=1) + add_definitions(-DUSE_MKLML=1 -DUSE_MKLML_FOR_BLAS=1) if (WIN32 OR APPLE) list(APPEND onnxruntime_EXTERNAL_LIBRARIES mklml) else() list(APPEND onnxruntime_EXTERNAL_LIBRARIES mklml_intel) endif() list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES project_mklml) + include_directories(${MKLML_INCLUDE_DIR}) link_directories(${MKLML_LIB_DIR}) endif() diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index 7ef292b1fe..1b2c86b6df 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -90,7 +90,7 @@ if (onnxruntime_USE_MKLDNN) onnxruntime_add_include_to_target(onnxruntime_providers_mkldnn gsl onnxruntime_common onnxruntime_framework gsl onnx onnx_proto protobuf::libprotobuf) add_dependencies(onnxruntime_providers_mkldnn eigen ${onnxruntime_EXTERNAL_DEPENDENCIES}) set_target_properties(onnxruntime_providers_mkldnn PROPERTIES FOLDER "ONNXRuntime") - target_include_directories(onnxruntime_providers_mkldnn PRIVATE ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS} ${MKLDNN_INCLUDE_DIR} ${MKLML_INCLUDE_DIR}) + target_include_directories(onnxruntime_providers_mkldnn PRIVATE ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS} ${MKLDNN_INCLUDE_DIR}) install(DIRECTORY ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/providers/mkldnn DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/core/providers) set_target_properties(onnxruntime_providers_mkldnn PROPERTIES LINKER_LANGUAGE CXX) endif()