From 111dc231cd1484ba374edb47ffc2d5a57d663794 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 31 Mar 2024 18:09:44 +0000 Subject: [PATCH 1/7] test: build entire stack with clang --- spack-environment/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index b13d8bfd..54deb51c 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -12,7 +12,7 @@ packages: all: require: - - '%gcc' + - '%clang' - any_of: [+ipo, '@:'] - any_of: [build_system=cmake, '@:'] - any_of: [build_type=Release, '@:'] From b92eca8f67c20161ce08301bca3b407c569bf585 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sat, 21 Sep 2024 02:06:11 +0000 Subject: [PATCH 2/7] fix: packages: mpi: require: openmpi --- spack-environment/packages.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 54deb51c..8a42c35a 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -264,6 +264,9 @@ packages: mosquitto: require: - '@2.0.18:' + mpi: + require: + - openmpi nlohmann-json: require: - '@3.11.2:' From 5dfd103bedffe89ab2ca53de7521980e66f10a7f Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 22 Sep 2024 18:51:38 -0500 Subject: [PATCH 3/7] fix: packages: mpi: require: mpich @4.2.1 -fortran --- spack-environment/packages.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 8a42c35a..7880fc09 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -266,7 +266,11 @@ packages: - '@2.0.18:' mpi: require: - - openmpi + - mpich + mpich: + require: + - '@4.2.1' + - -fortran nlohmann-json: require: - '@3.11.2:' From 254e84bbc553564184d1d1c8a3d6f4778bae1b92 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 22 Sep 2024 18:55:14 -0500 Subject: [PATCH 4/7] fix*: rm madx --- spack-environment/xl/spack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml index 2384ec06..128900cc 100644 --- a/spack-environment/xl/spack.yaml +++ b/spack-environment/xl/spack.yaml @@ -54,7 +54,6 @@ spack: - lhapdf - libtool - lzo - - madx - mosquitto - multitime - nano From 6167d61162a021db0c31261284cc1f0d2c989159 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 23 Sep 2024 03:35:40 +0000 Subject: [PATCH 5/7] fix: rm py-scipy --- spack-environment/xl/spack.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml index 128900cc..bb833d21 100644 --- a/spack-environment/xl/spack.yaml +++ b/spack-environment/xl/spack.yaml @@ -102,7 +102,6 @@ spack: - py-pycairo - py-pyyaml - py-rucio-clients - - py-scipy - py-seaborn - py-snakemake-executor-plugin-slurm - py-snakemake-executor-plugin-slurm-jobstep From 0cb7dcdba2caa434ca2777b84a92b59a803dd5c8 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 14 Apr 2025 23:01:30 +0000 Subject: [PATCH 6/7] fix: spack compiler find --mixed-toolchain --- containers/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile index 4546e083..b2b43469 100644 --- a/containers/debian/Dockerfile +++ b/containers/debian/Dockerfile @@ -246,7 +246,7 @@ spack config --scope user add "config:source_cache:/var/cache/spack" spack config --scope user add "config:install_tree:root:/opt/software" spack config --scope user add "config:ccache:true" spack config blame config -spack compiler find --scope site +spack compiler find --scope site --mixed-toolchain spack config blame compilers EOF From a84edb807aee7d85df4e5911412a76ccd3ac55f8 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Sun, 16 Nov 2025 13:15:17 -0600 Subject: [PATCH 7/7] feat: new ci_clang env instead of modifying all --- .gitlab-ci.yml | 1 + spack-environment/ci_clang/spack.yaml | 82 +++++++++++++++++++++++++++ spack-environment/packages.yaml | 2 +- spack-environment/xl/spack.yaml | 2 + 4 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 spack-environment/ci_clang/spack.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d93fe4fc..e63eb135 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -363,6 +363,7 @@ eic: - BUILD_IMAGE: eic_ ENV: - ci + - ci_clang - ci_without_acts - xl BUILD_TYPE: diff --git a/spack-environment/ci_clang/spack.yaml b/spack-environment/ci_clang/spack.yaml new file mode 100644 index 00000000..5e1930e6 --- /dev/null +++ b/spack-environment/ci_clang/spack.yaml @@ -0,0 +1,82 @@ +spack: + include: + - ../concretizer.yaml + - ../packages.yaml + - ../view.yaml + packages: + all: + require: + - '%clang' + - any_of: [+ipo, '@:'] + - any_of: [build_system=cmake, '@:'] + - any_of: [build_type=Release, '@:'] + specs: + - acts + - actsvg + - afterburner + - algorithms + - cmake + - covfie + - dd4hep -ddeve + - edm4eic + - edm4hep + - eicrecon + - eigen + - epic@main # EPIC_VERSION + - fastjet + - fjcontrib + - fmt + - gaudi + - geant4 -opengl + - gfal2 + - gfal2-util + - graphviz + - hepmc3 + - hepmcmerger + - heppdt + - imagemagick + - irt + - iwyu + - jana2 + - juggler + - nopayloadclient + - npsim -geocad + - onnx + - osg-ca-certs + - podio + - prmon + - pythia8 + - py-awkward + - py-bokeh + - py-boost-histogram + - py-dask + - py-dask-histogram + - py-deepdiff + - py-eic-rucio-policy-package + - py-epic-capybara + - py-graphviz + - py-hepunits + - py-hist + - py-histoprint + - py-jinja2 + - py-jinja2-cli + - py-lmfit + - py-lxml + - py-matplotlib + - py-mplhep + - py-htgettoken + - py-numpy + - py-onnx + - py-onnxruntime + - py-pandas + - py-particle + - py-pip + - py-rucio-clients + - py-seaborn + - py-toml + - py-uproot + - py-vector + - root -opengl -webgui + - snakemake + - spdlog + - xrootd diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 7880fc09..fab64a5a 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -12,7 +12,7 @@ packages: all: require: - - '%clang' + - '%gcc' - any_of: [+ipo, '@:'] - any_of: [build_system=cmake, '@:'] - any_of: [build_type=Release, '@:'] diff --git a/spack-environment/xl/spack.yaml b/spack-environment/xl/spack.yaml index bb833d21..2384ec06 100644 --- a/spack-environment/xl/spack.yaml +++ b/spack-environment/xl/spack.yaml @@ -54,6 +54,7 @@ spack: - lhapdf - libtool - lzo + - madx - mosquitto - multitime - nano @@ -102,6 +103,7 @@ spack: - py-pycairo - py-pyyaml - py-rucio-clients + - py-scipy - py-seaborn - py-snakemake-executor-plugin-slurm - py-snakemake-executor-plugin-slurm-jobstep