Skip to content

Commit 97d4781

Browse files
Require newer version of llvm-openmp for xgboost and py_torch on macOS (spack#619)
* llvm-openmp: add v19.1.7 and v20.1.8 * Require newer version of llvm-openmp for xgboost and py_torch on macOS Depend on llvm-openmp v19 or newer when building xgboost or torch with OpenMP using AppleClang. * Remove py-torchtext from ml-darwin-aarch64-mps Temporarily disable this package while we debug build errors. This change will allow us to re-enable the rest of the stack.
1 parent 8edea5c commit 97d4781

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

.ci/gitlab/stacks/ml-darwin-aarch64-mps/spack.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ spack:
6262
- py-torchfile
6363
- py-torchgeo
6464
- py-torchmetrics
65-
- py-torchtext
65+
# fp16 mismatch between openblas and py_torch@2.3.0
66+
# - py-torchtext
6667
- py-torchvision
6768
- py-vector-quantize-pytorch
6869

repos/spack_repo/builtin/packages/llvm_openmp/package.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ class LlvmOpenmp(CMakePackage):
2727

2828
license("Apache-2.0")
2929

30+
version("20.1.8", sha256="b21c04ee9cbe56e200c5d83823765a443ee6389bbc3f64154c96e94016e6cee9")
31+
resource_for_ver(
32+
"20.1.8", sha256="3319203cfd1172bbac50f06fa68e318af84dcb5d65353310c0586354069d6634"
33+
)
34+
version("19.1.7", sha256="bd7e6901ab086fd268750363017935fd4a717c153dad3c2aab86cb0140d9e3fe")
35+
resource_for_ver(
36+
"19.1.7", sha256="11c5a28f90053b0c43d0dec3d0ad579347fc277199c005206b963c19aae514e3"
37+
)
3038
version("18.1.0", sha256="ef1cef885d463e4becf5e132a9175a540c6f4487334c0e86274a374ce7d0a092")
3139
resource_for_ver(
3240
"18.1.0", sha256="d367bf77a3707805168b0a7a7657c8571207fcae29c5890312642ee42b76c967"

repos/spack_repo/builtin/packages/py_torch/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
298298
depends_on("magma+cuda", when="+magma+cuda")
299299
depends_on("magma+rocm", when="+magma+rocm")
300300
depends_on("numactl", when="+numa")
301-
depends_on("llvm-openmp", when="+openmp %apple-clang")
301+
depends_on("llvm-openmp@19:", when="+openmp %apple-clang")
302302
depends_on("valgrind", when="+valgrind")
303303
with when("+rocm"):
304304
depends_on("hsa-rocr-dev")

repos/spack_repo/builtin/packages/xgboost/package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Xgboost(CMakePackage, CudaPackage):
5858
depends_on("cuda@:12.4", when="@:2.1")
5959

6060
depends_on("nccl", when="+nccl")
61-
depends_on("llvm-openmp", when="+openmp %apple-clang")
61+
depends_on("llvm-openmp@19:", when="+openmp %apple-clang")
6262
depends_on("hwloc", when="%clang")
6363

6464
# https://github.com/dmlc/xgboost/issues/6972

0 commit comments

Comments
 (0)