Skip to content

Simplify Xcode configs. #6952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Simplify Xcode configs. #6952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/demo-apps/apple_ios/ExecuTorchDemo/ExecuTorchDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pytorch/executorch";
requirement = {
branch = "swiftpm-0.4.0.20241120";
kind = branch;
branch = "swiftpm-0.4.0.20241114";
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
204 changes: 97 additions & 107 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/Debug.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ET_PLATFORM[sdk=iphonesimulator*] = simulator
ET_PLATFORM[sdk=iphoneos*] = ios
ET_PLATFORM[sdk=macos*] = macos

OTHER_LDFLAGS = $(inherited) \
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-debug.a \
@$(TEMP_DIR)/cmake/linker_flags

// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
// Include headers and libraries from $(TEMP_DIR)/cmake for it.
HEADER_SEARCH_PATHS = $(inherited) \
$(SRCROOT)/../../../../.. \
$(TEMP_DIR)/cmake/include

LIBRARY_SEARCH_PATHS = $(inherited) \
$(TEMP_DIR)/cmake/lib
26 changes: 0 additions & 26 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMA-Debug.xcconfig
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMA-Release.xcconfig
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMARunner-Debug.xcconfig
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/LLaMARunner-Release.xcconfig
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions examples/demo-apps/apple_ios/LLaMA/LLaMA/SupportingFiles/Release.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
ET_PLATFORM[sdk=iphonesimulator*] = simulator
ET_PLATFORM[sdk=iphoneos*] = ios
ET_PLATFORM[sdk=macos*] = macos

// Link the Debug version of ExecuTorch runtime to keep the logs.
// Switch to Release for better performance if logs are not needed.
OTHER_LDFLAGS = $(inherited) \
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-debug.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-release.a \
@$(TEMP_DIR)/cmake/linker_flags

// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
// Include headers and libraries from $(TEMP_DIR)/cmake for it.
HEADER_SEARCH_PATHS = $(inherited) \
$(SRCROOT)/../../../../.. \
$(TEMP_DIR)/cmake/include

LIBRARY_SEARCH_PATHS = $(inherited) \
$(TEMP_DIR)/cmake/lib
2 changes: 1 addition & 1 deletion examples/demo-apps/apple_ios/LLaMA/docs/delegates/xnnpack_README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ While we recommended using the latest prebuilt package pre-configured with the X

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

- Branch --> swiftpm-0.4.0.20241114 (amend to match the latest nightly build)
- Branch --> swiftpm-0.4.0.20241120 (amend to match the latest nightly build)
- Branch --> 0.4.0
- Branch --> 0.3.0

Expand Down
2 changes: 1 addition & 1 deletion extension/benchmark/apple/Benchmark/Frameworks/download_frameworks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

VERSION="0.4.0.20241115"
VERSION="0.4.0.20241120"
FRAMEWORKS=(
"backend_coreml"
"backend_mps"
Expand Down
52 changes: 19 additions & 33 deletions extension/benchmark/apple/Benchmark/Tests/Tests.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,22 @@
HEADER_SEARCH_PATHS = $(inherited) \
$(SRCROOT)/../../../../.. \
$(TEMP_DIR)/cmake/include

LIBRARY_SEARCH_PATHS = $(inherited) \
$(TEMP_DIR)/cmake/lib
ET_PLATFORM[sdk=iphonesimulator*] = simulator
ET_PLATFORM[sdk=iphoneos*] = ios
ET_PLATFORM[sdk=macos*] = macos

COMMON_LDFLAGS = $(inherited) \
@$(TEMP_DIR)/cmake/linker_flags
OTHER_LDFLAGS = $(inherited) \
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-$(ET_PLATFORM)-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-$(ET_PLATFORM)-release.a \
@$(TEMP_DIR)/cmake/linker_flags

OTHER_LDFLAGS[sdk=iphonesimulator*] = $(COMMON_LDFLAGS) \
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-simulator-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-simulator-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-simulator-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-simulator-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-simulator-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-simulator-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-simulator-release.a

OTHER_LDFLAGS[sdk=iphoneos*] = $(COMMON_LDFLAGS) \
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-ios-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-ios-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-ios-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-ios-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-ios-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-ios-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-ios-release.a
// LLaMARunner requires additional dependencies built with CMake in a custom run script phase.
// Include headers and libraries from $(TEMP_DIR)/cmake for it.
HEADER_SEARCH_PATHS = $(inherited) \
$(SRCROOT)/../../../../.. \
$(TEMP_DIR)/cmake/include

OTHER_LDFLAGS[sdk=macos*] = $(COMMON_LDFLAGS) \
-force_load $(BUILT_PRODUCTS_DIR)/libexecutorch-macos-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_coreml-macos-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_mps-macos-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libbackend_xnnpack-macos-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_custom-macos-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_optimized-macos-release.a \
-force_load $(BUILT_PRODUCTS_DIR)/libkernels_quantized-macos-release.a
LIBRARY_SEARCH_PATHS = $(inherited) \
$(TEMP_DIR)/cmake/lib
Loading