From 7327d2913a68ce4cf7d8bb07eff79c0f6415602e Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Tue, 8 Aug 2023 03:59:24 -0500
Subject: ML CI: get more packages working on macOS (#39199)

---
 .../stacks/ml-darwin-aarch64-mps/spack.yaml        | 51 ++++++++++++----------
 .../repos/builtin/packages/py-torch/package.py     |  3 ++
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml
index 7f22e232d1..504954df49 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/ml-darwin-aarch64-mps/spack.yaml
@@ -11,36 +11,52 @@ spack:
       require: ~fortran
 
   specs:
+  # Horovod
+  - py-horovod
+
   # Hugging Face
   - py-transformers
 
   # JAX
-  # - py-jax        # bazel codesign
-  # - py-jaxlib     # bazel codesign
+  # Bazel codesign issues
+  # - py-jax
+  # - py-jaxlib
 
   # Keras
+  # Bazel codesign issues
+  # - py-keras
   - py-keras-applications
   - py-keras-preprocessing
   - py-keras2onnx
-  # - py-keras      # bazel codesign
 
   # MXNet
   - mxnet
 
   # PyTorch
   - py-botorch
+  - py-efficientnet-pytorch
   - py-gpytorch
+  - py-kornia
+  - py-lightning
   - py-pytorch-gradual-warmup-lr
+  - py-pytorch-lightning
   - py-segmentation-models-pytorch
   - py-timm
   - py-torch
   - py-torch-cluster
   - py-torch-geometric
+  - py-torch-nvidia-apex
+  - py-torch-scatter
   - py-torch-sparse
+  - py-torch-spline-conv
+  - py-torchaudio
   - py-torchdata
   - py-torchfile
   - py-torchgeo
+  - py-torchmetrics
+  - py-torchtext
   - py-torchvision
+  - py-vector-quantize-pytorch
 
   # scikit-learn
   - py-scikit-learn
@@ -53,32 +69,19 @@ spack:
   - py-tensorboardx
 
   # TensorFlow
-  # - py-tensorflow               # bazel codesign
-  # - py-tensorflow-datasets      # bazel codesign
-  # - py-tensorflow-hub           # bazel codesign
-  # - py-tensorflow-metadata      # bazel codesign
-  # - py-tensorflow-estimator     # bazel codesign
-  # - py-tensorflow-probability   # py-dm-tree due to bazel codesign
+  # Bazel codesign issues
+  # - py-tensorflow
+  # - py-tensorflow-datasets
+  # - py-tensorflow-estimator
+  # - py-tensorflow-hub
+  # - py-tensorflow-metadata
+  # - py-tensorflow-probability
 
   # XGBoost
   - py-xgboost
+  # - r-xgboost
   - xgboost
 
-  # ERRORS
-  # - py-efficientnet-pytorch     # py-torch
-  # - py-horovod                  # py-torch
-  # - py-kornia                   # py-torch
-  # - py-lightning                # py-torch
-  # - py-pytorch-lightning        # py-torch
-  # - py-torch-nvidia-apex        # py-torch
-  # - py-torch-scatter            # py-torch
-  # - py-torch-spline-conv        # py-torch
-  # - py-torchaudio               # py-torchaudio
-  # - py-torchmetrics             # py-torch
-  # - py-torchtext                # py-torchtext
-  # - py-vector-quantize-pytorch  # py-torch
-  # - r-xgboost                   # r
-
   mirrors: { "mirror": "s3://spack-binaries/develop/ml-darwin-aarch64-mps" }
 
   ci:
diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py
index 8052c6380c..6490f286f4 100644
--- a/var/spack/repos/builtin/packages/py-torch/package.py
+++ b/var/spack/repos/builtin/packages/py-torch/package.py
@@ -123,6 +123,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
         msg="TensorPipe must be enabled with +distributed",
     )
 
+    # https://github.com/pytorch/pytorch/issues/100991
+    conflicts("%apple-clang@14:", when="@:1")
+
     conflicts(
         "cuda_arch=none",
         when="+cuda",
-- 
cgit v1.2.3-60-g2f50