Merge branch 'main' into skia

DEVELOPMENT.md

@@ -23,6 +23,7 @@ The [polyfills](./polyfills.js) to support some pipeline.
 
 - [Allow the creation of boolean tensors from ByteBuffer](https://github.com/microsoft/onnxruntime/pull/15556)
 - [Allows the creation and extraction of zero length tensors](https://github.com/microsoft/onnxruntime/pull/15116) (It included in v1.15)
+- [[js/rn] Support create boolean tensor](https://github.com/microsoft/onnxruntime/pull/17052)
 
 # Performance Improvement
 

android/settings.gradle

@@ -2,5 +2,3 @@ rootProject.name = 'transformers_example'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/react-native-gradle-plugin')
-include ':onnxruntime-patched'
-project(':onnxruntime-patched').projectDir = new File(rootProject.projectDir, '../onnxruntime-patched')

ios/Podfile.lock

@@ -78,7 +78,7 @@ PODS:
   - hermes-engine/Pre-built (0.71.8)
   - libevent (2.1.12)
   - onnxruntime-c (1.14.0)
-  - onnxruntime-react-native (1.14.0):
+  - onnxruntime-react-native (1.16.1):
     - onnxruntime-c
     - React-Core
   - OpenSSL-Universal (1.1.1100)
@@ -627,7 +627,7 @@ SPEC CHECKSUMS:
   hermes-engine: 47986d26692ae75ee7a17ab049caee8864f855de
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   onnxruntime-c: 1f5923e555122d12239a1173229d6c5e8a0afd3e
-  onnxruntime-react-native: 8cef9ae43ece425e187415e28a2e02aee3bc80af
+  onnxruntime-react-native: 753834faafb338b4b5de4e41d1d595e098fe984d
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: 8af6a32dfc2b65ec82193c2dee6e1011ff22ac2a

package.json

@@ -14,7 +14,7 @@
     "@craftzdog/react-native-buffer": "^6.0.5",
     "@fugood/react-native-audio-pcm-stream": "^1.1.4",
     "@shopify/react-native-skia": "./shopify-react-native-skia-0.1.2.tgz",
-    "@xenova/transformers": "https://github.com/hans00/transformers.js#merge",
+    "@xenova/transformers": "https://github.com/hans00/transformers.js.git#merge",
     "assert": "^2.0.0",
     "browserify-zlib": "^0.2.0",
     "color-parse": "^2.0.0",
@@ -24,7 +24,7 @@
     "mp3": "^0.1.0",
     "node-fetch": "^2.6.7",
     "node-wav": "^0.0.2",
-    "onnxruntime-react-native": "1.14.0",
+    "onnxruntime-react-native": "1.16.1",
     "path-browserify": "^1.0.1",
     "react": "18.2.0",
     "react-native": "0.71.8",
@@ -70,6 +70,8 @@
   "resolutions": {
     "jpeg-js": "^0.4.4",
     "node-fetch": "^2.6.7",
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.5.0",
+    "onnxruntime-common": "1.16.1",
+    "onnxruntime-react-native": "1.16.1"
   }
 }

patches/onnxruntime-react-native+1.14.0.patch → patches/onnxruntime-react-native+1.16.1.patch

@@ -1,17 +1,3 @@
-diff --git a/node_modules/onnxruntime-react-native/android/build.gradle b/node_modules/onnxruntime-react-native/android/build.gradle
-index 4c8a318..65b58c1 100644
---- a/node_modules/onnxruntime-react-native/android/build.gradle
-+++ b/node_modules/onnxruntime-react-native/android/build.gradle
-@@ -135,5 +135,8 @@ dependencies {
-
-   // Mobile build:
-   // implementation "com.microsoft.onnxruntime:onnxruntime-mobile:latest.integration@aar"
--  implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar"
-+  // implementation "com.microsoft.onnxruntime:onnxruntime-android:latest.integration@aar"
-+  // Use local AAR file
-+	implementation project(":onnxruntime-patched")
-+
- }
 diff --git a/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java b/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java
 index 500141a..49b3abd 100644
 --- a/node_modules/onnxruntime-react-native/android/src/main/java/ai/onnxruntime/reactnative/TensorHelper.java

yarn.lock

@@ -1211,14 +1211,14 @@
   resolved "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz"
   integrity sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==
 
-"@expo/config-plugins@^4.1.5":
-  version "4.1.5"
-  resolved "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.5.tgz"
-  integrity sha512-RVvU40RtZt12HavuDAe+LDIq9lHj7sheOfMEHdmpJ/uTA8pgvkbc56XF6JHQD+yRr6+uhhb+JnAasGq49dsQbw==
-  dependencies:
-    "@expo/config-types" "^45.0.0"
-    "@expo/json-file" "8.2.36"
-    "@expo/plist" "0.0.18"
+"@expo/config-plugins@^7.2.4":
+  version "7.2.5"
+  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-7.2.5.tgz#b15f22878975fdc4ddcfa8cdc971937ddc4c0249"
+  integrity sha512-w+5ccu1IxBHgyQk9CPFKLZOk8yZQEyTjbJwOzESK1eR7QwosbcsLkN1c1WWUZYiCXwORu3UTwJYll4+X2xxJhQ==
+  dependencies:
+    "@expo/config-types" "^49.0.0-alpha.1"
+    "@expo/json-file" "~8.2.37"
+    "@expo/plist" "^0.0.20"
     "@expo/sdk-runtime-versions" "^1.0.0"
     "@react-native/normalize-color" "^2.0.0"
     chalk "^4.1.2"
@@ -1227,31 +1227,31 @@
     getenv "^1.0.0"
     glob "7.1.6"
     resolve-from "^5.0.0"
-    semver "^7.3.5"
+    semver "^7.5.3"
     slash "^3.0.0"
     xcode "^3.0.1"
-    xml2js "0.4.23"
+    xml2js "0.6.0"
 
-"@expo/config-types@^45.0.0":
-  version "45.0.0"
-  resolved "https://registry.npmjs.org/@expo/config-types/-/config-types-45.0.0.tgz"
-  integrity sha512-/QGhhLWyaGautgEyU50UJr5YqKJix5t77ePTwreOVAhmZH+ff3nrrtYTTnccx+qF08ZNQmfAyYMCD3rQfzpiJA==
+"@expo/config-types@^49.0.0-alpha.1":
+  version "49.0.0"
+  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-49.0.0.tgz#15ffef715285c06703f6fb7ec0cda853f645cc09"
+  integrity sha512-8eyREVi+K2acnMBe/rTIu1dOfyR2+AMnTLHlut+YpMV9OZPdeKV0Bs9BxAewGqBA2slslbQ9N39IS2CuTKpXkA==
 
-"@expo/[email protected].36":
-  version "8.2.36"
-  resolved "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.36.tgz"
-  integrity sha512-tOZfTiIFA5KmMpdW9KF7bc6CFiGjb0xnbieJhTGlHrLL+ps2G0OkqmuZ3pFEXBOMnJYUVpnSy++52LFxvpa5ZQ==
+"@expo/json-file@~8.2.37":
+  version "8.2.37"
+  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.37.tgz#9c02d3b42134907c69cc0a027b18671b69344049"
+  integrity sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==
   dependencies:
     "@babel/code-frame" "~7.10.4"
-    json5 "^1.0.1"
+    json5 "^2.2.2"
     write-file-atomic "^2.3.0"
 
-"@expo/[email protected].18":
-  version "0.0.18"
-  resolved "https://registry.npmjs.org/@expo/plist/-/plist-0.0.18.tgz"
-  integrity sha512-+48gRqUiz65R21CZ/IXa7RNBXgAI/uPSdvJqoN9x1hfL44DNbUoWHgHiEXTx7XelcATpDwNTz6sHLfy0iNqf+w==
+"@expo/plist@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.20.tgz#a6b3124438031c02b762bad5a47b70584d3c0072"
+  integrity sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==
   dependencies:
-    "@xmldom/xmldom" "~0.7.0"
+    "@xmldom/xmldom" "~0.7.7"
     base64-js "^1.2.3"
     xmlbuilder "^14.0.0"
 
@@ -2144,9 +2144,9 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@xenova/transformers@https://github.com/hans00/transformers.js#merge":
-  version "2.6.2"
-  resolved "https://github.com/hans00/transformers.js#d14ec8ee8981b9ec6529d386b05c27b7da743782"
+"@xenova/transformers@https://github.com/hans00/transformers.js.git#merge":
+  version "2.7.0"
+  resolved "https://github.com/hans00/transformers.js.git#2fdf3e68b0cd4d06630632da0242f9adf83ada53"
   dependencies:
     image-decode "^1.2.2"
     image-encode "^1.3.1"
@@ -2164,7 +2164,7 @@
   resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"
   integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
 
-"@xmldom/xmldom@~0.7.0":
+"@xmldom/xmldom@~0.7.7":
   version "0.7.13"
   resolved "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.13.tgz"
   integrity sha512-lm2GW5PkosIzccsaZIz7tp8cPADSIlIHWDFTR1N0SzfinhhYgeIQjFMz4rYzanCScr3DqQLeomUDArp6MWKm+g==
@@ -5427,14 +5427,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.1, json5@^2.2.3:
+json5@^2.1.1, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -6430,10 +6423,10 @@ onnx-proto@^4.0.4:
   dependencies:
     protobufjs "^6.8.8"
 
-onnxruntime-common@~1.14.0:
-  version "1.14.0"
-  resolved "https://registry.npmjs.org/onnxruntime-common/-/onnxruntime-common-1.14.0.tgz"
-  integrity sha512-3LJpegM2iMNRX2wUmtYfeX/ytfOzNwAWKSq1HbRrKc9+uqG/FsEA0bbKZl1btQeZaXhC26l44NWpNUeXPII7Ew==
+onnxruntime-common@1.16.1, onnxruntime-common@~1.14.0, onnxruntime-common@~1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.16.1.tgz#694cd68964d2b0e4e96af8413c34763461f43aae"
+  integrity sha512-dmKye7bL4/aKhF561h+o9yw1hCCcGfYRN1BoycXm+WUjWhAVlGkP6JdBcRk7MQ1qX/ASFk+8Ibl+yVgCTSP0Fg==
 
 [email protected]:
   version "1.14.0"
@@ -6442,14 +6435,14 @@ [email protected]:
   dependencies:
     onnxruntime-common "~1.14.0"
 
-[email protected]:
-  version "1.14.0"
-  resolved "https://registry.npmjs.org/onnxruntime-react-native/-/onnxruntime-react-native-1.14.0.tgz"
-  integrity sha512-hF0ZhJyOnUyV0rPWCAFmzPs/WHbv1msAJmYadRCQp3A4GcCgDHpHnopInskPnUPZU4NnH30lxcw3BhxtXGL17A==
+[email protected], [email protected]:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/onnxruntime-react-native/-/onnxruntime-react-native-1.16.1.tgz#ff3de790241a6b9e94b47fa0d826b68ed13da2b0"
+  integrity sha512-EcCPCr7fdZ41AuxaixMC/lofJ7IFjmqccV3FM6cxn05g2PCmwV5pG/Z5uLW/MGUFqGj8uvePTgRZpLeZJNE8JA==
   dependencies:
-    "@expo/config-plugins" "^4.1.5"
+    "@expo/config-plugins" "^7.2.4"
     buffer "^6.0.3"
-    onnxruntime-common "~1.14.0"
+    onnxruntime-common "~1.16.1"
 
 [email protected]:
   version "1.14.0"
@@ -8560,7 +8553,7 @@ xcode@^3.0.1:
     simple-plist "^1.1.0"
     uuid "^7.0.3"
 
-xml2js@0.4.23, xml2js@^0.5.0:
+xml2js@0.6.0, xml2js@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
   integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==