Skip to content

Commit 16e7782

Browse files
jchen351jchen351
committed
set herms to false
1 parent ce776be commit 16e7782

File tree

3 files changed

+37
-33
lines changed

3 files changed

+37
-33
lines changed

‎js/react_native/e2e/ios/OnnxruntimeModuleExample.xcodeproj/project.pbxproj‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1111
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1212
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
13-
3D62E7EDD1C6E35A8273D0AE /* Pods_OnnxruntimeModuleExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99282A6C17B49FD1C1B4E793 /* Pods_OnnxruntimeModuleExample.framework */; };
1413
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
14+
863EC78A40302DD5B5E3AD76 /* Pods_OnnxruntimeModuleExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FBB91B17EC27D0D688A14CD /* Pods_OnnxruntimeModuleExample.framework */; };
1515
DB61BA27278684FB0096C971 /* OnnxruntimeModuleExampleUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = DB61BA26278684FB0096C971 /* OnnxruntimeModuleExampleUITests.m */; };
1616
DBA8BA87267293C4008CC55A /* mnist.ort in Resources */ = {isa = PBXBuildFile; fileRef = DBA8BA86267293C4008CC55A /* mnist.ort */; };
1717
DBBF7412263B8C7100487C77 /* MNISTDataHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = DBBF7411263B8C7100487C77 /* MNISTDataHandler.mm */; };
1818
DBBF7414263B8CCB00487C77 /* 3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = DBBF7413263B8CCB00487C77 /* 3.jpg */; };
19+
E315AAD72D31C6100069FA6B /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 008F07F21AC5B25A0029DE68 /* main.jsbundle */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXContainerItemProxy section */
@@ -49,8 +50,8 @@
4950
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = OnnxruntimeModuleExample/Images.xcassets; sourceTree = "<group>"; };
5051
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = OnnxruntimeModuleExample/Info.plist; sourceTree = "<group>"; };
5152
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = OnnxruntimeModuleExample/main.m; sourceTree = "<group>"; };
53+
1FBB91B17EC27D0D688A14CD /* Pods_OnnxruntimeModuleExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OnnxruntimeModuleExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5254
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = OnnxruntimeModuleExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
53-
99282A6C17B49FD1C1B4E793 /* Pods_OnnxruntimeModuleExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OnnxruntimeModuleExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5455
9D58C0FCCF00905433F4ED74 /* Pods-OnnxruntimeModuleExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OnnxruntimeModuleExample.debug.xcconfig"; path = "Target Support Files/Pods-OnnxruntimeModuleExample/Pods-OnnxruntimeModuleExample.debug.xcconfig"; sourceTree = "<group>"; };
5556
B70FCE6DFAB320E9051DA321 /* Pods-OnnxruntimeModuleExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OnnxruntimeModuleExample.release.xcconfig"; path = "Target Support Files/Pods-OnnxruntimeModuleExample/Pods-OnnxruntimeModuleExample.release.xcconfig"; sourceTree = "<group>"; };
5657
DB61BA24278684FB0096C971 /* OnnxruntimeModuleExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OnnxruntimeModuleExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -67,7 +68,7 @@
6768
isa = PBXFrameworksBuildPhase;
6869
buildActionMask = 2147483647;
6970
files = (
70-
3D62E7EDD1C6E35A8273D0AE /* Pods_OnnxruntimeModuleExample.framework in Frameworks */,
71+
863EC78A40302DD5B5E3AD76 /* Pods_OnnxruntimeModuleExample.framework in Frameworks */,
7172
);
7273
runOnlyForDeploymentPostprocessing = 0;
7374
};
@@ -101,7 +102,7 @@
101102
isa = PBXGroup;
102103
children = (
103104
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
104-
99282A6C17B49FD1C1B4E793 /* Pods_OnnxruntimeModuleExample.framework */,
105+
1FBB91B17EC27D0D688A14CD /* Pods_OnnxruntimeModuleExample.framework */,
105106
);
106107
name = Frameworks;
107108
sourceTree = "<group>";
@@ -170,7 +171,7 @@
170171
13B07F8E1A680F5B00A75B9A /* Resources */,
171172
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
172173
DB8FCD9C25C3404B00C72F26 /* Embed Libraries */,
173-
C05B673BA9948099CF43C8FD /* [CP] Embed Pods Frameworks */,
174+
8BCC39118F893614DE3809E3 /* [CP] Embed Pods Frameworks */,
174175
);
175176
buildRules = (
176177
);
@@ -241,6 +242,7 @@
241242
isa = PBXResourcesBuildPhase;
242243
buildActionMask = 2147483647;
243244
files = (
245+
E315AAD72D31C6100069FA6B /* main.jsbundle in Resources */,
244246
DBA8BA87267293C4008CC55A /* mnist.ort in Resources */,
245247
DBBF7414263B8CCB00487C77 /* 3.jpg in Resources */,
246248
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
@@ -272,7 +274,7 @@
272274
shellPath = /bin/sh;
273275
shellScript = "set -e\n\nexport NODE_BINARY=node\nexport PROJECT_ROOT=$PWD/..\nexport ENTRY_FILE=index.tsx\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
274276
};
275-
C05B673BA9948099CF43C8FD /* [CP] Embed Pods Frameworks */ = {
277+
8BCC39118F893614DE3809E3 /* [CP] Embed Pods Frameworks */ = {
276278
isa = PBXShellScriptBuildPhase;
277279
buildActionMask = 2147483647;
278280
files = (
@@ -465,12 +467,9 @@
465467
isa = XCBuildConfiguration;
466468
buildSettings = {
467469
ALWAYS_SEARCH_USER_PATHS = NO;
468-
ARCHS = (
469-
"$(ARCHS_STANDARD)",
470-
x86_64,
471-
);
470+
ARCHS = "$(ARCHS_STANDARD)";
472471
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
473-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
472+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
474473
CLANG_CXX_LIBRARY = "libc++";
475474
CLANG_ENABLE_MODULES = YES;
476475
CLANG_ENABLE_OBJC_ARC = YES;
@@ -497,13 +496,15 @@
497496
COPY_PHASE_STRIP = NO;
498497
ENABLE_STRICT_OBJC_MSGSEND = YES;
499498
ENABLE_TESTABILITY = YES;
499+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
500500
GCC_C_LANGUAGE_STANDARD = gnu99;
501501
GCC_DYNAMIC_NO_PIC = NO;
502502
GCC_NO_COMMON_BLOCKS = YES;
503503
GCC_OPTIMIZATION_LEVEL = 0;
504504
GCC_PREPROCESSOR_DEFINITIONS = (
505505
"DEBUG=1",
506506
"$(inherited)",
507+
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
507508
);
508509
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
509510
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -516,12 +517,18 @@
516517
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
517518
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
518519
LIBRARY_SEARCH_PATHS = (
520+
"$(SDKROOT)/usr/lib/swift",
519521
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
520-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
521522
"\"$(inherited)\"",
522523
);
523524
MTL_ENABLE_DEBUG_INFO = YES;
524525
ONLY_ACTIVE_ARCH = YES;
526+
OTHER_LDFLAGS = (
527+
"$(inherited)",
528+
"-Wl",
529+
"-ld_classic",
530+
);
531+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
525532
SDKROOT = iphoneos;
526533
};
527534
name = Debug;
@@ -530,12 +537,9 @@
530537
isa = XCBuildConfiguration;
531538
buildSettings = {
532539
ALWAYS_SEARCH_USER_PATHS = NO;
533-
ARCHS = (
534-
"$(ARCHS_STANDARD)",
535-
x86_64,
536-
);
540+
ARCHS = "$(ARCHS_STANDARD)";
537541
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
538-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
542+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
539543
CLANG_CXX_LIBRARY = "libc++";
540544
CLANG_ENABLE_MODULES = YES;
541545
CLANG_ENABLE_OBJC_ARC = YES;
@@ -562,8 +566,13 @@
562566
COPY_PHASE_STRIP = YES;
563567
ENABLE_NS_ASSERTIONS = NO;
564568
ENABLE_STRICT_OBJC_MSGSEND = YES;
569+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
565570
GCC_C_LANGUAGE_STANDARD = gnu99;
566571
GCC_NO_COMMON_BLOCKS = YES;
572+
GCC_PREPROCESSOR_DEFINITIONS = (
573+
"$(inherited)",
574+
_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
575+
);
567576
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
568577
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
569578
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -573,11 +582,17 @@
573582
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
574583
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
575584
LIBRARY_SEARCH_PATHS = (
585+
"$(SDKROOT)/usr/lib/swift",
576586
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
577-
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
578587
"\"$(inherited)\"",
579588
);
580589
MTL_ENABLE_DEBUG_INFO = NO;
590+
OTHER_LDFLAGS = (
591+
"$(inherited)",
592+
"-Wl",
593+
"-ld_classic",
594+
);
595+
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
581596
SDKROOT = iphoneos;
582597
VALIDATE_PRODUCT = YES;
583598
};

‎js/react_native/e2e/ios/Podfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@ target 'OnnxruntimeModuleExample' do
2323
# Hermes is now enabled by default. Disable by setting this flag to false.
2424
# Upcoming versions of React Native may rely on get_default_flags(), but
2525
# we make it explicit here to aid in the React Native upgrade process.
26-
# TODO: fingure out while main.jsbundle is generated in
27-
# ios/build/Build/Products/Debug-iphonesimulator/ instead of
28-
# ios/build/Build/Products/Debug-iphonesimulator/OnnxruntimeModuleExample.app
29-
# folder when hermes_enabled is set to false
3026

31-
:hermes_enabled => true,
27+
:hermes_enabled => false,
3228
# :flipper_configuration => FlipperConfiguration.enabled,
3329
:app_path => "#{Pod::Config.instance.installation_root}/.."
3430
)
3531

32+
use_frameworks!
3633

3734
ort_c_local_pod_path = ENV['ORT_C_LOCAL_POD_PATH']
3835
if ort_c_local_pod_path != nil
@@ -50,4 +47,4 @@ target 'OnnxruntimeModuleExample' do
5047
)
5148
__apply_Xcode_12_5_M1_post_install_workaround(installer)
5249
end
53-
end
50+
end

‎js/react_native/ios/OnnxruntimeModule.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,6 @@
381381
isa = XCBuildConfiguration;
382382
buildSettings = {
383383
ALWAYS_SEARCH_USER_PATHS = NO;
384-
ARCHS = (
385-
"$(ARCHS_STANDARD)",
386-
x86_64,
387-
);
388384
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
389385
CLANG_CXX_LIBRARY = "libc++";
390386
CLANG_ENABLE_MODULES = YES;
@@ -437,10 +433,6 @@
437433
isa = XCBuildConfiguration;
438434
buildSettings = {
439435
ALWAYS_SEARCH_USER_PATHS = NO;
440-
ARCHS = (
441-
"$(ARCHS_STANDARD)",
442-
x86_64,
443-
);
444436
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
445437
CLANG_CXX_LIBRARY = "libc++";
446438
CLANG_ENABLE_MODULES = YES;

0 commit comments

Comments
 (0)