Skip to content

Add support for x64 - Intel based Mac(s) #7

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

Closed
wants to merge 1 commit into from
Closed

Add support for x64 - Intel based Mac(s) #7

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
5 changes: 3 additions & 2 deletions LlamaBarn.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@
156891A92E2685F900F71BD4 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = arm64;
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "";
Expand All @@ -351,6 +351,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 0.0.0;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = app.llamabarn.LlamaBarn.dev;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
Expand All @@ -362,7 +363,7 @@
156891AA2E2685F900F71BD4 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = arm64;
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "";
Expand Down
33 changes: 33 additions & 0 deletions llama-cpp/combine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import os

required_files = [
"libggml.dylib",
"libggml-base.dylib",
"libggml-blas.dylib",
"libggml-cpu.dylib",
"libggml-rpc.dylib",
"libggml-metal.dylib",
"libllama.dylib",
"libmtmd.dylib",
"llama-server"
]

arm64_llamacpp_dir = input("Enter the path to the arm64 llamacpp bin directory: ")
x86_llamacpp_dir = input("Enter the path to the x86 llamacpp bin directory: ")
output_dir = input("Enter the output directory for the combined files: ")

if not os.path.exists(output_dir):
os.makedirs(output_dir)

# Using lipo to create a universal binary/dylib
for file in required_files:
arm64_file_path = os.path.join(arm64_llamacpp_dir, file)
x86_file_path = os.path.join(x86_llamacpp_dir, file)
output_file_path = os.path.join(output_dir, file)

if os.path.exists(arm64_file_path) and os.path.exists(x86_file_path):
lipo_command = f"lipo -create '{arm64_file_path}' '{x86_file_path}' -output '{output_file_path}'"
os.system(lipo_command)
print(f"Created universal binary: {output_file_path}")
else:
print(f"Missing file for lipo: {file}")