Skip to content

Commit 711f1c2

Browse files
shoumikhinshoumikhin
authored
Simplify Xcode configs.
Differential Revision: D66150735 Pull Request resolved: #6952
1 parent bafae87 commit 711f1c2

File tree

11 files changed

+165
-231
lines changed

11 files changed

+165
-231
lines changed

‎examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,8 +806,8 @@
806806
isa = XCRemoteSwiftPackageReference;
807807
repositoryURL = "https://github.com/pytorch/executorch";
808808
requirement = {
809+
branch = "swiftpm-0.4.0.20241120";
809810
kind = branch;
810-
branch = "swiftpm-0.4.0.20241114";
811811
};
812812
};
813813
/* End XCRemoteSwiftPackageReference section */

‎examples/demo-apps/apple_ios/LLaMA/LLaMA.xcodeproj/project.pbxproj

Lines changed: 97 additions & 107 deletions
Large diffs are not rendered by default.

‎examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/Debug.xcconfig

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
ET_PLATFORM[sdk=iphonesimulator*] = simulator
2+
ET_PLATFORM[sdk=iphoneos*] = ios
3+
ET_PLATFORM[sdk=macos*] = macos
4+
5+
OTHER_LDFLAGS = $(inherited) \
6+
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-debug.a \
7+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-debug.a \
8+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-debug.a \
9+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-debug.a \
10+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-debug.a \
11+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-debug.a \
12+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-debug.a \
13+
@$(TEMP_DIR)/cmake/linker_flags
14+
15+
// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
16+
// Include headers and libraries from $(TEMP_DIR)/cmake for it.
17+
HEADER_SEARCH_PATHS = $(inherited) \
18+
$(SRCROOT)/../../../../.. \
19+
$(TEMP_DIR)/cmake/include
20+
21+
LIBRARY_SEARCH_PATHS = $(inherited) \
22+
$(TEMP_DIR)/cmake/lib

‎examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMA-Debug.xcconfig

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMA-Release.xcconfig

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMARunner-Debug.xcconfig

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMARunner-Release.xcconfig

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/Release.xcconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
ET_PLATFORM[sdk=iphonesimulator*] = simulator
2+
ET_PLATFORM[sdk=iphoneos*] = ios
3+
ET_PLATFORM[sdk=macos*] = macos
4+
5+
// Link the Debug version of ExecuTorch runtime to keep the logs.
6+
// Switch to Release for better performance if logs are not needed.
7+
OTHER_LDFLAGS = $(inherited) \
8+
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-debug.a \
9+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-release.a \
10+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-release.a \
11+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-release.a \
12+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-release.a \
13+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-release.a \
14+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-release.a \
15+
@$(TEMP_DIR)/cmake/linker_flags
16+
17+
// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
18+
// Include headers and libraries from $(TEMP_DIR)/cmake for it.
19+
HEADER_SEARCH_PATHS = $(inherited) \
20+
$(SRCROOT)/../../../../.. \
21+
$(TEMP_DIR)/cmake/include
22+
23+
LIBRARY_SEARCH_PATHS = $(inherited) \
24+
$(TEMP_DIR)/cmake/lib

‎examples/demo-apps/apple_ios/LLaMA/docs/delegates/xnnpack_README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ While we recommended using the latest prebuilt package pre-configured with the X
127127

128128
Go to Project Navigator, click on LLaMA. `Project --> LLaMA --> Package Dependencies`, and update the package dependencies to any of the available options below:
129129

130-
- Branch --> swiftpm-0.4.0.20241114 (amend to match the latest nightly build)
130+
- Branch --> swiftpm-0.4.0.20241120 (amend to match the latest nightly build)
131131
- Branch --> 0.4.0
132132
- Branch --> 0.3.0
133133

‎extension/benchmark/apple/Benchmark/Frameworks/download_frameworks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# This source code is licensed under the BSD-style license found in the
66
# LICENSE file in the root directory of this source tree.
77

8-
VERSION="0.4.0.20241115"
8+
VERSION="0.4.0.20241120"
99
FRAMEWORKS=(
1010
"backend_coreml"
1111
"backend_mps"

‎extension/benchmark/apple/Benchmark/Tests/Tests.xcconfig

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,22 @@
1-
HEADER_SEARCH_PATHS = $(inherited) \
2-
$(SRCROOT)/../../../../.. \
3-
$(TEMP_DIR)/cmake/include
4-
5-
LIBRARY_SEARCH_PATHS = $(inherited) \
6-
$(TEMP_DIR)/cmake/lib
1+
ET_PLATFORM[sdk=iphonesimulator*] = simulator
2+
ET_PLATFORM[sdk=iphoneos*] = ios
3+
ET_PLATFORM[sdk=macos*] = macos
74

8-
COMMON_LDFLAGS = $(inherited) \
9-
@$(TEMP_DIR)/cmake/linker_flags
5+
OTHER_LDFLAGS = $(inherited) \
6+
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-release.a \
7+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-release.a \
8+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-release.a \
9+
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-release.a \
10+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-release.a \
11+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-release.a \
12+
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-release.a \
13+
@$(TEMP_DIR)/cmake/linker_flags
1014

11-
OTHER_LDFLAGS[sdk=iphonesimulator*] = $(COMMON_LDFLAGS) \
12-
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-simulator-release.a \
13-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-simulator-release.a \
14-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-simulator-release.a \
15-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-simulator-release.a \
16-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-simulator-release.a \
17-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-simulator-release.a \
18-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-simulator-release.a
19-
20-
OTHER_LDFLAGS[sdk=iphoneos*] = $(COMMON_LDFLAGS) \
21-
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-ios-release.a \
22-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-ios-release.a \
23-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-ios-release.a \
24-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-ios-release.a \
25-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-ios-release.a \
26-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-ios-release.a \
27-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-ios-release.a
15+
// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
16+
// Include headers and libraries from $(TEMP_DIR)/cmake for it.
17+
HEADER_SEARCH_PATHS = $(inherited) \
18+
$(SRCROOT)/../../../../.. \
19+
$(TEMP_DIR)/cmake/include
2820

29-
OTHER_LDFLAGS[sdk=macos*] = $(COMMON_LDFLAGS) \
30-
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-macos-release.a \
31-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-macos-release.a \
32-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-macos-release.a \
33-
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-macos-release.a \
34-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-macos-release.a \
35-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-macos-release.a \
36-
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-macos-release.a
21+
LIBRARY_SEARCH_PATHS = $(inherited) \
22+
$(TEMP_DIR)/cmake/lib

0 commit comments

Comments
 (0)