From 9d3696f5534dcad615c5a3806a7742a0706eb998 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Wed, 30 Apr 2025 12:44:09 -0500 Subject: [PATCH] HEP: add minimal darwin stack --- .../gitlab/cloud_pipelines/.gitlab-ci.yml | 39 +++++++++++++++---- .../stacks/hep-darwin/spack.yaml | 34 ++++++++++++++++ .../stacks/{hep => hep-x86_64_v3}/spack.yaml | 2 +- 3 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 share/spack/gitlab/cloud_pipelines/stacks/hep-darwin/spack.yaml rename share/spack/gitlab/cloud_pipelines/stacks/{hep => hep-x86_64_v3}/spack.yaml (99%) diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 971f1dbf7e4..4cb74863959 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -703,25 +703,48 @@ ml-darwin-aarch64-mps-build: ######################################## # High Energy Physics (HEP) - Linux x86_64 (CPU) ######################################## -.hep: +.hep-x86_64_v3: extends: [ ".linux_x86_64_v3" ] variables: - SPACK_CI_STACK_NAME: hep + SPACK_CI_STACK_NAME: hep-x86_64_v3 -hep-generate: - extends: [ ".hep", ".generate-x86_64"] +hep-x86_64_v3-generate: + extends: [ ".hep-x86_64_v3", ".generate-x86_64"] image: ghcr.io/spack/spack/ubuntu22.04-runner-amd64-gcc-11.4:2024.03.01 -hep-build: - extends: [ ".hep", ".build" ] +hep-x86_64_v3-build: + extends: [ ".hep-x86_64_v3", ".build" ] trigger: include: - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml - job: hep-generate + job: hep-x86_64_v3-generate strategy: depend needs: - artifacts: True - job: hep-generate + job: hep-x86_64_v3-generate + +######################################## +# High Energy Physics (HEP) - Linux x86_64 (CPU) +######################################## +.hep-darwin: + extends: [ ".darwin_aarch64" ] + variables: + SPACK_CI_STACK_NAME: hep-darwin + +hep-darwin-generate: + tags: [ "macos-sequoia", "apple-clang-16", "aarch64-macos" ] + extends: [ ".hep-darwin", ".generate-x86_64"] + +hep-darwin-build: + extends: [ ".hep-darwin", ".build" ] + trigger: + include: + - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml + job: hep-darwin-generate + strategy: depend + needs: + - artifacts: True + job: hep-darwin-generate ######################################## # AWS ParallelCluster diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep-darwin/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep-darwin/spack.yaml new file mode 100644 index 00000000000..4d1d790b2ae --- /dev/null +++ b/share/spack/gitlab/cloud_pipelines/stacks/hep-darwin/spack.yaml @@ -0,0 +1,34 @@ +spack: + view: false + + concretizer: + reuse: false + unify: when_possible + static_analysis: true + + packages: + all: + require: + - "%gcc" + - target=aarch64 + providers: + blas: [openblas] + mpi: [mpich] + tbb: [intel-tbb] + variants: +mpi + root: + require: +arrow ~daos +davix +dcache +emacs +examples +fftw +fits +fortran +gdml +graphviz +gsl +http +math +minuit +mlp +mysql +opengl +postgres +pythia8 +python +r +roofit +root7 +rpath ~shadow +spectrum +sqlite +ssl +tbb +threads +tmva +tmva-cpu +unuran +vc +vdt +veccore +webgui +x +xml +xrootd # cxxstd=20 + # note: root cxxstd=20 not concretizable within sherpa + + specs: + # CPU + - root ~cuda + + ci: + pipeline-gen: + - build-job: + variables: + CI_GPG_KEY_ROOT: /etc/protected-runner + + cdash: + build-group: HEP darwin diff --git a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/hep-x86_64_v3/spack.yaml similarity index 99% rename from share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml rename to share/spack/gitlab/cloud_pipelines/stacks/hep-x86_64_v3/spack.yaml index ffd722564cf..5cd18579a48 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/hep/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/hep-x86_64_v3/spack.yaml @@ -143,4 +143,4 @@ spack: image: ghcr.io/spack/spack/ubuntu22.04-runner-amd64-gcc-11.4:2024.03.01 cdash: - build-group: HEP + build-group: HEP x86_64_v3