Experimental changes to remove the IHV SDK dependencies

when building onnxruntime.dll onnxruntime_shared.dll

Author: Karim Vadsariya

cmake/CMakeLists.txt

@@ -634,7 +634,7 @@ if (WIN32)
     # structure was padded due to __declspec(align())
     list(APPEND ORT_WARNING_FLAGS "/wd4324")
     # warning C4800: Implicit conversion from 'X' to bool. Possible information loss
-    if (onnxruntime_USE_OPENVINO)
+    if (onnxruntime_USE_OPENVINO) #TODO[Karim] applys to all projects...
        list(APPEND ORT_WARNING_FLAGS "/wd4800")
     endif()
     # operator 'operator-name': deprecated between enumerations of different types
@@ -758,7 +758,7 @@ set(ONNXRUNTIME_PROVIDER_NAMES cpu)
 set(ORT_PROVIDER_FLAGS)
 set(ORT_PROVIDER_CMAKE_FLAGS)
 
-if (onnxruntime_USE_CUDA)
+if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   enable_language(CUDA)
   message( STATUS "CMAKE_CUDA_COMPILER_VERSION: ${CMAKE_CUDA_COMPILER_VERSION}")
 
@@ -793,7 +793,7 @@ endif()
 
 if (onnxruntime_USE_CUDA)
     list(APPEND ORT_PROVIDER_FLAGS -DUSE_CUDA=1)
-    list(APPEND ORT_PROVIDER_CMAKE_FLAGS -Donnxruntime_USE_CUDA=1)
+    list(APPEND ORT_PROVIDER_CMAKE_FLAGS -Donnxruntime_USE_CUDA=1)  #TODO[Karim]  Not used anywhere
     list(APPEND ONNXRUNTIME_PROVIDER_NAMES cuda)
 
     if (onnxruntime_USE_FLASH_ATTENTION)
@@ -856,7 +856,7 @@ if (onnxruntime_USE_JSEP)
     list(APPEND ORT_PROVIDER_CMAKE_FLAGS -Donnxruntime_USE_JSEP=1)
     list(APPEND ONNXRUNTIME_PROVIDER_NAMES js)
 endif()
-if (onnxruntime_USE_QNN)
+if (onnxruntime_USE_QNN) #TODO[Karim]
     list(APPEND ORT_PROVIDER_FLAGS -DUSE_QNN=1)
     list(APPEND ORT_PROVIDER_CMAKE_FLAGS -Donnxruntime_USE_QNN=1)
     list(APPEND ONNXRUNTIME_PROVIDER_NAMES qnn)
@@ -1032,14 +1032,15 @@ function(onnxruntime_set_compile_flags target_name)
     endif()
 
     set_target_properties(${target_name} PROPERTIES COMPILE_WARNING_AS_ERROR ON)
-    if (onnxruntime_USE_CUDA)
+    
+    if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
       # Suppress a "conversion_function_not_usable" warning in gsl/span
       target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:-Xcudafe \"--diag_suppress=conversion_function_not_usable\">")
       target_compile_definitions(${target_name} PRIVATE -DDISABLE_CUSPARSE_DEPRECATED)
     endif()
     if (MSVC)
       foreach(CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORY ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
-        target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CXX,C>:/external:I${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORY}>")
+        #target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CXX,C>:/external:I${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORY}>")
       endforeach()
 
       foreach(onnxruntime_external_lib IN LISTS onnxruntime_EXTERNAL_LIBRARIES)
@@ -1097,7 +1098,7 @@ function(onnxruntime_set_compile_flags target_name)
         target_compile_options(${target_name} PRIVATE "-Wno-unused-function")
       endif()
     endif()
-    foreach(ORT_FLAG ${ORT_PROVIDER_FLAGS})
+    foreach(ORT_FLAG ${ORT_PROVIDER_FLAGS}) #TODO[Karim] applies to all projects...
       target_compile_definitions(${target_name} PRIVATE ${ORT_FLAG})
     endforeach()
     if (HAS_DEPRECATED_COPY)
@@ -1110,7 +1111,7 @@ function(onnxruntime_set_compile_flags target_name)
     if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 13 AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
       target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-Wno-maybe-uninitialized>")
     endif()
-    if (onnxruntime_USE_CUDA)
+    if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
       foreach(FLAG ${ORT_WARNING_FLAGS})
         target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:--compiler-options ${FLAG}>")
       endforeach()
@@ -1332,7 +1333,7 @@ if (onnxruntime_ENABLE_TRAINING_APIS)
   )
 endif()
 
-if (onnxruntime_USE_OPENVINO)
+if (onnxruntime_USE_OPENVINO) #TODO[Karim] applies to both onnxruntime.dll and onnxruntime_shared.dll 
 
   add_definitions(-DUSE_OPENVINO=1)
 
@@ -1389,7 +1390,7 @@ if (onnxruntime_USE_OPENVINO)
 
 endif()
 
-if (onnxruntime_USE_VITISAI)
+if (onnxruntime_USE_VITISAI) #TODO[Karim]
     set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
 endif()
 
@@ -1411,7 +1412,7 @@ string(APPEND ORT_BUILD_INFO ", cmake cxx flags: ${CMAKE_CXX_FLAGS}")
 configure_file(onnxruntime_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/onnxruntime_config.h)
 get_property(onnxruntime_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
-if (onnxruntime_USE_CUDA)
+if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   set(CMAKE_CUDA_RUNTIME_LIBRARY Shared)
   set(CMAKE_CUDA_STANDARD 17)
   if(onnxruntime_CUDA_HOME)
@@ -1685,17 +1686,17 @@ if (onnxruntime_BUILD_SHARED_LIB OR onnxruntime_BUILD_APPLE_FRAMEWORK)
   list(APPEND ONNXRUNTIME_CMAKE_FILES onnxruntime)
 endif()
 
-if (onnxruntime_BUILD_JAVA)
+if (onnxruntime_BUILD_JAVA) #TODO[Karim]  *cmake files included below uses onnxruntime_USE_CUDA, USE_QNN etc variables, 
   message(STATUS "Java Build is enabled")
   list(APPEND ONNXRUNTIME_CMAKE_FILES onnxruntime_java)
 endif()
 
-if (onnxruntime_BUILD_NODEJS)
+if (onnxruntime_BUILD_NODEJS) #TODO[Karim]
   message(STATUS "Node.js Build is enabled")
   list(APPEND ONNXRUNTIME_CMAKE_FILES onnxruntime_nodejs)
 endif()
 
-if (onnxruntime_ENABLE_PYTHON)
+if (onnxruntime_ENABLE_PYTHON) #TODO[Karim]
   message(STATUS "Python Build is enabled")
   list(APPEND ONNXRUNTIME_CMAKE_FILES onnxruntime_python)
 endif()
@@ -1705,7 +1706,7 @@ if (onnxruntime_BUILD_OBJC)
   list(APPEND ONNXRUNTIME_CMAKE_FILES onnxruntime_objectivec)
 endif()
 
-if (onnxruntime_BUILD_UNIT_TESTS)
+if (onnxruntime_BUILD_UNIT_TESTS) #TODO[Karim]
   list(APPEND ONNXRUNTIME_CMAKE_FILES onnxruntime_unittests)
 endif()
 
@@ -1753,7 +1754,7 @@ if (WIN32 AND NOT GDK_PLATFORM AND NOT CMAKE_CROSSCOMPILING)
 endif()
 
 foreach(target_name ${ONNXRUNTIME_CMAKE_FILES})
-  include(${target_name}.cmake)
+  include(${target_name}.cmake) #TODO[Karim]
 endforeach()
 if (UNIX)
   option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON)

cmake/external/onnxruntime_external_deps.cmake

@@ -400,7 +400,7 @@ if ((CPUINFO_SUPPORTED OR onnxruntime_USE_XNNPACK) AND NOT ANDROID)
   endif()
 endif()
 
-if(onnxruntime_USE_CUDA)
+if(onnxruntime_USE_CUDA) #TODO[Karim]
   FetchContent_Declare(
     GSL
     URL ${DEP_URL_microsoft_gsl}
@@ -682,7 +682,8 @@ if (onnxruntime_USE_WEBGPU)
 endif()
 
 set(onnxruntime_LINK_DIRS)
-if (onnxruntime_USE_CUDA)
+
+if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   find_package(CUDAToolkit REQUIRED)
 
   if(onnxruntime_CUDNN_HOME)

cmake/onnxruntime.cmake

@@ -37,7 +37,7 @@ function(get_c_cxx_api_headers HEADERS_VAR)
   endif()
 
   # need to add header files for enabled EPs
-  foreach(f ${ONNXRUNTIME_PROVIDER_NAMES})
+  foreach(f ${ONNXRUNTIME_PROVIDER_NAMES})  #TODO[Karim]
     # The header files in include/onnxruntime/core/providers/cuda directory cannot be flattened to the same directory
     # with onnxruntime_c_api.h . Most other EPs probably also do not work in this way.
     if((NOT f STREQUAL cuda) AND (NOT f STREQUAL rocm))
@@ -66,12 +66,12 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
 add_custom_command(OUTPUT ${SYMBOL_FILE} ${CMAKE_CURRENT_BINARY_DIR}/generated_source.c
   COMMAND ${Python_EXECUTABLE} "${REPO_ROOT}/tools/ci_build/gen_def.py"
     --version_file "${ONNXRUNTIME_ROOT}/../VERSION_NUMBER" --src_root "${ONNXRUNTIME_ROOT}"
-    --config ${ONNXRUNTIME_PROVIDER_NAMES} --style=${OUTPUT_STYLE} --output ${SYMBOL_FILE}
+    --config ${ONNXRUNTIME_PROVIDER_NAMES} --style=${OUTPUT_STYLE} --output ${SYMBOL_FILE} #TODO[Karim]
     --output_source ${CMAKE_CURRENT_BINARY_DIR}/generated_source.c
   DEPENDS ${SYMBOL_FILES}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
-add_custom_target(onnxruntime_generate_def ALL DEPENDS ${SYMBOL_FILE} ${CMAKE_CURRENT_BINARY_DIR}/generated_source.c)
+add_custom_target(onnxruntime_generate_def ALL DEPENDS ${SYMBOL_FILE} ${CMAKE_CURRENT_BINARY_DIR}/generated_source.c) #TODO[Karim]
 endif()
 if(WIN32)
   onnxruntime_add_shared_library(onnxruntime
@@ -208,7 +208,7 @@ set(onnxruntime_INTERNAL_LIBRARIES
   ${PROVIDERS_COREML}
   ${PROVIDERS_DML}
   ${PROVIDERS_NNAPI}
-  ${PROVIDERS_QNN}
+  ${PROVIDERS_QNN}  #TODO[Karim] ??
   ${PROVIDERS_SNPE}
   ${PROVIDERS_RKNPU}
   ${PROVIDERS_VSINPU}

cmake/onnxruntime_providers.cmake

@@ -59,10 +59,10 @@ function(add_op_reduction_include_dirs target)
 endfunction()
 
 
-if(onnxruntime_USE_VITISAI)
+if(onnxruntime_USE_VITISAI) #TODO[Karim] seems like not used??
   set(PROVIDERS_VITISAI onnxruntime_providers_vitisai)
 endif()
-if(onnxruntime_USE_CUDA)
+if(onnxruntime_USE_CUDA) #TODO[Karim]
   set(PROVIDERS_CUDA onnxruntime_providers_cuda)
 endif()
 if(onnxruntime_USE_COREML)
@@ -74,7 +74,7 @@ endif()
 if(onnxruntime_USE_JSEP)
   set(PROVIDERS_JS onnxruntime_providers_js)
 endif()
-if(onnxruntime_USE_QNN)
+if(onnxruntime_USE_QNN) #TODO[Karim]
   set(PROVIDERS_QNN onnxruntime_providers_qnn)
 endif()
 if(onnxruntime_USE_RKNPU)
@@ -123,23 +123,23 @@ if(onnxruntime_USE_SNPE)
 endif()
 
 include(onnxruntime_providers_cpu.cmake)
-if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_TRT_INTERFACE))
+if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   include(onnxruntime_providers_cuda.cmake)
 endif()
 
 if (onnxruntime_USE_DNNL)
   include(onnxruntime_providers_dnnl.cmake)
 endif()
 
-if (onnxruntime_USE_TENSORRT AND (NOT onnxruntime_ENABLE_TRT_INTERFACE))
+if (onnxruntime_USE_TENSORRT AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   include(onnxruntime_providers_tensorrt.cmake)
 endif()
 
-if (onnxruntime_USE_VITISAI)
+if (onnxruntime_USE_VITISAI AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   include(onnxruntime_providers_vitisai.cmake)
 endif()
 
-if (onnxruntime_USE_OPENVINO AND (NOT onnxruntime_ENABLE_OPENVINO_INTERFACE))
+if (onnxruntime_USE_OPENVINO AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   include(onnxruntime_providers_openvino.cmake)
 endif()
 
@@ -164,6 +164,7 @@ if (onnxruntime_USE_JSEP)
 endif()
 
 if (onnxruntime_USE_QNN)
+  message("Hitting qnn check")
   include(onnxruntime_providers_qnn.cmake)
 endif()
 

cmake/onnxruntime_python.cmake

@@ -881,7 +881,7 @@ if (onnxruntime_USE_DNNL)
   )
 endif()
 
-if (onnxruntime_USE_VITISAI)
+if (onnxruntime_USE_VITISAI AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   add_custom_command(
     TARGET onnxruntime_pybind11_state POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy
@@ -891,7 +891,7 @@ if (onnxruntime_USE_VITISAI)
   )
 endif()
 
-if (onnxruntime_USE_TENSORRT)
+if (onnxruntime_USE_TENSORRT AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
   add_custom_command(
     TARGET onnxruntime_pybind11_state POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy
@@ -911,7 +911,7 @@ if (onnxruntime_USE_MIGRAPHX)
   )
 endif()
 
-if (onnxruntime_USE_OPENVINO)
+if (onnxruntime_USE_OPENVINO AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
     add_custom_command(
       TARGET onnxruntime_pybind11_state POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy
@@ -934,7 +934,7 @@ if (DEFINED ENV{OPENVINO_MANYLINUX})
     )
 endif()
 
-if (onnxruntime_USE_CUDA)
+if (onnxruntime_USE_CUDA AND (NOT onnxruntime_ENABLE_GENERIC_INTERFACE))
     add_custom_command(
       TARGET onnxruntime_pybind11_state POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy