Merge branch 'refs/heads/main' into Cjian/linux_c++20

.github/workflows/publish-csharp-apidocs.yml

@@ -28,21 +28,25 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
+    - name: Install DocFX
+      run: |
+        dotnet tool update -g docfx
+    # NOTE: We need to restore Microsoft.ML.OnnxRuntime.csproj manually to set IncludeMobileTargets=false
+    # docfx doesn't seem to be able to do that properly resulting in build errors
     - name: Restore dependencies
-      run: dotnet restore csharp/ApiDocs/ApiDocs.csproj
-    - name: Download DocFX
       run: |
-        mkdir -p build/docfx
-        wget https://github.com/dotnet/docfx/releases/download/v${DOCFXVERSION}/docfx-linux-x64-v${DOCFXVERSION}.zip -O build/docfx/docfx.zip
-        unzip build/docfx/docfx.zip -d build/docfx
-    - name: Install NuGet
-      uses: nuget/setup-nuget@v2
-    - name: Build Documentation
+        dotnet restore csharp/ApiDocs/ApiDocs.csproj
+        dotnet restore /p:IncludeMobileTargets=false csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
+    - name: docfx metadata
+      run: |
+        docfx metadata csharp/ApiDocs/docfx.json
+    - name: Build ApiDocs project
       run: |
-        build/docfx/docfx metadata csharp/ApiDocs/docfx.json
         dotnet build csharp/ApiDocs/ApiDocs.csproj --no-restore
-        build/docfx/docfx build csharp/ApiDocs/docfx.json
+    - name: docfx build
+      run: |
+        docfx build csharp/ApiDocs/docfx.json
     - name: Log source commit
       run: git rev-parse --short HEAD > csharp/ApiDocs/csharp/source-version.txt
     - name: Move C# docs into site

.vscode/settings.json

@@ -22,7 +22,5 @@
         "-build/include_subdir",
         "-runtime/references"
     ],
-    "files.associations": {
-        "span": "cpp"
-    }
+    "C_Cpp.autoAddFileAssociations": false
 }

NuGet.config

@@ -6,6 +6,8 @@
   <packageSources>
     <clear />
     <add key="NuGet Official" value="https://api.nuget.org/v3/index.json" />
+    <add key="MAUI DeviceRunners" value="https://pkgs.dev.azure.com/mattleibow/OpenSource/_packaging/test-device-runners/nuget/v3/index.json" />
+    <add key="XHarness" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

cgmanifests/cgmanifest.json

@@ -469,7 +469,7 @@
             "type": "pip",
             "pip": {
                "Name": "transformers",
-               "Version": "4.36.0"
+               "Version": "4.38.0"
             },
             "comments": "Installed in the training docker image"
          }

cgmanifests/generated/cgmanifest.json

@@ -361,6 +361,16 @@
         },
         "comments": "cudnn_frontend"
       }
+    },
+    {
+      "component": {
+        "type": "git",
+        "git": {
+          "commitHash": "511eb80847afe6bded34ec491a38d5d78ba2d604",
+          "repositoryUrl": "https://github.com/google/dawn.git"
+        },
+        "comments": "dawn"
+      }
     }
   ]
 }

cmake/CMakeLists.txt

@@ -413,8 +413,8 @@ endif(MSVC_Z7_OVERRIDE)
 set_msvc_c_cpp_compiler_warning_level(3)
 
 # Fuzz test has only been tested with BUILD_SHARED_LIB option,
-# using the MSVC compiler and on windows OS.
-if (MSVC AND WIN32 AND onnxruntime_FUZZ_TEST AND onnxruntime_BUILD_SHARED_LIB AND onnxruntime_USE_FULL_PROTOBUF)
+# using the MSVC compiler and on windows OS and clang/gcc compiler on Linux.
+if (onnxruntime_FUZZ_TEST AND onnxruntime_BUILD_SHARED_LIB AND onnxruntime_USE_FULL_PROTOBUF)
   # Fuzz test library dependency, protobuf-mutator,
   # needs the onnx message to be compiled using "non-lite protobuf version"
   set(onnxruntime_FUZZ_ENABLED ON)
@@ -1041,6 +1041,9 @@ function(onnxruntime_set_compile_flags target_name)
         #external/protobuf/src/google/protobuf/arena.h:445:18: error: unused parameter 'p'
         target_compile_options(${target_name} PRIVATE "-Wno-unused-parameter")
       endif()
+      if (CMAKE_CXX_COMPILER_ID STREQUAL "IBMClang")
+        target_compile_options(${target_name} PRIVATE "-Wno-unused-function")
+      endif()
       target_compile_definitions(${target_name} PUBLIC -DNSYNC_ATOMIC_CPP11)
       onnxruntime_add_include_to_target(${target_name} nsync::nsync_cpp)
     endif()

cmake/deps.txt

@@ -59,3 +59,4 @@ extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d839
 composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/204da9c522cebec5220bba52cd3542ebcaf99e7a.zip;1827348efd47831c13074245274d41b7cae8a557
 directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e
 cudnn_frontend;https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v1.5.2.zip;11071a47594b20f00af09aad83e0d5203ccf6029
+dawn;https://github.com/google/dawn/archive/511eb80847afe6bded34ec491a38d5d78ba2d604.zip;c493f5aca5586f6634e25d0121c85df71189fb99

cmake/external/eigen.cmake

@@ -3,11 +3,20 @@ if (onnxruntime_USE_PREINSTALLED_EIGEN)
     file(TO_CMAKE_PATH ${eigen_SOURCE_PATH} eigen_INCLUDE_DIRS)
     target_include_directories(eigen INTERFACE ${eigen_INCLUDE_DIRS})
 else ()
-    FetchContent_Declare(
-        eigen
-        URL ${DEP_URL_eigen}
-        URL_HASH SHA1=${DEP_SHA1_eigen}
-    )
+    if(CMAKE_SYSTEM_NAME MATCHES "AIX")
+        FetchContent_Declare(
+            eigen
+            URL ${DEP_URL_eigen}
+            URL_HASH SHA1=${DEP_SHA1_eigen}
+            PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/eigen/eigen-aix.patch
+        )
+    else()
+        FetchContent_Declare(
+            eigen
+            URL ${DEP_URL_eigen}
+            URL_HASH SHA1=${DEP_SHA1_eigen}
+        )
+    endif()
 
     FetchContent_Populate(eigen)
     set(eigen_INCLUDE_DIRS  "${eigen_SOURCE_DIR}")

cmake/onnxruntime_fuzz_test.cmake

@@ -5,61 +5,81 @@
 # the fuzzing project
 if (onnxruntime_FUZZ_ENABLED)
 	message(STATUS "Building dependency protobuf-mutator and libfuzzer")
-	
+
 	# set the options used to control the protobuf-mutator build
 	set(PROTOBUF_LIBRARIES ${PROTOBUF_LIB})
 	set(LIB_PROTO_MUTATOR_TESTING OFF)
-	
+
 	# include the protobuf-mutator CMakeLists.txt rather than the projects CMakeLists.txt to avoid target clashes
 	# with google test
 	add_subdirectory("external/libprotobuf-mutator/src")
-	
+
 	# add the appropriate include directory and compilation flags
 	# needed by the protobuf-mutator target and the libfuzzer
 	set(PROTOBUF_MUT_INCLUDE_DIRS "external/libprotobuf-mutator")
 	onnxruntime_add_include_to_target(protobuf-mutator ${PROTOBUF_LIB})
 	onnxruntime_add_include_to_target(protobuf-mutator-libfuzzer ${PROTOBUF_LIB})
 	target_include_directories(protobuf-mutator PRIVATE ${INCLUDE_DIRECTORIES} ${PROTOBUF_MUT_INCLUDE_DIRS})
 	target_include_directories(protobuf-mutator-libfuzzer PRIVATE ${INCLUDE_DIRECTORIES} ${PROTOBUF_MUT_INCLUDE_DIRS})
-	target_compile_options(protobuf-mutator PRIVATE "/wd4244" "/wd4245" "/wd4267" "/wd4100" "/wd4456")
-	target_compile_options(protobuf-mutator-libfuzzer PRIVATE "/wd4146" "/wd4267")
-
-	# add Fuzzing Engine Build Configuration 
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        # MSVC-specific compiler options
+        target_compile_options(protobuf-mutator PRIVATE "/wd4244" "/wd4245" "/wd4267" "/wd4100" "/wd4456")
+        target_compile_options(protobuf-mutator-libfuzzer PRIVATE "/wd4146" "/wd4267")
+    else()
+        # Linux-specific compiler options
+        target_compile_options(protobuf-mutator PRIVATE
+            -Wno-shorten-64-to-32
+            -Wno-conversion
+            -Wno-sign-compare
+            -Wno-unused-parameter
+            -Wno-shadow
+            -Wno-unused
+            -fexceptions
+        )
+        target_compile_options(protobuf-mutator-libfuzzer PRIVATE
+            -Wno-shorten-64-to-32
+            -Wno-conversion
+            -Wno-unused
+            -fexceptions
+        )
+    endif()
+
+	# add Fuzzing Engine Build Configuration
 	message(STATUS "Building Fuzzing engine")
-	
+
 	# set Fuzz root directory
 	set(SEC_FUZZ_ROOT ${TEST_SRC_DIR}/fuzzing)
-	
-	# Security fuzzing engine src file reference 
-	set(SEC_FUZ_SRC "${SEC_FUZZ_ROOT}/src/BetaDistribution.cpp" 
-					"${SEC_FUZZ_ROOT}/src/OnnxPrediction.cpp" 
-					"${SEC_FUZZ_ROOT}/src/testlog.cpp" 
+
+	# Security fuzzing engine src file reference
+	set(SEC_FUZ_SRC "${SEC_FUZZ_ROOT}/src/BetaDistribution.cpp"
+					"${SEC_FUZZ_ROOT}/src/OnnxPrediction.cpp"
+					"${SEC_FUZZ_ROOT}/src/testlog.cpp"
 					"${SEC_FUZZ_ROOT}/src/test.cpp")
-					
+
 	# compile the executables
 	onnxruntime_add_executable(onnxruntime_security_fuzz ${SEC_FUZ_SRC})
-	
+
 	# compile with c++17
 	target_compile_features(onnxruntime_security_fuzz PUBLIC cxx_std_17)
-	
+
 	# Security fuzzing engine header file reference
 	onnxruntime_add_include_to_target(onnxruntime_security_fuzz onnx onnxruntime)
-	
+
 	# Assign all include to one variable
 	set(SEC_FUZ_INC "${SEC_FUZZ_ROOT}/include")
 	set(INCLUDE_FILES ${SEC_FUZ_INC} "$<TARGET_PROPERTY:protobuf-mutator,INCLUDE_DIRECTORIES>")
-	
+
 	# add all these include directory to the Fuzzing engine
 	target_include_directories(onnxruntime_security_fuzz PRIVATE ${INCLUDE_FILES})
-	
+
 	# add link libraries the project
 	target_link_libraries(onnxruntime_security_fuzz onnx_proto onnxruntime protobuf-mutator ${PROTOBUF_LIB})
-	
+
 	# add the dependencies
 	add_dependencies(onnxruntime_security_fuzz onnx_proto onnxruntime protobuf-mutator ${PROTOBUF_LIB})
-	
+
 	# copy the dlls to the execution directory
 	add_custom_command(TARGET onnxruntime_security_fuzz POST_BUILD
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:onnxruntime>  $<TARGET_FILE_DIR:onnxruntime_security_fuzz>
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${PROTOBUF_LIB}>  $<TARGET_FILE_DIR:onnxruntime_security_fuzz>)
-endif()
+endif()

cmake/onnxruntime_kernel_explorer.cmake

@@ -89,4 +89,4 @@ add_dependencies(kernel_explorer onnxruntime_pybind11_state)
 
 enable_testing()
 find_package(Python COMPONENTS Interpreter REQUIRED)
-add_test(NAME test_kernels COMMAND ${Python_EXECUTABLE} -m pytest ..)
+# add_test(NAME test_kernels COMMAND ${Python_EXECUTABLE} -m pytest ..)

cmake/onnxruntime_mlas.cmake

@@ -40,6 +40,7 @@ onnxruntime_add_static_library(onnxruntime_mlas
   ${MLAS_SRC_DIR}/sqnbitgemm.cpp
   ${MLAS_SRC_DIR}/sqnbitgemm_q8_block.h
   ${MLAS_SRC_DIR}/flashattn.cpp
+  ${MLAS_SRC_DIR}/cast.cpp
 )
 
 target_sources(onnxruntime_mlas PRIVATE
@@ -212,6 +213,12 @@ function(setup_mlas_source_for_windows)
       ${MLAS_SRC_DIR}/amd64/TanhKernelFma3.asm
       ${MLAS_SRC_DIR}/amd64/ErfKernelFma3.asm
     )
+    if(MSVC_VERSION GREATER_EQUAL 1933)
+      target_sources(onnxruntime_mlas PRIVATE
+        ${MLAS_SRC_DIR}/amd64/cvtfp16Avx.asm
+      )
+    endif()
+
     if (NOT onnxruntime_ORT_MINIMAL_BUILD)
       target_sources(onnxruntime_mlas PRIVATE
         ${MLAS_SRC_DIR}/q4gemm_avx512.cpp
@@ -522,6 +529,12 @@ else()
           ${MLAS_SRC_DIR}/x86_64/SconvKernelSse2.S
           ${MLAS_SRC_DIR}/x86_64/SpoolKernelSse2.S
         )
+        if(NOT APPLE)
+          set(mlas_platform_srcs_sse2
+            ${mlas_platform_srcs_sse2}
+            ${MLAS_SRC_DIR}/x86_64/cvtfp16a.S
+          )
+        endif()
         set_source_files_properties(${mlas_platform_srcs_sse2} PROPERTIES COMPILE_FLAGS "-msse2")
 
         set(mlas_platform_srcs_avx
@@ -555,6 +568,12 @@ else()
           ${MLAS_SRC_DIR}/intrinsics/avx2/qdwconv_avx2.cpp
           ${MLAS_SRC_DIR}/sqnbitgemm_kernel_avx2.cpp
         )
+        if(CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13.1 AND NOT(APPLE))
+          set(mlas_platform_srcs_avx2
+            ${mlas_platform_srcs_avx2}
+            ${MLAS_SRC_DIR}/x86_64/cvtfp16Avx.S
+          )
+        endif()
 
 message(STATUS "CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")

cmake/onnxruntime_providers_openvino.cmake

@@ -36,6 +36,7 @@
   onnxruntime_add_include_to_target(onnxruntime_providers_openvino onnxruntime_common onnx)
   install(FILES ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/providers/openvino/openvino_provider_factory.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/)
+  set_target_properties(onnxruntime_providers_openvino PROPERTIES CXX_STANDARD 20)
   set_target_properties(onnxruntime_providers_openvino PROPERTIES LINKER_LANGUAGE CXX)
   set_target_properties(onnxruntime_providers_openvino PROPERTIES FOLDER "ONNXRuntime")
   if(NOT MSVC)

cmake/onnxruntime_python.cmake

@@ -117,7 +117,9 @@ elseif(UNIX)
   if (onnxruntime_ENABLE_EXTERNAL_CUSTOM_OP_SCHEMAS)
     set(ONNXRUNTIME_SO_LINK_FLAG "-Xlinker --version-script=${ONNXRUNTIME_ROOT}/python/version_script_expose_onnx_protobuf.lds -Xlinker --gc-sections")
   else()
-    set(ONNXRUNTIME_SO_LINK_FLAG "-Xlinker --version-script=${ONNXRUNTIME_ROOT}/python/version_script.lds -Xlinker --gc-sections")
+    if (NOT CMAKE_SYSTEM_NAME MATCHES "AIX")
+      set(ONNXRUNTIME_SO_LINK_FLAG "-Xlinker --version-script=${ONNXRUNTIME_ROOT}/python/version_script.lds -Xlinker --gc-sections")
+    endif()
   endif()
 else()
   set(ONNXRUNTIME_SO_LINK_FLAG "-DEF:${ONNXRUNTIME_ROOT}/python/pybind.def")
@@ -224,7 +226,9 @@ elseif (APPLE)
     BUILD_WITH_INSTALL_RPATH TRUE
     INSTALL_RPATH_USE_LINK_PATH FALSE)
 else()
-  set_property(TARGET onnxruntime_pybind11_state APPEND_STRING PROPERTY LINK_FLAGS " -Xlinker -rpath=\\$ORIGIN")
+  if (NOT CMAKE_SYSTEM_NAME MATCHES "AIX")
+     set_property(TARGET onnxruntime_pybind11_state APPEND_STRING PROPERTY LINK_FLAGS " -Xlinker -rpath=\\$ORIGIN")
+  endif()
 endif()
 
 if (onnxruntime_ENABLE_EXTERNAL_CUSTOM_OP_SCHEMAS)

cmake/onnxruntime_unittests.cmake

@@ -892,6 +892,8 @@ if (MSVC)
   set_property(SOURCE "${TEST_SRC_DIR}/optimizer/graph_transform_test.cc"
                       "${TEST_SRC_DIR}/optimizer/qdq_transformer_test.cc"
                APPEND PROPERTY COMPILE_OPTIONS "/bigobj")
+  set_property(SOURCE "${TEST_SRC_DIR}/optimizer/qdq_transformer_test.cc"
+               APPEND PROPERTY COMPILE_OPTIONS "/bigobj")
 else()
   target_compile_options(onnxruntime_test_all PRIVATE "-Wno-parentheses")
 endif()
@@ -913,6 +915,15 @@ if (MSVC AND onnxruntime_ENABLE_STATIC_ANALYSIS)
 target_compile_options(onnxruntime_test_all PRIVATE  "/analyze:stacksize 131072")
 endif()
 
+#In AIX + gcc compiler ,crash is observed with the usage of googletest EXPECT_THROW,
+#because some needed symbol is garbaged out by linker.
+#So, fix is to exports the symbols from executable.
+#Another way is to use -Wl,-bkeepfile for each object file where EXPECT_THROW is used like below
+#target_link_options(onnxruntime_test_all PRIVATE "-Wl,-bkeepfile:CMakeFiles/onnxruntime_test_all.dir${TEST_SRC_DIR}/framework/tensor_test.cc.o")
+if (CMAKE_SYSTEM_NAME MATCHES "AIX" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  set_target_properties(onnxruntime_test_all PROPERTIES ENABLE_EXPORTS 1)
+endif()
+
 # the default logger tests conflict with the need to have an overall default logger
 # so skip in this type of
 target_compile_definitions(onnxruntime_test_all PUBLIC -DSKIP_DEFAULT_LOGGER_TESTS)
@@ -1251,6 +1262,37 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
       endif()
     endif()
   endif()
+
+
+  if(onnxruntime_USE_QNN)
+    #qnn ctx generator
+    set(onnxruntime_qnn_ctx_gen_src_dir ${TEST_SRC_DIR}/qnn_ctx_gen)
+    set(onnxruntime_qnn_ctx_gen_src_patterns
+    "${onnxruntime_qnn_ctx_gen_src_dir}/*.cc"
+    "${onnxruntime_qnn_ctx_gen_src_dir}/*.h")
+
+    file(GLOB onnxruntime_qnn_ctx_gen_src CONFIGURE_DEPENDS
+      ${onnxruntime_qnn_ctx_gen_src_patterns}
+      )
+    onnxruntime_add_executable(onnxruntime_qnn_ctx_gen ${onnxruntime_qnn_ctx_gen_src})
+    target_include_directories(onnxruntime_qnn_ctx_gen PRIVATE   ${onnx_test_runner_src_dir} ${ONNXRUNTIME_ROOT}
+          ${eigen_INCLUDE_DIRS} ${onnxruntime_graph_header} ${onnxruntime_exec_src_dir}
+          ${CMAKE_CURRENT_BINARY_DIR})
+    if (WIN32)
+      target_compile_options(onnxruntime_qnn_ctx_gen PRIVATE ${disabled_warnings})
+      if (NOT DEFINED SYS_PATH_LIB)
+        set(SYS_PATH_LIB shlwapi)
+      endif()
+    endif()
+
+    if(WIN32)
+      target_link_libraries(onnxruntime_qnn_ctx_gen PRIVATE debug dbghelp advapi32)
+    endif()
+    target_link_libraries(onnxruntime_qnn_ctx_gen PRIVATE onnx_test_runner_common onnxruntime_test_utils onnxruntime_common onnxruntime_graph onnxruntime_session onnxruntime_providers onnxruntime_framework onnxruntime_util onnxruntime_mlas onnxruntime_optimizer onnxruntime_flatbuffers onnx_test_data_proto ${onnxruntime_test_providers_libs} ${onnxruntime_EXTERNAL_LIBRARIES} ${GETOPT_LIB_WIDE} ${SYS_PATH_LIB} ${CMAKE_DL_LIBS})
+
+    set_target_properties(onnxruntime_qnn_ctx_gen PROPERTIES FOLDER "ONNXRuntimeTest")
+  endif()
+
   # shared lib
   if (onnxruntime_BUILD_SHARED_LIB)
     onnxruntime_add_static_library(onnxruntime_mocked_allocator ${TEST_SRC_DIR}/util/test_allocator.cc)
@@ -1764,7 +1806,12 @@ if (NOT onnxruntime_MINIMAL_BUILD AND NOT onnxruntime_EXTENDED_MINIMAL_BUILD
 
   onnxruntime_add_shared_library_module(test_execution_provider ${test_execution_provider_srcs})
   add_dependencies(test_execution_provider onnxruntime_providers_shared onnx ${ABSEIL_LIBS})
-  target_link_libraries(test_execution_provider PRIVATE onnxruntime_providers_shared ${ABSEIL_LIBS} Boost::mp11)
+  if (CMAKE_SYSTEM_NAME MATCHES "AIX")
+    target_link_options(test_execution_provider PRIVATE -Wl,-brtl -lonnxruntime_providers_shared)
+    target_link_libraries(test_execution_provider PRIVATE ${ABSEIL_LIBS} Boost::mp11)
+  else()
+    target_link_libraries(test_execution_provider PRIVATE onnxruntime_providers_shared ${ABSEIL_LIBS} Boost::mp11)
+  endif()
   target_include_directories(test_execution_provider PRIVATE $<TARGET_PROPERTY:onnx,INTERFACE_INCLUDE_DIRECTORIES>)
   target_include_directories(test_execution_provider PRIVATE $<TARGET_PROPERTY:onnxruntime_common,INTERFACE_INCLUDE_DIRECTORIES>)
   target_include_directories(test_execution_provider PRIVATE ${ONNXRUNTIME_ROOT} ${CMAKE_CURRENT_BINARY_DIR} ${ORTTRAINING_ROOT})