Cherry picks for 1.12.1 (#12418)

* update package version

* Prevent unbounded growth of command allocator memory (#12114)

Prevent unbounded growth of command allocator memory

* Update supported ops md for NNAPI/CoreML EP (#12245)

* update supported ops md

* address pr comments

* address pr comments

* wording

* Change native folder name for java macos arm64 (#12335)

* Bump async from 2.6.3 to 2.6.4 in /js/react_native/e2e (#11280)

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](caolan/async@v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [js/rn] upgrade dependencies for e2e test (#11863)

* [js/rn] upgrade dependencies for e2e test

* use JDK11 only for gradle

* expand variable

* [js/rn] upgrade package react-native@^0.69.1 (#12155)

* [js/rn] upgrade package react-native@^0.69.1

* upgrade compile sdk to v31

* update ios version requirement

* update pod path for onnxruntime-react-native

* add missing build_java in Android testing stage. (#12187)

add missing build_java in testing

* Use specific Android NDK version in CI builds. (#12350)

Current builds use a NDK version that happens to be on the build machine. The build machine environment may change in ways that are outside of our control.
This change installs a specific version of NDK (the current LTS version 25.0.8775105) and uses it.

* Remove preview keyword from DirectML pacakge (#12368)

Remove preview keyword

Co-authored-by: Sumit Agarwal <[email protected]>

* Scope CreateFileMapping2 to valid API partitions (#12374)

* Fix TRT custom op issue (#12283)

* Pass schema registry on CreateModel.

* Fix ORT_MINIMAL_BUILD.

* Fix build issue.

* Manually add optimization flag for Android Release builds. (#12390)

With recent versions of NDK (since 23), the `-O` optimization level compile flag is not being passed when building in the "Release" configuration.
More details here: android/ndk#1740

Our "Release" Android builds have been built without the optimization flag since we upgraded from NDK 21.

This change is a workaround to manually add `-O3` for "Release" Android builds.

* resolve conflicts in tensorRT related changes

* Enable support of multi-level nested control flow ops model for TRT EP (#12147)

* Make multiple-level nested control flow op model work

* find correct input index

* find correct input index (cont.)

* enable nested layer unit tests for TRT EP

* add comment

* add Scan op to current workaround support of control flow op

Co-authored-by: Jeff Bloomfield <[email protected]>
Co-authored-by: Rachel Guo <[email protected]>
Co-authored-by: Changming Sun <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yulong Wang <[email protected]>
Co-authored-by: Yi Zhang <[email protected]>
Co-authored-by: Edward Chen <[email protected]>
Co-authored-by: sumitsays <[email protected]>
Co-authored-by: Sumit Agarwal <[email protected]>
Co-authored-by: Justin Stoecker <[email protected]>
Co-authored-by: Yateng Hong <[email protected]>
Co-authored-by: Chi Lo <[email protected]>

cmake/CMakeLists.txt

@@ -306,6 +306,16 @@ if (onnxruntime_EXTENDED_MINIMAL_BUILD AND NOT onnxruntime_MINIMAL_BUILD)
   set(onnxruntime_MINIMAL_BUILD ON)
 endif()
 
+# work around Android NDK bug which doesn't include -O flag for Release configuration
+# https://github.com/android/ndk/issues/1740
+# TODO: remove this when the NDK version(s) we support get fixed
+if (CMAKE_SYSTEM_NAME STREQUAL "Android")
+  # NB: attempting to match the effects of this fix: https://android-review.googlesource.com/c/platform/ndk/+/2168845
+  string(APPEND CMAKE_C_FLAGS_RELEASE " -O3")
+  string(APPEND CMAKE_CXX_FLAGS_RELEASE " -O3")
+  string(APPEND CMAKE_ASM_FLAGS_RELEASE " -O3")
+endif()
+
 # Enable space optimization for gcc/clang
 # Cannot use "-ffunction-sections -fdata-sections" if we enable bitcode (iOS)
 if (NOT MSVC AND NOT onnxruntime_ENABLE_BITCODE)

docs/Versioning.md

@@ -26,6 +26,7 @@ For more details on ONNX Release versions, see [this page](https://github.com/on
 
 | ONNX Runtime release version | ONNX release version | ONNX opset version | ONNX ML opset version | Supported ONNX IR version | [Windows ML Availability](https://docs.microsoft.com/en-us/windows/ai/windows-ml/release-notes/)|
 |------------------------------|--------------------|--------------------|----------------------|------------------|------------------|
+| 1.12.1 | **1.10** down to 1.2 | 15 | 2 | 7 | Windows AI 1.11+ |
 | 1.12.0 | **1.10** down to 1.2 | 15 | 2 | 7 | Windows AI 1.11+ |
 | 1.11.0 | **1.10** down to 1.2 | 15 | 2 | 7 | Windows AI 1.11+ |
 | 1.10.0 | **1.10** down to 1.2 | 15 | 2 | 7 | Windows AI 1.10+ |

docs/python/README.rst

@@ -8,6 +8,11 @@ For more information on ONNX Runtime, please see `aka.ms/onnxruntime <https://ak
 Changes
 -------
 
+1.12.1
+^^^^^^
+
+Release Notes : https://github.com/Microsoft/onnxruntime/releases/tag/v1.12.1
+
 1.12.0
 ^^^^^^
 

include/onnxruntime/core/graph/graph_viewer.h

@@ -187,6 +187,10 @@ class GraphViewer {
   */
   const IndexedSubGraph* GetFilterInfo() const { return filter_info_; }
 
+#if !defined(ORT_MINIMAL_BUILD)
+  IOnnxRuntimeOpSchemaCollectionPtr GetSchemaRegistry() const { return graph_->GetSchemaRegistry(); }
+#endif
+
  private:
   ORT_DISALLOW_COPY_ASSIGNMENT_AND_MOVE(GraphViewer);
   GraphViewer(const Graph& graph, const IndexedSubGraph* filter_info);

js/common/package.json

@@ -8,7 +8,7 @@
   },
   "author": "fs-eire",
   "module": "dist/lib/index.js",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "jsdelivr": "dist/ort-common.min.js",
   "scripts": {
     "prepare": "tsc && webpack"
@@ -28,4 +28,4 @@
   "main": "dist/ort-common.node.js",
   "types": "dist/lib/index.d.ts",
   "description": "ONNXRuntime JavaScript API library"
-}
+}

js/node/package.json

@@ -13,7 +13,7 @@
       3
     ]
   },
-  "version": "1.12.0",
+  "version": "1.12.1",
   "dependencies": {
     "onnxruntime-common": "file:../common"
   },
@@ -55,4 +55,4 @@
   ],
   "types": "dist/index.d.ts",
   "description": "ONNXRuntime Node.js binding"
-}
+}

js/react_native/android/gradle.properties

@@ -14,6 +14,6 @@
 android.enableJetifier=true
 android.useAndroidX=true
 OnnxruntimeModule_buildToolsVersion=29.0.2
-OnnxruntimeModule_compileSdkVersion=29
+OnnxruntimeModule_compileSdkVersion=31
 OnnxruntimeModule_minSdkVersion=21
 OnnxruntimeModule_targetSdkVersion=29

js/react_native/e2e/android/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 29
+        compileSdkVersion = 31
         targetSdkVersion = 29
     }
     repositories {

js/react_native/e2e/ios/Podfile

@@ -1,7 +1,7 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '11.0'
+platform :ios, '12.4'
 
 target 'OnnxruntimeModuleExample' do
   config = use_native_modules!
@@ -13,7 +13,7 @@ target 'OnnxruntimeModuleExample' do
   if File.exist?('../../local_pods/onnxruntime-mobile-c.zip')
     pod 'onnxruntime-mobile-c', :podspec => '../../onnxruntime-mobile-c.podspec'
   end
-  pod 'onnxruntime-react-native', :path => '../..'
+  pod 'onnxruntime-react-native', :path => '../node_modules/onnxruntime-react-native'
 
   inherit! :search_paths
 end

js/react_native/e2e/package.json

@@ -9,8 +9,8 @@
     "start": "react-native start"
   },
   "dependencies": {
-    "react": "^17.0.2",
-    "react-native": "^0.67.2"
+    "react": "^18.1.0",
+    "react-native": "^0.69.1"
   },
   "devDependencies": {
     "@babel/core": "^7.17.0",