python3Packages.warp-lang: unbreak on darwin (#461547)

This commit is contained in:
Aleksana
2025-11-16 03:51:42 +00:00
committed by GitHub
2 changed files with 12 additions and 19 deletions
@@ -2,14 +2,6 @@ diff --git a/warp/build_dll.py b/warp/build_dll.py
index 2218ff13..53786017 100644
--- a/warp/build_dll.py
+++ b/warp/build_dll.py
@@ -408,6 +408,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
includes = cpp_includes + cuda_includes
+ includes += " -isystem @LIBCXX_DEV@/include/c++/v1"
if sys.platform == "darwin":
version = f"--target={arch}-apple-macos11"
@@ -441,6 +442,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
build_cmd = f'{cpp_compiler} {cpp_flags} -c "{cpp_path}" -o "{cpp_out}"'
run_cmd(build_cmd)
@@ -67,7 +67,6 @@ buildPythonPackage {
]
++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
(replaceVars ./darwin-libcxx.patch {
LIBCXX_DEV = llvmPackages.libcxx.dev;
LIBCXX_LIB = llvmPackages.libcxx;
})
@@ -224,22 +223,24 @@ buildPythonPackage {
inherit libmathdx;
# Scripts which provide test packages and implement test logic.
testers.unit-tests = writeShellApplication {
name = "warp-lang-unit-tests";
runtimeInputs = [
testers.unit-tests =
let
# Use the references from args
(python.withPackages (_: [
python' = python.withPackages (_: [
warp-lang
jax
torch
]))
]);
# Disable paddlepaddle interop tests: malloc(): unaligned tcache chunk detected
# (paddlepaddle.override { inherit cudaSupport; })
];
text = ''
python3 -m warp.tests
'';
};
in
writeShellApplication {
name = "warp-lang-unit-tests";
runtimeInputs = [ python' ];
text = ''
${python'}/bin/python3 -m warp.tests
'';
};
# Tests run within the Nix sandbox.
tests =