at master 2.3 kB view raw
1diff --git a/build_llvm.py b/build_llvm.py 2index aee0a9f1..bf281f6d 100644 3--- a/build_llvm.py 4+++ b/build_llvm.py 5@@ -402,16 +402,4 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None: 6 7 def build_warp_clang(args, lib_name: str) -> None: 8 """Build the CPU-only Warp library using Clang/LLVM.""" 9- 10- if sys.platform == "darwin": 11- # create a universal binary by combining x86-64 and AArch64 builds 12- build_warp_clang_for_arch(args, lib_name + "-x86_64", "x86_64") 13- build_warp_clang_for_arch(args, lib_name + "-aarch64", "aarch64") 14- 15- dylib_path = os.path.join(build_path, f"bin/{lib_name}") 16- run_cmd(f"lipo -create -output {dylib_path} {dylib_path}-x86_64 {dylib_path}-aarch64") 17- os.remove(f"{dylib_path}-x86_64") 18- os.remove(f"{dylib_path}-aarch64") 19- 20- else: 21- build_warp_clang_for_arch(args, lib_name, machine_architecture()) 22+ build_warp_clang_for_arch(args, lib_name, machine_architecture()) 23diff --git a/warp/build_dll.py b/warp/build_dll.py 24index 2218ff13..c0d978ce 100644 25--- a/warp/build_dll.py 26+++ b/warp/build_dll.py 27@@ -410,7 +410,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ 28 includes = cpp_includes + cuda_includes 29 30 if sys.platform == "darwin": 31- version = f"--target={arch}-apple-macos11" 32+ version = "" 33 else: 34 if cpp_compiler == "g++": 35 version = "-fabi-version=13" # GCC 8.2+ 36@@ -491,14 +491,4 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ 37 38 39 def build_dll(args, dll_path, cpp_paths, cu_path, libs=None): 40- if sys.platform == "darwin": 41- # create a universal binary by combining x86-64 and AArch64 builds 42- build_dll_for_arch(args, dll_path + "-x86_64", cpp_paths, cu_path, "x86_64", libs) 43- build_dll_for_arch(args, dll_path + "-aarch64", cpp_paths, cu_path, "aarch64", libs) 44- 45- run_cmd(f"lipo -create -output {dll_path} {dll_path}-x86_64 {dll_path}-aarch64") 46- os.remove(f"{dll_path}-x86_64") 47- os.remove(f"{dll_path}-aarch64") 48- 49- else: 50- build_dll_for_arch(args, dll_path, cpp_paths, cu_path, machine_architecture(), libs) 51+ build_dll_for_arch(args, dll_path, cpp_paths, cu_path, machine_architecture(), libs)