Skip to content

Commit d9d1a84

Browse files
vrasparvraspar
committed
Update onnxruntime and onnxruntime Gen AI dependecy build process
1 parent b3785a7 commit d9d1a84

17 files changed

+14985
-226
lines changed

‎mobile/examples/phi-3/ios/LocalLLM/LocalLLM.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
10-
5156483D2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5156483C2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib */; };
11-
5156483E2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 5156483C2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1210
51D4C8D62BFD22D70029FCEA /* LocalLLMApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D4C8D52BFD22D70029FCEA /* LocalLLMApp.swift */; };
1311
51D4C8D82BFD22D70029FCEA /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D4C8D72BFD22D70029FCEA /* ContentView.swift */; };
1412
51D4C8DA2BFD22DB0029FCEA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 51D4C8D92BFD22DB0029FCEA /* Assets.xcassets */; };
1513
51D4C8DD2BFD22DB0029FCEA /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 51D4C8DC2BFD22DB0029FCEA /* Preview Assets.xcassets */; };
16-
51D4C9072BFD26150029FCEA /* libonnxruntime-genai.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 51D4C9052BFD26150029FCEA /* libonnxruntime-genai.dylib */; };
17-
51D4C9082BFD26EB0029FCEA /* libonnxruntime-genai.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 51D4C9052BFD26150029FCEA /* libonnxruntime-genai.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1814
51D4C90E2BFD28DD0029FCEA /* GenAIGenerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D4C90D2BFD28DD0029FCEA /* GenAIGenerator.mm */; };
1915
51D4C9232BFD507A0029FCEA /* SharedTokenUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D4C9222BFD50790029FCEA /* SharedTokenUpdater.swift */; };
16+
8A4D13D82CE2B1AE002BD11A /* libonnxruntime-genai.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 51D4C9052BFD26150029FCEA /* libonnxruntime-genai.dylib */; };
17+
8A4D13DF2CE2B1BA002BD11A /* libonnxruntime-genai.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 51D4C9052BFD26150029FCEA /* libonnxruntime-genai.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
18+
8A53DB0C2DAF08B3001D41D1 /* onnxruntime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A53DB0B2DAF08B3001D41D1 /* onnxruntime.framework */; };
19+
8A53DB0D2DAF08D0001D41D1 /* onnxruntime.framework in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 8A53DB0B2DAF08B3001D41D1 /* onnxruntime.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXCopyFilesBuildPhase section */
@@ -26,8 +26,8 @@
2626
dstPath = "";
2727
dstSubfolderSpec = 10;
2828
files = (
29-
5156483E2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib in Embed Libraries */,
30-
51D4C9082BFD26EB0029FCEA /* libonnxruntime-genai.dylib in Embed Libraries */,
29+
8A53DB0D2DAF08D0001D41D1 /* onnxruntime.framework in Embed Libraries */,
30+
8A4D13DF2CE2B1BA002BD11A /* libonnxruntime-genai.dylib in Embed Libraries */,
3131
);
3232
name = "Embed Libraries";
3333
runOnlyForDeploymentPostprocessing = 0;
@@ -44,7 +44,6 @@
4444
/* End PBXCopyFilesBuildPhase section */
4545

4646
/* Begin PBXFileReference section */
47-
5156483C2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libonnxruntime.1.19.0.dylib; path = LocalLLM/lib/libonnxruntime.1.19.0.dylib; sourceTree = "<group>"; };
4847
51D4C8D22BFD22D70029FCEA /* LocalLLM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LocalLLM.app; sourceTree = BUILT_PRODUCTS_DIR; };
4948
51D4C8D52BFD22D70029FCEA /* LocalLLMApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalLLMApp.swift; sourceTree = "<group>"; };
5049
51D4C8D72BFD22D70029FCEA /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -57,25 +56,38 @@
5756
51D4C90B2BFD28BF0029FCEA /* GenAIGenerator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GenAIGenerator.h; sourceTree = "<group>"; };
5857
51D4C90C2BFD28DD0029FCEA /* LocalLLM-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "LocalLLM-Bridging-Header.h"; sourceTree = "<group>"; };
5958
51D4C90D2BFD28DD0029FCEA /* GenAIGenerator.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GenAIGenerator.mm; sourceTree = "<group>"; };
60-
51D4C9102BFD483E0029FCEA /* tokenizer.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = tokenizer.json; path = ../GenAIApp/tokenizer.json; sourceTree = "<group>"; };
61-
51D4C9112BFD483E0029FCEA /* phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; name = "phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx"; path = "../GenAIApp/phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx"; sourceTree = "<group>"; };
62-
51D4C9122BFD483E0029FCEA /* special_tokens_map.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = special_tokens_map.json; path = ../GenAIApp/special_tokens_map.json; sourceTree = "<group>"; };
63-
51D4C9132BFD483E0029FCEA /* phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx.data */ = {isa = PBXFileReference; lastKnownFileType = file; name = "phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx.data"; path = "../GenAIApp/phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx.data"; sourceTree = "<group>"; };
64-
51D4C9142BFD483E0029FCEA /* tokenizer_config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = tokenizer_config.json; path = ../GenAIApp/tokenizer_config.json; sourceTree = "<group>"; };
65-
51D4C91A2BFD48490029FCEA /* config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = config.json; path = ../GenAIApp/config.json; sourceTree = "<group>"; };
66-
51D4C91B2BFD48490029FCEA /* added_tokens.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = added_tokens.json; path = ../GenAIApp/added_tokens.json; sourceTree = "<group>"; };
67-
51D4C91C2BFD48490029FCEA /* configuration_phi3.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; name = configuration_phi3.py; path = ../GenAIApp/configuration_phi3.py; sourceTree = "<group>"; };
68-
51D4C91D2BFD48490029FCEA /* genai_config.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = genai_config.json; path = ../GenAIApp/genai_config.json; sourceTree = "<group>"; };
6959
51D4C9222BFD50790029FCEA /* SharedTokenUpdater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedTokenUpdater.swift; sourceTree = "<group>"; };
60+
8A53DB0B2DAF08B3001D41D1 /* onnxruntime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = onnxruntime.framework; sourceTree = "<group>"; };
61+
8A869B212CDAD08600AE0604 /* LocalLLM.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LocalLLM.entitlements; sourceTree = "<group>"; };
62+
8ABA12972CC1D15C006B3DDF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
7063
/* End PBXFileReference section */
7164

65+
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
66+
8AC409CD2DADE0EC00388525 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
67+
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
68+
membershipExceptions = (
69+
"LLama-3.2-1B-int4-acc_4-gqa-webgpu-fp16/genai_config.json",
70+
"LLama-3.2-1B-int4-acc_4-gqa-webgpu-fp16/model.onnx",
71+
"LLama-3.2-1B-int4-acc_4-gqa-webgpu-fp16/model.onnx.data",
72+
"LLama-3.2-1B-int4-acc_4-gqa-webgpu-fp16/special_tokens_map.json",
73+
"LLama-3.2-1B-int4-acc_4-gqa-webgpu-fp16/tokenizer_config.json",
74+
"LLama-3.2-1B-int4-acc_4-gqa-webgpu-fp16/tokenizer.json",
75+
);
76+
target = 51D4C8D12BFD22D70029FCEA /* LocalLLM */;
77+
};
78+
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
79+
80+
/* Begin PBXFileSystemSynchronizedRootGroup section */
81+
8ABA12A22CC300ED006B3DDF /* model */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (8AC409CD2DADE0EC00388525 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = model; sourceTree = "<group>"; };
82+
/* End PBXFileSystemSynchronizedRootGroup section */
83+
7284
/* Begin PBXFrameworksBuildPhase section */
7385
51D4C8CF2BFD22D70029FCEA /* Frameworks */ = {
7486
isa = PBXFrameworksBuildPhase;
7587
buildActionMask = 2147483647;
7688
files = (
77-
5156483D2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib in Frameworks */,
78-
51D4C9072BFD26150029FCEA /* libonnxruntime-genai.dylib in Frameworks */,
89+
8A53DB0C2DAF08B3001D41D1 /* onnxruntime.framework in Frameworks */,
90+
8A4D13D82CE2B1AE002BD11A /* libonnxruntime-genai.dylib in Frameworks */,
7991
);
8092
runOnlyForDeploymentPostprocessing = 0;
8193
};
@@ -85,23 +97,14 @@
8597
5156483B2BFDBB6E005CA50C /* Frameworks */ = {
8698
isa = PBXGroup;
8799
children = (
88-
5156483C2BFDBB6F005CA50C /* libonnxruntime.1.19.0.dylib */,
89100
);
90101
name = Frameworks;
91102
sourceTree = "<group>";
92103
};
93104
51D4C8C92BFD22D70029FCEA = {
94105
isa = PBXGroup;
95106
children = (
96-
51D4C91B2BFD48490029FCEA /* added_tokens.json */,
97-
51D4C91A2BFD48490029FCEA /* config.json */,
98-
51D4C91C2BFD48490029FCEA /* configuration_phi3.py */,
99-
51D4C91D2BFD48490029FCEA /* genai_config.json */,
100-
51D4C9112BFD483E0029FCEA /* phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx */,
101-
51D4C9132BFD483E0029FCEA /* phi3-mini-4k-instruct-cpu-int4-rtn-block-32-acc-level-4.onnx.data */,
102-
51D4C9122BFD483E0029FCEA /* special_tokens_map.json */,
103-
51D4C9142BFD483E0029FCEA /* tokenizer_config.json */,
104-
51D4C9102BFD483E0029FCEA /* tokenizer.json */,
107+
8ABA12A22CC300ED006B3DDF /* model */,
105108
51D4C8D42BFD22D70029FCEA /* LocalLLM */,
106109
51D4C8D32BFD22D70029FCEA /* Products */,
107110
5156483B2BFDBB6E005CA50C /* Frameworks */,
@@ -119,6 +122,8 @@
119122
51D4C8D42BFD22D70029FCEA /* LocalLLM */ = {
120123
isa = PBXGroup;
121124
children = (
125+
8A869B212CDAD08600AE0604 /* LocalLLM.entitlements */,
126+
8ABA12972CC1D15C006B3DDF /* Info.plist */,
122127
51D4C9032BFD25BA0029FCEA /* lib */,
123128
51D4C8FF2BFD25890029FCEA /* header */,
124129
51D4C8D52BFD22D70029FCEA /* LocalLLMApp.swift */,
@@ -154,6 +159,7 @@
154159
51D4C9032BFD25BA0029FCEA /* lib */ = {
155160
isa = PBXGroup;
156161
children = (
162+
8A53DB0B2DAF08B3001D41D1 /* onnxruntime.framework */,
157163
51D4C9052BFD26150029FCEA /* libonnxruntime-genai.dylib */,
158164
);
159165
path = lib;
@@ -189,7 +195,7 @@
189195
attributes = {
190196
BuildIndependentTargetsInParallel = 1;
191197
LastSwiftUpdateCheck = 1520;
192-
LastUpgradeCheck = 1520;
198+
LastUpgradeCheck = 1600;
193199
TargetAttributes = {
194200
51D4C8D12BFD22D70029FCEA = {
195201
CreatedOnToolsVersion = 15.2;
@@ -245,7 +251,6 @@
245251
51D4C8F42BFD22DC0029FCEA /* Debug */ = {
246252
isa = XCBuildConfiguration;
247253
buildSettings = {
248-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
249254
ALWAYS_SEARCH_USER_PATHS = NO;
250255
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
251256
CLANG_ANALYZER_NONNULL = YES;
@@ -277,9 +282,10 @@
277282
CLANG_WARN_UNREACHABLE_CODE = YES;
278283
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
279284
COPY_PHASE_STRIP = NO;
280-
DEBUG_INFORMATION_FORMAT = dwarf;
285+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
281286
DEFINES_MODULE = YES;
282287
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
288+
ENABLE_MODULE_VERIFIER = YES;
283289
ENABLE_STRICT_OBJC_MSGSEND = YES;
284290
ENABLE_TESTABILITY = YES;
285291
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -299,7 +305,9 @@
299305
GCC_WARN_UNUSED_VARIABLE = YES;
300306
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
301307
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
308+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
302309
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
310+
"MTL_ENABLE_DEBUG_INFO[sdk=iphoneos*]" = NO;
303311
MTL_FAST_MATH = YES;
304312
ONLY_ACTIVE_ARCH = YES;
305313
SDKROOT = iphoneos;
@@ -317,7 +325,6 @@
317325
51D4C8F52BFD22DC0029FCEA /* Release */ = {
318326
isa = XCBuildConfiguration;
319327
buildSettings = {
320-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
321328
ALWAYS_SEARCH_USER_PATHS = NO;
322329
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
323330
CLANG_ANALYZER_NONNULL = YES;
@@ -352,6 +359,7 @@
352359
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
353360
DEFINES_MODULE = YES;
354361
EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
362+
ENABLE_MODULE_VERIFIER = YES;
355363
ENABLE_NS_ASSERTIONS = NO;
356364
ENABLE_STRICT_OBJC_MSGSEND = YES;
357365
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -365,6 +373,7 @@
365373
GCC_WARN_UNUSED_VARIABLE = YES;
366374
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
367375
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
376+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20";
368377
MTL_ENABLE_DEBUG_INFO = NO;
369378
MTL_FAST_MATH = YES;
370379
SDKROOT = iphoneos;
@@ -385,12 +394,20 @@
385394
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
386395
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
387396
CLANG_ENABLE_MODULES = YES;
397+
CODE_SIGN_ENTITLEMENTS = LocalLLM/LocalLLM.entitlements;
398+
CODE_SIGN_IDENTITY = "Apple Development";
388399
CODE_SIGN_STYLE = Automatic;
389400
CURRENT_PROJECT_VERSION = 1;
401+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
390402
DEVELOPMENT_ASSET_PATHS = "\"LocalLLM/Preview Content\"";
391-
DEVELOPMENT_TEAM = UBF8T346G9;
403+
DEVELOPMENT_TEAM = AL4J766FY4;
392404
ENABLE_PREVIEWS = YES;
405+
FRAMEWORK_SEARCH_PATHS = (
406+
"$(inherited)",
407+
"$(PROJECT_DIR)/LocalLLM/lib",
408+
);
393409
GENERATE_INFOPLIST_FILE = YES;
410+
INFOPLIST_FILE = LocalLLM/Info.plist;
394411
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
395412
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
396413
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -405,8 +422,10 @@
405422
"$(PROJECT_DIR)/LocalLLM/lib",
406423
);
407424
MARKETING_VERSION = 1.0;
408-
PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.genai.demo.LocalLLM;
425+
"MTL_ENABLE_DEBUG_INFO[sdk=iphoneos*]" = "";
426+
PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.genai.demo.LocalLL;
409427
PRODUCT_NAME = "$(TARGET_NAME)";
428+
PROVISIONING_PROFILE_SPECIFIER = "";
410429
SWIFT_EMIT_LOC_STRINGS = YES;
411430
SWIFT_OBJC_BRIDGING_HEADER = "LocalLLM/LocalLLM-Bridging-Header.h";
412431
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -421,12 +440,20 @@
421440
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
422441
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
423442
CLANG_ENABLE_MODULES = YES;
443+
CODE_SIGN_ENTITLEMENTS = LocalLLM/LocalLLM.entitlements;
444+
CODE_SIGN_IDENTITY = "Apple Development";
424445
CODE_SIGN_STYLE = Automatic;
425446
CURRENT_PROJECT_VERSION = 1;
447+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
426448
DEVELOPMENT_ASSET_PATHS = "\"LocalLLM/Preview Content\"";
427-
DEVELOPMENT_TEAM = UBF8T346G9;
449+
DEVELOPMENT_TEAM = AL4J766FY4;
428450
ENABLE_PREVIEWS = YES;
451+
FRAMEWORK_SEARCH_PATHS = (
452+
"$(inherited)",
453+
"$(PROJECT_DIR)/LocalLLM/lib",
454+
);
429455
GENERATE_INFOPLIST_FILE = YES;
456+
INFOPLIST_FILE = LocalLLM/Info.plist;
430457
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
431458
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
432459
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -441,8 +468,9 @@
441468
"$(PROJECT_DIR)/LocalLLM/lib",
442469
);
443470
MARKETING_VERSION = 1.0;
444-
PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.genai.demo.LocalLLM;
471+
PRODUCT_BUNDLE_IDENTIFIER = ai.onnxruntime.genai.demo.LocalLL;
445472
PRODUCT_NAME = "$(TARGET_NAME)";
473+
PROVISIONING_PROFILE_SPECIFIER = "";
446474
SWIFT_EMIT_LOC_STRINGS = YES;
447475
SWIFT_OBJC_BRIDGING_HEADER = "LocalLLM/LocalLLM-Bridging-Header.h";
448476
SWIFT_VERSION = 5.0;

0 commit comments

Comments
 (0)