Merge remote-tracking branch 'origin/master' into snnn/cibuildwheel

Author: snnn

.gitignore

@@ -58,3 +58,4 @@ onnxruntime/python/version_info.py
 # direnv, posh-direnv
 .envrc
 .psenvrc
+*.csproj.user

cgmanifests/README.md

@@ -1,21 +1,27 @@
 # CGManifest Files
 This directory contains CGManifest (cgmanifest.json) files.
-See here for details: https://docs.opensource.microsoft.com/tools/cg/cgmanifest.html
+See [here](https://docs.opensource.microsoft.com/tools/cg/cgmanifest.html) for details.
 
-`cgmanifests/cgmanifest.json` contains entries that don't belong in more specific categories (e.g., git submodules).
+## `cgmanifests/generated/cgmanifest.json`
+This file contains generated CGManifest entries.
 
-## Git Submodules
-`cgmanifests/submodules/cgmanifest.json` contains entries for git submodules.
-It can be generated like this:
+It covers these dependencies:
+- git submodules
+- dependencies from the Dockerfile `tools/ci_build/github/linux/docker/Dockerfile.manylinux2014_cuda11`
 
+If any of these dependencies change, this file should be updated.
+**When updating, please regenerate instead of editing manually.**
+
+### How to Generate
 1. Change to the repository root directory.
-2. Ensure the submodules are checked out. For example, with:
+2. Ensure the git submodules are checked out and up to date. For example, with:
     ```
     $ git submodule update --init --recursive
     ```
 3. Run the generator script:
     ```
-    $ python cgmanifests/submodules/generate_submodule_cgmanifest.py > cgmanifests/submodules/cgmanifest.json
+    $ python cgmanifests/generate_cgmanifest.py
     ```
 
-Please update this cgmanifest.json file when any git submodules change.
+## `cgmanifests/cgmanifest.json`
+This file contains non-generated CGManifest entries. Please edit directly as needed.

cgmanifests/cgmanifest.json

@@ -1,5 +1,19 @@
 {
    "Registrations": [
+      {
+        "component": {
+          "Type": "maven",
+          "maven": { "GroupId": "org.junit.platform", "ArtifactId": "junit-platform-console-standalone", "Version": "1.6.2" },
+          "DevelopmentDependency": true
+        }
+      },
+      {
+        "component": {
+          "Type": "maven",
+          "maven": { "GroupId": "com.google.protobuf", "ArtifactId": "protobuf-java", "Version": "3.9.2" },
+          "DevelopmentDependency": true
+        }
+      },
       {
          "component": {
             "type": "git",

cgmanifests/submodules/generate_submodule_cgmanifest.py renamed to cgmanifests/generate_cgmanifest.py

@@ -2,12 +2,12 @@
 
 import json
 import os
+import re
 import subprocess
 import sys
-import re
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-REPO_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "..", ".."))
+REPO_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, ".."))
 
 package_name = None
 package_filename = None
@@ -16,7 +16,7 @@
 registrations = []
 
 with open(os.path.join(REPO_DIR, 'tools', 'ci_build', 'github', 'linux', 'docker', 'Dockerfile.manylinux2014_cuda11'),
-          "r") as f:
+          mode="r") as f:
     for line in f:
         if not line.strip():
             package_name = None
@@ -95,4 +95,5 @@ def normalize_path_separators(path):
 
 cgmanifest = {"Version": 1, "Registrations": registrations}
 
-print(json.dumps(cgmanifest, indent=2))
+with open(os.path.join(SCRIPT_DIR, "generated", "cgmanifest.json"), mode="w") as generated_cgmanifest_file:
+    print(json.dumps(cgmanifest, indent=2), file=generated_cgmanifest_file)

cgmanifests/generated/README.md

@@ -0,0 +1,2 @@
+`cgmanifests/generated/cgmanifest.json` is a generated file. Please do not edit it directly.
+More info [here](../README.md).

cgmanifests/submodules/cgmanifest.json renamed to cgmanifests/generated/cgmanifest.json

@@ -17,8 +17,8 @@
         "Type": "other",
         "other": {
           "Name": "automake",
-          "Version": "1.16.4",
-          "DownloadUrl": "http://ftp.gnu.org/gnu/automake/automake-1.16.4.tar.gz"
+          "Version": "1.16.5",
+          "DownloadUrl": "http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz"
         },
         "comments": "manylinux dependency"
       }
@@ -50,8 +50,8 @@
         "Type": "other",
         "other": {
           "Name": "libxcrypt",
-          "Version": "4.4.23",
-          "DownloadUrl": "https://github.com/besser82/libxcrypt/archive/v4.4.23.tar.gz"
+          "Version": "4.4.26",
+          "DownloadUrl": "https://github.com/besser82/libxcrypt/archive/v4.4.26.tar.gz"
         },
         "comments": "manylinux dependency"
       }
@@ -61,8 +61,8 @@
         "Type": "other",
         "other": {
           "Name": "git",
-          "Version": "2.32.0",
-          "DownloadUrl": "https://www.kernel.org/pub/software/scm/git/git-2.32.0.tar.gz"
+          "Version": "2.33.1",
+          "DownloadUrl": "https://www.kernel.org/pub/software/scm/git/git-2.33.1.tar.gz"
         },
         "comments": "manylinux dependency"
       }
@@ -94,8 +94,8 @@
         "Type": "other",
         "other": {
           "Name": "openssl",
-          "Version": "1.1.1k",
-          "DownloadUrl": "https://www.openssl.org/source/openssl-1.1.1k.tar.gz"
+          "Version": "1.1.1l",
+          "DownloadUrl": "https://www.openssl.org/source/openssl-1.1.1l.tar.gz"
         },
         "comments": "manylinux dependency"
       }
@@ -264,7 +264,7 @@
       "component": {
         "type": "git",
         "git": {
-          "commitHash": "1f63dcb7fcc3a8bf5c3c8e326867ecd6f5c43f35",
+          "commitHash": "be76ca7148396176784ba8733133b9fb1186ea0d",
           "repositoryUrl": "https://github.com/onnx/onnx"
         },
         "comments": "git submodule at cmake/external/onnx"

cgmanifests/submodules/print_submodule_info.py renamed to cgmanifests/print_submodule_info.py

@@ -1,4 +1,3 @@
-
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
@@ -18,7 +17,7 @@ cmake_policy(SET CMP0104 OLD)
 # Project
 project(onnxruntime C CXX)
 # Needed for Java
-set (CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD 99)
 
 include(CheckCXXCompilerFlag)
 include(CheckLanguage)
@@ -108,17 +107,18 @@ option(onnxruntime_USE_ROCM "Build with AMD GPU support" OFF)
 option(onnxruntime_DISABLE_CONTRIB_OPS "Disable contrib ops" OFF)
 option(onnxruntime_DISABLE_ML_OPS "Disable traditional ML ops" OFF)
 option(onnxruntime_DISABLE_SPARSE_TENSORS "Disable sparse tensors data types" OFF)
-cmake_dependent_option(onnxruntime_DISABLE_RTTI "Disable RTTI" ON "onnxruntime_MINIMAL_BUILD;NOT onnxruntime_ENABLE_PYTHON" OFF)
-# For now onnxruntime_DISABLE_EXCEPTIONS will only work with onnxruntime_MINIMAL_BUILD, more changes (ONNX, non-CPU EP, ...) are required to run this standalone
-option(onnxruntime_DISABLE_EXCEPTIONS "Disable exception handling. Requires onnxruntime_MINIMAL_BUILD currently." OFF)
 option(onnxruntime_MINIMAL_BUILD "Exclude as much as possible from the build. Support ORT format models. No support for ONNX format models." OFF)
+cmake_dependent_option(onnxruntime_DISABLE_RTTI "Disable RTTI" ON "NOT onnxruntime_ENABLE_PYTHON" OFF)
+# For now onnxruntime_DISABLE_EXCEPTIONS will only work with onnxruntime_MINIMAL_BUILD, more changes (ONNX, non-CPU EP, ...) are required to run this standalone
+cmake_dependent_option(onnxruntime_DISABLE_EXCEPTIONS "Disable exception handling. Requires onnxruntime_MINIMAL_BUILD currently." ON "onnxruntime_MINIMAL_BUILD;NOT onnxruntime_ENABLE_PYTHON" OFF)
+
 option(onnxruntime_EXTENDED_MINIMAL_BUILD "onnxruntime_MINIMAL_BUILD with support for execution providers that compile kernels." OFF)
 option(onnxruntime_MINIMAL_BUILD_CUSTOM_OPS "Add custom operator kernels support to a minimal build." OFF)
 option(onnxruntime_REDUCED_OPS_BUILD "Reduced set of kernels are registered in build via modification of the kernel registration source files." OFF)
-option(onnxruntime_DISABLE_ORT_FORMAT_LOAD "Disable loading an ORT format model when onnxruntime_MINIMAL_BUILD=OFF (i.e. in a full build)." OFF)
 option(onnxruntime_DISABLE_EXTERNAL_INITIALIZERS "Don't allow models to load external data" OFF)
-cmake_dependent_option(onnxruntime_ENABLE_ORT_FORMAT_RUNTIME_GRAPH_OPTIMIZATION "Enable runtime graph optimization of ORT format models." ON
-                       "NOT onnxruntime_MINIMAL_BUILD OR onnxruntime_EXTENDED_MINIMAL_BUILD" OFF)
+cmake_dependent_option(onnxruntime_ENABLE_ORT_FORMAT_RUNTIME_GRAPH_OPTIMIZATION
+                       "Enable runtime graph optimization of ORT format models. Warning: Not yet ready for general use."
+                       OFF "NOT onnxruntime_MINIMAL_BUILD OR onnxruntime_EXTENDED_MINIMAL_BUILD" OFF)
 
 #A special option just for debugging and sanitize check. Please do not enable in option in retail builds.
 #The option has no effect on Windows.
@@ -170,6 +170,13 @@ set(ONNX_CUSTOM_PROTOC_EXECUTABLE "" CACHE STRING "Specify custom protoc executa
 # pre-build python path
 option(onnxruntime_PREBUILT_PYTORCH_PATH "Path to pytorch installation dir")
 
+# external transformer src path
+option(onnxruntime_EXTERNAL_TRANSFORMER_SRC_PATH "Path to external transformer src dir")
+
+if (onnxruntime_USE_CUDA)
+  set(onnxruntime_DISABLE_RTTI OFF)
+endif()
+
 if (APPLE)
     if (NOT CMAKE_OSX_ARCHITECTURES)
         message("Building ONNX Runtime for ${CMAKE_HOST_SYSTEM_PROCESSOR}")
@@ -179,7 +186,7 @@ elseif (NOT WIN32 AND NOT APPLE)
 endif()
 
 # Single output director for all binaries
-set (RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Single output directory for all binaries.")
+set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Single output directory for all binaries.")
 
 function(set_msvc_c_cpp_compiler_warning_level warning_level)
   if (NOT "${warning_level}" MATCHES "^[0-4]$")
@@ -282,8 +289,8 @@ endif()
 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}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
     include_directories(${OpenMP_CXX_INCLUDE_DIR})
   else()
     message(WARNING "Flag --use_openmp is specified, but OpenMP is not found in current build environment. Setting it to OFF.")
@@ -329,10 +336,13 @@ if (onnxruntime_BUILD_WEBASSEMBLY)
   endif()
 endif()
 
+if (onnxruntime_EXTERNAL_TRANSFORMER_SRC_PATH)
+  add_definitions(-DORT_TRAINING_EXTERNAL_GRAPH_TRANSFORMERS=1)
+endif()
+
 # ORT build with as much excluded as possible. Supports ORT flatbuffers models only.
 if (onnxruntime_MINIMAL_BUILD)
   add_compile_definitions(ORT_MINIMAL_BUILD)
-  add_compile_definitions(ENABLE_ORT_FORMAT_LOAD)
 
   if (onnxruntime_EXTENDED_MINIMAL_BUILD)
     # enable EPs that compile kernels at runtime
@@ -345,15 +355,10 @@ if (onnxruntime_MINIMAL_BUILD)
 
   set(onnxruntime_REDUCED_OPS_BUILD ON)
 
-  if (NOT onnxruntime_ENABLE_PYTHON)
-    # Python bindings use typeid so can't automatically disable RTTI in that case
-    set(onnxruntime_DISABLE_RTTI ON)
-  endif()
-
   if (MSVC)
     # turn on LTO (which adds some compiler flags and turns on LTCG) unless it's a Debug build to minimize binary size
     if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set (onnxruntime_ENABLE_LTO ON)
+      set(onnxruntime_ENABLE_LTO ON)
     endif()
 
     # undocumented internal flag to allow analysis of a minimal build binary size
@@ -374,11 +379,6 @@ if (onnxruntime_MINIMAL_BUILD)
       string(APPEND CMAKE_C_FLAGS " -g")
     endif()
   endif()
-else()
-  # support ORT format model loading unless onnxruntime_DISABLE_ORT_FORMAT_LOAD is set
-  if (NOT onnxruntime_DISABLE_ORT_FORMAT_LOAD)
-    add_compile_definitions(ENABLE_ORT_FORMAT_LOAD)
-  endif()
 endif()
 
 if (onnxruntime_ENABLE_ORT_FORMAT_RUNTIME_GRAPH_OPTIMIZATION)
@@ -392,7 +392,7 @@ if (onnxruntime_ENABLE_LTO)
       message(WARNING "IPO is not supported by this compiler")
       set(onnxruntime_ENABLE_LTO OFF)
     else()
-      set (CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
+      set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
     endif()
 endif()
 
@@ -405,7 +405,7 @@ if (onnxruntime_DISABLE_EXTERNAL_INITIALIZERS)
 endif()
 
 if (onnxruntime_DISABLE_RTTI)
-  add_compile_definitions(ORT_NO_RTTI GOOGLE_PROTOBUF_NO_RTTI)
+  add_compile_definitions(ORT_NO_RTTI)
   if (MSVC)
     # Disable RTTI and turn usage of dynamic_cast and typeid into errors
     add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/GR->" "$<$<COMPILE_LANGUAGE:CXX>:/we4541>")
@@ -427,6 +427,10 @@ if (onnxruntime_DISABLE_EXCEPTIONS)
     message(FATAL_ERROR "onnxruntime_MINIMAL_BUILD required for onnxruntime_DISABLE_EXCEPTIONS")
   endif()
 
+  if (onnxruntime_ENABLE_PYTHON)
+    # pybind11 highly depends on C++ exceptions.
+    message(FATAL_ERROR "onnxruntime_ENABLE_PYTHON must be disabled for onnxruntime_DISABLE_EXCEPTIONS")
+  endif()
   add_compile_definitions("ORT_NO_EXCEPTIONS")
   add_compile_definitions("MLAS_NO_EXCEPTION")
   add_compile_definitions("ONNX_NO_EXCEPTIONS")
@@ -552,30 +556,30 @@ if (MSVC)
   endif()
 
   if (onnxruntime_ENABLE_LTO AND NOT onnxruntime_USE_CUDA)
-    SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Gw /GL")
-    SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Gw /GL")
-    SET (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Gw /GL")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Gw /GL")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Gw /GL")
+    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Gw /GL")
   endif()
 
   # The WinML build tool chain builds ARM/ARM64, and the internal tool chain does not have folders for spectre mitigation libs.
   # WinML performs spectre mitigation differently.
   if (NOT DEFINED onnxruntime_DISABLE_QSPECTRE_CHECK)
     check_cxx_compiler_flag(-Qspectre HAS_QSPECTRE)
     if (HAS_QSPECTRE)
-      SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
-      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qspectre")
     endif()
   endif()
-  SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /DYNAMICBASE")
+  set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /DYNAMICBASE")
   check_cxx_compiler_flag(-guard:cf HAS_GUARD_CF)
   if (HAS_GUARD_CF)
-    SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /guard:cf")
-    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /guard:cf")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /guard:cf")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /guard:cf")
-    SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /guard:cf")
-    SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /guard:cf")
-    SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /guard:cf")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /guard:cf")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /guard:cf")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /guard:cf")
+    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /guard:cf")
+    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /guard:cf")
+    set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /guard:cf")
   endif()
 else()
   if (NOT APPLE)
@@ -630,7 +634,7 @@ endif()
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     #For Mac compliance
     message("Adding flags for Mac builds")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
 endif()
 
 #Dependencies begin
@@ -736,7 +740,7 @@ else()
     set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build with zlib support" FORCE)
   endif()
   if (onnxruntime_DISABLE_RTTI)
-    set(protobuf_DISABLE_RTTI OFF CACHE BOOL "Remove runtime type information in the binaries" FORCE)
+    set(protobuf_DISABLE_RTTI ON CACHE BOOL "Remove runtime type information in the binaries" FORCE)
   endif()
   add_subdirectory(${PROJECT_SOURCE_DIR}/external/protobuf/cmake EXCLUDE_FROM_ALL)
 
@@ -931,11 +935,15 @@ if (WIN32)
         list(APPEND ORT_WARNING_FLAGS "/wd4251")
         # issued by thrust nonstandard extension used: nameless struct/union
         list(APPEND ORT_WARNING_FLAGS "/wd4201")
+        # warning C4800: Implicit conversion from 'X' to bool. Possible information loss
+        list(APPEND ORT_WARNING_FLAGS "/w34800")
         if (onnxruntime_USE_OPENMP)
             list(APPEND ORT_WARNING_FLAGS "/wd6993") # Code analysis ignores OpenMP constructs
         endif()
         # operator 'operator-name': deprecated between enumerations of different types
         list(APPEND ORT_WARNING_FLAGS "/wd5054")
+        # Enable warning: data member 'member' will be initialized after data member 'member2' / base class 'base_class'
+        list(APPEND ORT_WARNING_FLAGS "/w15038")
         # Treat warning as error if onnxruntime_DEV_MODE is ON
         # For cross-compiled ARM64 binaries, there are too many warnings to fix, hence ignore warnings for now
         if (onnxruntime_DEV_MODE AND NOT CMAKE_CROSSCOMPILING)
@@ -1503,6 +1511,11 @@ if (onnxruntime_USE_OPENVINO)
     add_definitions(-DDEVICE_NAME="${onnxruntime_USE_OPENVINO_DEVICE}")
   endif()
 
+  if(onnxruntime_USE_OPENVINO_AUTO)
+    add_definitions(-DOPENVINO_CONFIG_AUTO=1)
+    add_definitions(-DDEVICE_NAME="${onnxruntime_USE_OPENVINO_DEVICE}")
+  endif()
+
 endif()
 
 if (onnxruntime_USE_VITISAI)