microsoft · raymondxyang · Jan 7, 2019 · Jan 5, 2019 · Jan 5, 2019
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -56,6 +56,7 @@ option(onnxruntime_BUILD_UNIT_TESTS "Build ONNXRuntime unit tests" ON)
 option(onnxruntime_USE_PREINSTALLED_EIGEN "Use pre-installed EIGEN. Need to provide eigen_SOURCE_PATH if turn this on." OFF)
 option(onnxruntime_BUILD_BENCHMARKS "Build ONNXRuntime micro-benchmarks" OFF)
 option(onnxruntime_USE_TVM "Build tvm for code-gen" OFF)
+option(onnxruntime_BUILD_FOR_NATIVE_MACHINE "Enable this option for turning on optimization specific to this machine" OFF)
 option(onnxruntime_USE_LLVM "Build tvm with LLVM" OFF)
 option(onnxruntime_USE_OPENMP "Build with OpenMP support" OFF)
 option(onnxruntime_BUILD_SHARED_LIB "Build a shared library" OFF)
@@ -70,6 +71,17 @@ set(REPO_ROOT ${PROJECT_SOURCE_DIR}/..)
 set(ONNXRUNTIME_ROOT ${PROJECT_SOURCE_DIR}/../onnxruntime)
 file (STRINGS "${REPO_ROOT}/VERSION_NUMBER" VERSION_NUMBER)
 
+if(onnxruntime_USE_OPENMP)
+  find_package(OpenMP)
+  if (OPENMP_FOUND)
+    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+    add_definitions(-DUSE_OPENMP)
+  endif()
+endif()
+#must after OpenMP settings
+find_package(Threads)
+
 if (MSVC)
   if (onnxruntime_MSVC_STATIC_RUNTIME)
     # set all of our submodules to static runtime
@@ -102,12 +114,11 @@ if (MSVC)
   #Disable 4100 globally. Too many this kind errors in protobuf
   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100")
 else()
-  # Enable OpenMP for Non-Windows only. WinML team disallows use of OpenMP.
-  find_package(OpenMP)
-  if (OPENMP_FOUND)
-      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-      add_definitions(-DUSE_OPENMP)
+  if(onnxruntime_BUILD_FOR_NATIVE_MACHINE)
+    string(APPEND CMAKE_CXX_FLAGS_RELEASE " -march=native -mtune=native")
+    string(APPEND CMAKE_C_FLAGS_RELEASE " -march=native -mtune=native")
+    string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " -march=native -mtune=native")
+    string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " -march=native -mtune=native")
   endif()
 endif()
 
@@ -136,6 +147,8 @@ if(onnxruntime_BUILD_SHARED_LIB OR onnxruntime_ENABLE_PYTHON)
   endif()
 endif()
 
+#target begins from here
+
 if(onnxruntime_BUILD_BENCHMARKS)
   if(NOT TARGET benchmark)
     # We will not need to test benchmark lib itself.
@@ -217,8 +230,6 @@ add_subdirectory(external/gsl EXCLUDE_FROM_ALL)
 add_library(date ALIAS tz)
 add_library(gsl ALIAS GSL)
 
-set(date_INCLUDE_DIR $<TARGET_PROPERTY:tz,INTERFACE_INCLUDE_DIRECTORIES>)
-
 # bounds checking behavior.
 # throw instead of calling terminate if there's a bounds checking violation.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGSL_THROW_ON_CONTRACT_VIOLATION")
@@ -227,14 +238,10 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DGSL_UNENFORCED_ON_CONT
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DGSL_UNENFORCED_ON_CONTRACT_VIOLATION")
 
 include(eigen)
-set(onnxruntime_EXTERNAL_LIBRARIES protobuf::libprotobuf)
-
-# gtest and gmock
-add_subdirectory(${PROJECT_SOURCE_DIR}/external/googletest EXCLUDE_FROM_ALL)
-set_target_properties(gmock PROPERTIES FOLDER "External/GTest")
-set_target_properties(gmock_main PROPERTIES FOLDER "External/GTest")
-set_target_properties(gtest PROPERTIES FOLDER "External/GTest")
-set_target_properties(gtest_main PROPERTIES FOLDER "External/GTest")
+#onnxruntime_EXTERNAL_LIBRARIES could contain onnx, onnx_proto,libprotobuf, cuda/cudnn, jemalloc,
+# mkldnn/mklml, openblas, onnxruntime_codegen_tvm, tvm, nnvm_compiler and pthread
+# pthread is always at the last
+set(onnxruntime_EXTERNAL_LIBRARIES onnx onnx_proto protobuf::libprotobuf tz)
 
 function(onnxruntime_add_include_to_target dst_target)
     foreach(src_target ${ARGN})
@@ -243,6 +250,8 @@ function(onnxruntime_add_include_to_target dst_target)
     endforeach()
 endfunction()
 
+set(onnxruntime_EXTERNAL_DEPENDENCIES gsl onnx_proto)
+
 # TVM
 if (onnxruntime_USE_TVM)
   if (onnxruntime_USE_CUDA)
@@ -266,28 +275,20 @@ if (onnxruntime_USE_TVM)
     $<TARGET_PROPERTY:nnvm_compiler,INTERFACE_INCLUDE_DIRECTORIES>)
   add_definitions(-DUSE_TVM)
 
-  set(onnxruntime_tvm_libs
-    onnxruntime_codegen_tvm
-    tvm
-    nnvm_compiler)
+  set(onnxruntime_tvm_libs onnxruntime_codegen_tvm)
+  list(APPEND onnxruntime_EXTERNAL_LIBRARIES tvm nnvm_compiler)
 
-  set(onnxruntime_tvm_dependencies
-    tvm
-    nnvm_compiler
-    onnxruntime_codegen_tvm)
+  list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES tvm nnvm_compiler)
 endif()
 
 # ONNX
 add_subdirectory(onnx)
-set_target_properties(onnx PROPERTIES FOLDER "External/ONNX")
-set_target_properties(onnx_proto PROPERTIES FOLDER "External/ONNX")
+
 #set_target_properties(gen_onnx_proto PROPERTIES FOLDER "External/ONNX")
 # fix a warning in onnx code we can't do anything about
 if (MSVC)
-    target_compile_options(onnx_proto PRIVATE /wd4146) # unary minus operator applied to unsigned type
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_HAS_C99_MATH") # required to be set explicitly to enable Eigen-Unsupported SpecialFunctions
 endif()
-set(onnxruntime_EXTERNAL_DEPENDENCIES gsl onnx_proto)
 
 if (onnxruntime_RUN_ONNX_TESTS)
   add_definitions(-DONNXRUNTIME_RUN_EXTERNAL_ONNX_TESTS)
@@ -344,22 +345,20 @@ else()
   string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra")
   string(APPEND CMAKE_C_FLAGS " -Wall -Wextra")
   if(onnxruntime_DEV_MODE)
-    string(APPEND CMAKE_CXX_FLAGS " -Werror")
-    string(APPEND CMAKE_C_FLAGS " -Werror")
+    if(NOT onnxruntime_USE_TVM)
+      string(APPEND CMAKE_CXX_FLAGS " -Werror")
+      string(APPEND CMAKE_C_FLAGS " -Werror")
+     endif()
   endif()
   check_cxx_compiler_flag(-Wunused-but-set-variable HAS_UNUSED_BUT_SET_VARIABLE)
   check_cxx_compiler_flag(-Wunused-parameter HAS_UNUSED_PARAMETER)
   check_cxx_compiler_flag(-Wcast-function-type HAS_CAST_FUNCTION_TYPE)
   check_cxx_compiler_flag(-Wparentheses HAS_PARENTHESES)
-  check_cxx_compiler_flag(-Wnull-dereference HAS_NULL_DEREFERENCE)
   check_cxx_compiler_flag(-Wuseless-cast HAS_USELESS_CAST)
   check_cxx_compiler_flag(-Wnonnull-compare HAS_NONNULL_COMPARE)
   check_cxx_compiler_flag(-Wtautological-pointer-compare HAS_TAUTOLOGICAL_POINTER_COMPARE)
   check_cxx_compiler_flag(-Wcatch-value HAS_CATCH_VALUE)
-  if(HAS_NULL_DEREFERENCE)
-    string(APPEND CMAKE_CXX_FLAGS " -Wnull-dereference")
-    string(APPEND CMAKE_C_FLAGS " -Wnull-dereference")
-  endif()
+  check_cxx_compiler_flag(-Wmissing-braces HAS_MISSING_BRACES)
   if(HAS_TAUTOLOGICAL_POINTER_COMPARE)
     #we may have extra null pointer checkings in debug build, it's not an issue
     string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Wno-tautological-pointer-compare")
@@ -370,16 +369,10 @@ else()
     string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Wno-nonnull-compare")
     string(APPEND CMAKE_C_FLAGS_DEBUG " -Wno-nonnull-compare")
   endif()
-  string(APPEND CMAKE_CXX_FLAGS " -Wno-error=sign-compare -Wno-error=comment")
-  if(onnxruntime_USE_CUDA)
-    string(APPEND CMAKE_CXX_FLAGS " -Wno-error=reorder")
-  endif()
+  string(APPEND CMAKE_CXX_FLAGS " -Wno-error=sign-compare")
   if(HAS_PARENTHESES)
     string(APPEND CMAKE_CXX_FLAGS " -Wno-parentheses")
   endif()
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-    string(APPEND CMAKE_CXX_FLAGS " -Wno-error=invalid-partial-specialization -Wno-error=missing-braces -Wno-error=inconsistent-missing-override")
-  endif()
 endif()
 
 if (onnxruntime_USE_JEMALLOC)
@@ -392,10 +385,7 @@ if (onnxruntime_USE_JEMALLOC)
   list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES jemalloc)
 endif()
 
-include_directories(
-  ${ONNXRUNTIME_INCLUDE_DIR}
-  $<TARGET_PROPERTY:GSL,INTERFACE_INCLUDE_DIRECTORIES>
-)
+include_directories(${ONNXRUNTIME_INCLUDE_DIR})
 
 if (onnxruntime_USE_MKLDNN OR onnxruntime_USE_MKLML)
   include(mkldnn)
@@ -436,30 +426,23 @@ configure_file(onnxruntime_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/onnxruntime_c
 
 if (onnxruntime_USE_CUDA)
   add_definitions(-DUSE_CUDA=1)
+  #The following 6 lines are copied from https://gitlab.kitware.com/cmake/cmake/issues/17559
+  set( CMAKE_CUDA_FLAGS "" CACHE STRING "" )
+  if ( CMAKE_CUDA_FLAGS )
+    list(REMOVE_ITEM CMAKE_CUDA_FLAGS "-cudart static")
+  endif()
+  string(APPEND CMAKE_CUDA_FLAGS "-cudart shared")
   enable_language(CUDA)
   set(CMAKE_CUDA_STANDARD 14)
-  if (DEFINED onnxruntime_CUDA_HOME)
-    file(TO_CMAKE_PATH ${onnxruntime_CUDA_HOME} CUDA_TOOLKIT_ROOT_DIR)
-  endif ()
   file(TO_CMAKE_PATH ${onnxruntime_CUDNN_HOME} onnxruntime_CUDNN_HOME)
-  find_package(CUDA 9.0 REQUIRED)
-  set(CUDA_LINK_LIBRARIES_KEYWORD PRIVATE)
   set(ONNXRUNTIME_CUDA_LIBRARIES ${CUDA_LIBRARIES})
-
-  # There's a bug before CMake 3.12.2 for finding cublas_device in CUDA >= 9.2:
-  # See release note for details: https://blog.kitware.com/cmake-3-12-2-available-for-download/
-  #     FindCUDA: Do not find cublas_device on CUDA >= 9.2
-  if (CMAKE_VERSION VERSION_LESS 3.12.2)
-    list(APPEND ONNXRUNTIME_CUDA_LIBRARIES cublas)
-  else()
-    list(APPEND ONNXRUNTIME_CUDA_LIBRARIES ${CUDA_CUBLAS_LIBRARIES})
-  endif()
-
-  list(APPEND ONNXRUNTIME_CUDA_LIBRARIES cudnn)
-
+  list(APPEND ONNXRUNTIME_CUDA_LIBRARIES cublas cudnn)
   if (WIN32)
     link_directories(${onnxruntime_CUDNN_HOME}/lib/x64)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:cublas64_${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}.dll")
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1" onnxruntime_CUDA_VERSION_MAJOR ${CMAKE_CUDA_COMPILER_VERSION})
+    string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\2" onnxruntime_CUDA_VERSION_MINOR ${CMAKE_CUDA_COMPILER_VERSION})
+
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:cublas64_${onnxruntime_CUDA_VERSION_MAJOR}${onnxruntime_CUDA_VERSION_MINOR}.dll")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:cudnn64_7.dll /DELAYLOAD:mkldnn.dll")
   else()
     link_directories(${onnxruntime_CUDNN_HOME}/lib64)
@@ -487,7 +470,7 @@ if (onnxruntime_USE_TVM)
     # wd4456: declaration of X hides previous local declaration
     set(DISABLED_WARNINGS_FOR_TVM "/wd4100" "/wd4244" "/wd4251" "/wd4267" "/wd4275" "/wd4389" "/wd4456")
   else()
-    set(DISABLED_WARNINGS_FOR_TVM "-Wno-error=extra" "-Wno-error=ignored-qualifiers")
+    set(DISABLED_WARNINGS_FOR_TVM "-Wno-error=ignored-qualifiers")
     if(HAS_UNUSED_PARAMETER)
       list(APPEND DISABLED_WARNINGS_FOR_TVM "-Wno-error=unused-parameter")
     endif()
@@ -510,20 +493,29 @@ include(onnxruntime_common.cmake)
 include(onnxruntime_graph.cmake)
 include(onnxruntime_framework.cmake)
 include(onnxruntime_util.cmake)
+#The next file will define 'onnxruntime_libs' cmake var
 include(onnxruntime_providers.cmake)
 include(onnxruntime_session.cmake)
 include(onnxruntime_mlas.cmake)
 
+if(WIN32)
+  set(onnxruntime_EXTERNAL_LIBRARIES_DEBUG ${onnxruntime_EXTERNAL_LIBRARIES} Dbghelp)
+else()
+  list(APPEND onnxruntime_EXTERNAL_LIBRARIES Threads::Threads)
+  set(onnxruntime_EXTERNAL_LIBRARIES_DEBUG ${onnxruntime_EXTERNAL_LIBRARIES})
+endif()
+
+#The following files may use the 'onnxruntime_libs' and 'onnxruntime_EXTERNAL_LIBRARIES' vars
 
 if (onnxruntime_BUILD_SHARED_LIB)
   include(onnxruntime.cmake)
 endif()
 
 if (onnxruntime_ENABLE_PYTHON)
-if(UNIX)
-  set(CMAKE_SKIP_BUILD_RPATH ON)
-endif()
-include(onnxruntime_python.cmake)
+  if(UNIX)
+    set(CMAKE_SKIP_BUILD_RPATH ON)
+  endif()
+  include(onnxruntime_python.cmake)
 endif()
 
 if (onnxruntime_BUILD_CSHARP)
@@ -538,5 +530,11 @@ if (onnxruntime_BUILD_UNIT_TESTS)
   # we need to make sure this is turned off since it
   # turned ON by the previous step when building a shared lib
   set(CMAKE_SKIP_BUILD_RPATH OFF)
+  # gtest and gmock
+  add_subdirectory(${PROJECT_SOURCE_DIR}/external/googletest EXCLUDE_FROM_ALL)
+  set_target_properties(gmock PROPERTIES FOLDER "External/GTest")
+  set_target_properties(gmock_main PROPERTIES FOLDER "External/GTest")
+  set_target_properties(gtest PROPERTIES FOLDER "External/GTest")
+  set_target_properties(gtest_main PROPERTIES FOLDER "External/GTest")
   include(onnxruntime_unittests.cmake)
 endif()
diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake
@@ -1,16 +1,9 @@
 include (ExternalProject)
 
 if (onnxruntime_USE_PREINSTALLED_EIGEN)
+    add_library(eigen INTERFACE)
     file(TO_CMAKE_PATH ${eigen_SOURCE_PATH} eigen_INCLUDE_DIRS)
-    ExternalProject_Add(eigen
-        PREFIX eigen
-        SOURCE_DIR ${eigen_SOURCE_PATH}
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-        DOWNLOAD_COMMAND ""
-        UPDATE_COMMAND ""
-    )
+    target_include_directories(eigen INTERFACE ${eigen_INCLUDE_DIRS})
 else ()
     set(eigen_URL "https://github.com/eigenteam/eigen-git-mirror.git")
     set(eigen_TAG "3.3.7")

diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake
@@ -53,11 +53,11 @@ if (onnxruntime_USE_MKLDNN)
   set(MKLDNN_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/mkl-dnn/install)
   set(MKLDNN_LIB_DIR ${MKLDNN_INSTALL}/lib)
   set(MKLDNN_INCLUDE_DIR ${MKLDNN_INSTALL}/include)
-
-  set(MKLDNN_PATCH_COMMAND1 git apply ${CMAKE_SOURCE_DIR}/patches/mkldnn/platform.cmake.patch)
-  # discard prior changes due to patching in mkldnn source to unblock incremental builds.
-  set(MKLDNN_PATCH_DISCARD_COMMAND cd ${MKLDNN_SOURCE} && git checkout -- .)
-
+  if(NOT onnxruntime_BUILD_FOR_NATIVE_MACHINE)
+    set(MKLDNN_PATCH_COMMAND1 git apply ${CMAKE_SOURCE_DIR}/patches/mkldnn/platform.cmake.patch)
+    # discard prior changes due to patching in mkldnn source to unblock incremental builds.
+    set(MKLDNN_PATCH_DISCARD_COMMAND cd ${MKLDNN_SOURCE} && git checkout -- .)
+  endif()
   ExternalProject_Add(project_mkldnn
     PREFIX mkl-dnn
     GIT_REPOSITORY ${MKLDNN_URL}

diff --git a/cmake/onnx/CMakeLists.txt b/cmake/onnx/CMakeLists.txt
@@ -3,8 +3,11 @@
 
 add_library(onnx_proto ${ONNXRUNTIME_ROOT}/core/protobuf/onnx-ml.proto ${ONNXRUNTIME_ROOT}/core/protobuf/onnx-operators-ml.proto)
 target_include_directories(onnx_proto PUBLIC $<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_INCLUDE_DIRECTORIES> "${CMAKE_CURRENT_BINARY_DIR}/..")
-onnxruntime_protobuf_generate(APPEND_PATH IMPORT_DIRS TARGET onnx_proto)
-
+target_compile_definitions(onnx_proto PUBLIC $<TARGET_PROPERTY:protobuf::libprotobuf,INTERFACE_COMPILE_DEFINITIONS>)
+onnxruntime_protobuf_generate(APPEND_PATH IMPORT_DIRS ${ONNXRUNTIME_ROOT}/core/protobuf TARGET onnx_proto)
+if (WIN32)
+  target_compile_options(onnx_proto PRIVATE /wd4146) # unary minus operator applied to unsigned type
+endif()
 # Cpp Tests were added and they require googletest
 # since we have our own copy, try using that
 set(ONNX_SOURCE_ROOT ${PROJECT_SOURCE_DIR}/external/onnx)
@@ -24,7 +27,9 @@ file(GLOB_RECURSE onnx_exclude_src
 list(REMOVE_ITEM onnx_src ${onnx_exclude_src})
 add_library(onnx ${onnx_src})
 add_dependencies(onnx onnx_proto)
-target_include_directories(onnx PUBLIC $<TARGET_PROPERTY:onnx_proto,INTERFACE_INCLUDE_DIRECTORIES> "${ONNX_SOURCE_ROOT}")
+target_include_directories(onnx PUBLIC "${ONNX_SOURCE_ROOT}")
+target_include_directories(onnx PUBLIC $<TARGET_PROPERTY:onnx_proto,INTERFACE_INCLUDE_DIRECTORIES>)
+target_compile_definitions(onnx PUBLIC $<TARGET_PROPERTY:onnx_proto,INTERFACE_COMPILE_DEFINITIONS> PRIVATE "__ONNX_DISABLE_STATIC_REGISTRATION")
 target_compile_definitions(onnx PUBLIC "ONNX_ML" "ONNX_NAMESPACE=onnx")
 if (WIN32)
     target_compile_options(onnx PRIVATE
@@ -49,3 +54,7 @@ else()
     target_compile_options(onnx_proto PRIVATE "-Wno-unused-but-set-variable")
   endif()
 endif()
+
+
+set_target_properties(onnx PROPERTIES FOLDER "External/ONNX")
+set_target_properties(onnx_proto PROPERTIES FOLDER "External/ONNX")
diff --git a/cmake/onnxruntime.cmake b/cmake/onnxruntime.cmake
@@ -28,7 +28,8 @@ add_custom_target(onnxruntime_generate_def ALL DEPENDS ${SYMBOL_FILE})
 add_library(onnxruntime SHARED ${onnxruntime_session_srcs})
 set_target_properties(onnxruntime PROPERTIES VERSION ${VERSION_NUMBER})
 add_dependencies(onnxruntime onnxruntime_generate_def ${onnxruntime_EXTERNAL_DEPENDENCIES})
-target_include_directories(onnxruntime PRIVATE ${ONNXRUNTIME_ROOT} ${date_INCLUDE_DIR})
+target_include_directories(onnxruntime PRIVATE ${ONNXRUNTIME_ROOT})
+onnxruntime_add_include_to_target(onnxruntime gsl)
 
 if(UNIX)
   set(BEGIN_WHOLE_ARCHIVE -Xlinker --whole-archive)
@@ -38,24 +39,21 @@ else()
   set(ONNXRUNTIME_SO_LINK_FLAG "-DEF:${SYMBOL_FILE}")
 endif()
 
+#The BEGIN_WHOLE_ARCHIVE/END_WHOLE_ARCHIVE part should contain the implementations of all the C API functions
 target_link_libraries(onnxruntime PRIVATE
     ${BEGIN_WHOLE_ARCHIVE}
     ${onnxruntime_libs}
     ${PROVIDERS_CUDA}
     ${PROVIDERS_MKLDNN}
     onnxruntime_providers    
     onnxruntime_util
+    ${onnxruntime_tvm_libs}
     onnxruntime_framework
     ${END_WHOLE_ARCHIVE}
     onnxruntime_graph
     onnxruntime_common
-    onnx
-    onnx_proto
     onnxruntime_mlas
-    ${onnxruntime_tvm_libs}
-    ${onnxruntime_EXTERNAL_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${ONNXRUNTIME_CUDA_LIBRARIES})
+    debug ${onnxruntime_EXTERNAL_LIBRARIES_DEBUG} optimized ${onnxruntime_EXTERNAL_LIBRARIES})
 
 set_property(TARGET onnxruntime APPEND_STRING PROPERTY LINK_FLAGS ${ONNXRUNTIME_SO_LINK_FLAG})
 set_target_properties(onnxruntime PROPERTIES LINK_DEPENDS ${SYMBOL_FILE})