Skip to content

Commit 289d7cb

Browse files
chore: upgrade Executorch version to 0.5 (#103)
## Description Bump Executorch version to 0.5. ### Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] Documentation update (improves or adds clarity to existing documentation) ### Tested on - [x] iOS - [x] Android --------- Co-authored-by: Norbert Klockiewicz <Nklockiewicz12@gmail.com>
1 parent d7c2094 commit 289d7cb

20 files changed

Lines changed: 32 additions & 23 deletions

File tree

android/src/main/java/com/swmansion/rnexecutorch/models/ocr/utils/RecognizerUtils.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,9 @@ class RecognizerUtils {
335335
cords.x *= originalPaddings["resizeRatio"]!! as Float
336336
cords.y *= originalPaddings["resizeRatio"]!! as Float
337337

338+
cords.x = cords.x.coerceIn(0.0, (image.cols() - 1).toDouble())
339+
cords.y = cords.y.coerceIn(0.0, (image.rows() - 1).toDouble())
340+
338341
points[i] = Point(cords.x, cords.y)
339342
}
340343

ios/ExecutorchLib.xcframework/Info.plist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<key>BinaryPath</key>
99
<string>ExecutorchLib.framework/ExecutorchLib</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64</string>
11+
<string>ios-arm64-simulator</string>
1212
<key>LibraryPath</key>
1313
<string>ExecutorchLib.framework</string>
1414
<key>SupportedArchitectures</key>
@@ -17,12 +17,14 @@
1717
</array>
1818
<key>SupportedPlatform</key>
1919
<string>ios</string>
20+
<key>SupportedPlatformVariant</key>
21+
<string>simulator</string>
2022
</dict>
2123
<dict>
2224
<key>BinaryPath</key>
2325
<string>ExecutorchLib.framework/ExecutorchLib</string>
2426
<key>LibraryIdentifier</key>
25-
<string>ios-arm64-simulator</string>
27+
<string>ios-arm64</string>
2628
<key>LibraryPath</key>
2729
<string>ExecutorchLib.framework</string>
2830
<key>SupportedArchitectures</key>
@@ -31,8 +33,6 @@
3133
</array>
3234
<key>SupportedPlatform</key>
3335
<string>ios</string>
34-
<key>SupportedPlatformVariant</key>
35-
<string>simulator</string>
3636
</dict>
3737
</array>
3838
<key>CFBundlePackageType</key>
-17 MB
Binary file not shown.

third-party/ios/ExecutorchLib/ExecutorchLib.xcodeproj/project.pbxproj

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0E4A7F472D67549100D8DCBA /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E4A7F442D67549100D8DCBA /* Metal.framework */; };
11-
0E4A7F482D67549100D8DCBA /* MetalPerformanceShaders.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E4A7F452D67549100D8DCBA /* MetalPerformanceShaders.framework */; };
12-
0E4A7F492D67549100D8DCBA /* MetalPerformanceShadersGraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E4A7F462D67549100D8DCBA /* MetalPerformanceShadersGraph.framework */; };
1310
5576B4A62CEF76CC005027B7 /* executorch.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5576B49D2CEF76CC005027B7 /* executorch.xcframework */; };
1411
5576B4A72CEF76CC005027B7 /* re2.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5576B49E2CEF76CC005027B7 /* re2.xcframework */; };
1512
5576B4A82CEF76CC005027B7 /* kernels_optimized.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5576B49F2CEF76CC005027B7 /* kernels_optimized.xcframework */; };
@@ -46,13 +43,13 @@
4643
55EA2C572CB90E7D004315B3 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55EA2C562CB90E7D004315B3 /* Accelerate.framework */; };
4744
55EA2C592CB90E80004315B3 /* CoreML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55EA2C582CB90E80004315B3 /* CoreML.framework */; };
4845
55EA2C5B2CB90E85004315B3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 55EA2C5A2CB90E85004315B3 /* libsqlite3.tbd */; };
46+
8CDA5FC02D68AB25005C1B75 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CDA5FBE2D68AB0F005C1B75 /* Metal.framework */; };
47+
8CDA5FC32D68AB25005C1B75 /* MetalPerformanceShaders.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CDA5FC12D68AB25005C1B75 /* MetalPerformanceShaders.framework */; };
48+
8CDA5FC42D68AB25005C1B75 /* MetalPerformanceShadersGraph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8CDA5FC22D68AB25005C1B75 /* MetalPerformanceShadersGraph.framework */; };
4949
A851C4072CF9F1B600424E93 /* Utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A851C4042CF9F1B600424E93 /* Utils.hpp */; };
5050
/* End PBXBuildFile section */
5151

5252
/* Begin PBXFileReference section */
53-
0E4A7F442D67549100D8DCBA /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
54-
0E4A7F452D67549100D8DCBA /* MetalPerformanceShaders.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShaders.framework; path = System/Library/Frameworks/MetalPerformanceShaders.framework; sourceTree = SDKROOT; };
55-
0E4A7F462D67549100D8DCBA /* MetalPerformanceShadersGraph.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShadersGraph.framework; path = System/Library/Frameworks/MetalPerformanceShadersGraph.framework; sourceTree = SDKROOT; };
5653
5576B49D2CEF76CC005027B7 /* executorch.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = executorch.xcframework; path = frameworks/executorch.xcframework; sourceTree = "<group>"; };
5754
5576B49E2CEF76CC005027B7 /* re2.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = re2.xcframework; path = frameworks/re2.xcframework; sourceTree = "<group>"; };
5855
5576B49F2CEF76CC005027B7 /* kernels_optimized.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = kernels_optimized.xcframework; path = frameworks/kernels_optimized.xcframework; sourceTree = "<group>"; };
@@ -90,6 +87,10 @@
9087
55EA2C562CB90E7D004315B3 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
9188
55EA2C582CB90E80004315B3 /* CoreML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreML.framework; path = System/Library/Frameworks/CoreML.framework; sourceTree = SDKROOT; };
9289
55EA2C5A2CB90E85004315B3 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
90+
8CDA5FBE2D68AB0F005C1B75 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
91+
8CDA5FC12D68AB25005C1B75 /* MetalPerformanceShaders.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShaders.framework; path = System/Library/Frameworks/MetalPerformanceShaders.framework; sourceTree = SDKROOT; };
92+
8CDA5FC22D68AB25005C1B75 /* MetalPerformanceShadersGraph.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShadersGraph.framework; path = System/Library/Frameworks/MetalPerformanceShadersGraph.framework; sourceTree = SDKROOT; };
93+
A84198832D02DF29006D4D5E /* InputType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InputType.h; sourceTree = "<group>"; };
9394
A851C4042CF9F1B600424E93 /* Utils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Utils.hpp; sourceTree = "<group>"; };
9495
/* End PBXFileReference section */
9596

@@ -103,12 +104,15 @@
103104
0E4A7F492D67549100D8DCBA /* MetalPerformanceShadersGraph.framework in Frameworks */,
104105
5576B4A62CEF76CC005027B7 /* executorch.xcframework in Frameworks */,
105106
5576B4A72CEF76CC005027B7 /* re2.xcframework in Frameworks */,
107+
8CDA5FC02D68AB25005C1B75 /* Metal.framework in Frameworks */,
108+
8CDA5FC42D68AB25005C1B75 /* MetalPerformanceShadersGraph.framework in Frameworks */,
106109
5576B4A82CEF76CC005027B7 /* kernels_optimized.xcframework in Frameworks */,
107110
5576B4A92CEF76CC005027B7 /* kernels_custom.xcframework in Frameworks */,
108111
5576B4AA2CEF76CC005027B7 /* kernels_quantized.xcframework in Frameworks */,
109112
5576B4AB2CEF76CC005027B7 /* backend_coreml.xcframework in Frameworks */,
110113
5576B4AC2CEF76CC005027B7 /* kernels_portable.xcframework in Frameworks */,
111114
5576B4AD2CEF76CC005027B7 /* backend_mps.xcframework in Frameworks */,
115+
8CDA5FC32D68AB25005C1B75 /* MetalPerformanceShaders.framework in Frameworks */,
112116
5576B4AE2CEF76CC005027B7 /* backend_xnnpack.xcframework in Frameworks */,
113117
55EA2C5B2CB90E85004315B3 /* libsqlite3.tbd in Frameworks */,
114118
55EA2C592CB90E80004315B3 /* CoreML.framework in Frameworks */,
@@ -203,9 +207,9 @@
203207
55EA2C552CB90E7D004315B3 /* Frameworks */ = {
204208
isa = PBXGroup;
205209
children = (
206-
0E4A7F442D67549100D8DCBA /* Metal.framework */,
207-
0E4A7F452D67549100D8DCBA /* MetalPerformanceShaders.framework */,
208-
0E4A7F462D67549100D8DCBA /* MetalPerformanceShadersGraph.framework */,
210+
8CDA5FC12D68AB25005C1B75 /* MetalPerformanceShaders.framework */,
211+
8CDA5FC22D68AB25005C1B75 /* MetalPerformanceShadersGraph.framework */,
212+
8CDA5FBE2D68AB0F005C1B75 /* Metal.framework */,
209213
5576B4A22CEF76CC005027B7 /* backend_coreml.xcframework */,
210214
5576B4A42CEF76CC005027B7 /* backend_mps.xcframework */,
211215
5576B4A52CEF76CC005027B7 /* backend_xnnpack.xcframework */,

third-party/ios/ExecutorchLib/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ xcodebuild archive \
2525
-destination "generic/platform=iOS" \
2626
-archivePath "$ARCHIVE_PATH_IOS" \
2727
SKIP_INSTALL=NO \
28-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
28+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
29+
CODE_SIGNING_ALLOWED=NO
2930

3031
xcodebuild archive \
3132
-project "$PROJECT_NAME.xcodeproj" \
@@ -34,7 +35,8 @@ xcodebuild archive \
3435
-destination "generic/platform=iOS Simulator" \
3536
-archivePath "$ARCHIVE_PATH_SIMULATOR" \
3637
SKIP_INSTALL=NO \
37-
BUILD_LIBRARY_FOR_DISTRIBUTION=YES
38+
BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
39+
CODE_SIGNING_ALLOWED=NO
3840

3941
xcodebuild -create-xcframework \
4042
-framework "$ARCHIVE_PATH_IOS.xcarchive/Products/Library/Frameworks/$FRAMEWORK_NAME" \

third-party/ios/ExecutorchLib/frameworks/backend_xnnpack.xcframework/Info.plist

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@
66
<array>
77
<dict>
88
<key>BinaryPath</key>
9-
<string>libbackend_xnnpack-ios-release.a</string>
9+
<string>libbackend_xnnpack-simulator-release.a</string>
1010
<key>LibraryIdentifier</key>
11-
<string>ios-arm64</string>
11+
<string>ios-arm64-simulator</string>
1212
<key>LibraryPath</key>
13-
<string>libbackend_xnnpack-ios-release.a</string>
13+
<string>libbackend_xnnpack-simulator-release.a</string>
1414
<key>SupportedArchitectures</key>
1515
<array>
1616
<string>arm64</string>
1717
</array>
1818
<key>SupportedPlatform</key>
1919
<string>ios</string>
20+
<key>SupportedPlatformVariant</key>
21+
<string>simulator</string>
2022
</dict>
2123
<dict>
2224
<key>BinaryPath</key>
23-
<string>libbackend_xnnpack-simulator-release.a</string>
25+
<string>libbackend_xnnpack-ios-release.a</string>
2426
<key>LibraryIdentifier</key>
25-
<string>ios-arm64-simulator</string>
27+
<string>ios-arm64</string>
2628
<key>LibraryPath</key>
27-
<string>libbackend_xnnpack-simulator-release.a</string>
29+
<string>libbackend_xnnpack-ios-release.a</string>
2830
<key>SupportedArchitectures</key>
2931
<array>
3032
<string>arm64</string>
3133
</array>
3234
<key>SupportedPlatform</key>
3335
<string>ios</string>
34-
<key>SupportedPlatformVariant</key>
35-
<string>simulator</string>
3636
</dict>
3737
</array>
3838
<key>CFBundlePackageType</key>

0 commit comments

Comments
 (0)