Ci reactivate darwin pipelines (#48453)

* ci: darwin stacks: update tags following system updates

* disable SPACK_CI_DISABLE_STACKS; only enable *darwin* stacks for testing

* manually chmod u+w tmp/ before cleanup due to issue#49147

* comment out failing specs for now

* re-enable logic for disabling stacks

* add explanatory comment for darwin after_script additions

* remove more darwin-only targetting

* restore build_stage to default location

* move build-job-remove out of individual darwin stacks into darwin top level config

* keep build_stage in $spack/tmp for now
This commit is contained in:
eugeneswalker 2025-02-26 15:34:22 -08:00 committed by GitHub
parent b914bd6638
commit 677caec3c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 28 additions and 19 deletions

View File

@ -426,7 +426,7 @@ developer-tools-aarch64-linux-gnu-build:
SPACK_CI_STACK_NAME: developer-tools-darwin SPACK_CI_STACK_NAME: developer-tools-darwin
developer-tools-darwin-generate: developer-tools-darwin-generate:
tags: [ "macos-sonoma", "apple-clang-16", "aarch64-macos" ] tags: [ "macos-sequoia", "apple-clang-16", "aarch64-macos" ]
extends: [ ".developer-tools-darwin", ".generate-base"] extends: [ ".developer-tools-darwin", ".generate-base"]
developer-tools-darwin-build: developer-tools-darwin-build:
@ -686,7 +686,7 @@ ml-linux-aarch64-cuda-build:
SPACK_CI_STACK_NAME: ml-darwin-aarch64-mps SPACK_CI_STACK_NAME: ml-darwin-aarch64-mps
ml-darwin-aarch64-mps-generate: ml-darwin-aarch64-mps-generate:
tags: [ "macos-sonoma", "apple-clang-16", "aarch64-macos" ] tags: [ "macos-sequoia", "apple-clang-16", "aarch64-macos" ]
extends: [ ".ml-darwin-aarch64-mps", ".generate-base"] extends: [ ".ml-darwin-aarch64-mps", ".generate-base"]
ml-darwin-aarch64-mps-build: ml-darwin-aarch64-mps-build:
@ -910,7 +910,7 @@ bootstrap-x86_64-linux-gnu-build:
SPACK_CI_STACK_NAME: bootstrap-aarch64-darwin SPACK_CI_STACK_NAME: bootstrap-aarch64-darwin
bootstrap-aarch64-darwin-generate: bootstrap-aarch64-darwin-generate:
tags: [ "macos-sonoma", "apple-clang-16", "aarch64-macos" ] tags: [ "macos-sequoia", "apple-clang-16", "aarch64-macos" ]
extends: [.bootstrap-aarch64-darwin, .generate-base] extends: [.bootstrap-aarch64-darwin, .generate-base]
bootstrap-aarch64-darwin-build: bootstrap-aarch64-darwin-build:

View File

@ -1,3 +1,5 @@
config: config:
build_stage:
- $spack/tmp/stage
install_tree: install_tree:
root: $spack/opt/spack root: $spack/opt/spack

View File

@ -1,6 +1,19 @@
ci: ci:
broken-tests-packages:
- mpich
- openmpi
pipeline-gen: pipeline-gen:
- build-job-remove:
tags: [spack]
- build-job: - build-job:
tags: [ "macos-sonoma", "apple-clang-16", "aarch64-macos" ] tags: [ "macos-sequoia", "apple-clang-16", "aarch64-macos" ]
# after_script intended to ensure all stage files are properly cleaned up,
# including those that may have been created as read-only by `go mod`
# as part of installation of a golang package
# see: https://github.com/spack/spack/issues/49147
after_script-:
- - if [[ -d tmp ]] ; then chmod -R u+w tmp ; else echo tmp not found ; fi
- ./bin/spack clean -a
- build-job-remove: - build-job-remove:
image:: macos-run-on-metal image:: macos-run-on-metal

View File

@ -25,8 +25,6 @@ spack:
ci: ci:
pipeline-gen: pipeline-gen:
- build-job-remove:
tags: [spack, public]
- build-job: - build-job:
variables: variables:
CI_GPG_KEY_ROOT: /etc/protected-runner CI_GPG_KEY_ROOT: /etc/protected-runner

View File

@ -9,7 +9,7 @@ spack:
reuse: false reuse: false
specs: specs:
# editors # editors
- neovim~no_luajit #- neovim~no_luajit # build fails: https://github.com/spack/spack/pull/48453#issuecomment-2624788262
- py-pynvim - py-pynvim
- emacs+json~native+treesitter # TODO native not supported until gcc builds on darwin - emacs+json~native+treesitter # TODO native not supported until gcc builds on darwin
# - tree-sitter is a dep, should also have cli but no package # - tree-sitter is a dep, should also have cli but no package
@ -64,8 +64,6 @@ spack:
ci: ci:
pipeline-gen: pipeline-gen:
- build-job-remove:
tags: [ spack, public ]
- build-job: - build-job:
variables: variables:
CI_GPG_KEY_ROOT: /etc/protected-runner CI_GPG_KEY_ROOT: /etc/protected-runner

View File

@ -9,13 +9,13 @@ spack:
- ~cuda - ~cuda
- ~rocm - ~rocm
mpi: mpi:
require: openmpi require: mpich
openblas: openblas:
require: ~fortran require: ~fortran
specs: specs:
# Horovod # Horovod
- py-horovod # - py-horovod # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
# Hugging Face # Hugging Face
- py-transformers - py-transformers
@ -45,18 +45,18 @@ spack:
- py-segmentation-models-pytorch - py-segmentation-models-pytorch
- py-timm - py-timm
- py-torch - py-torch
- py-torch-cluster # - py-torch-cluster # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
- py-torch-geometric - py-torch-geometric
- py-torch-nvidia-apex # - py-torch-nvidia-apex # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
- py-torch-scatter # - py-torch-scatter # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
- py-torch-sparse # - py-torch-sparse # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
- py-torch-spline-conv # - py-torch-spline-conv # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
- py-torchaudio - py-torchaudio
- py-torchdata - py-torchdata
- py-torchfile - py-torchfile
- py-torchgeo - py-torchgeo
- py-torchmetrics - py-torchmetrics
- py-torchtext # - py-torchtext # https://github.com/spack/spack/pull/48453#issuecomment-2676023970
- py-torchvision - py-torchvision
- py-vector-quantize-pytorch - py-vector-quantize-pytorch
@ -84,8 +84,6 @@ spack:
ci: ci:
pipeline-gen: pipeline-gen:
- build-job-remove:
tags: [ spack, public ]
- build-job: - build-job:
variables: variables:
CI_GPG_KEY_ROOT: /etc/protected-runner CI_GPG_KEY_ROOT: /etc/protected-runner