From 5bba76c3a02add6c9284941c1bc94cdbaac99aab Mon Sep 17 00:00:00 2001 From: germann_e Date: Mon, 24 Oct 2022 10:29:57 +0000 Subject: [PATCH] Add pipeline --- env/merlin/hyquas/spack.yaml | 1 + env/merlin/hyquas/sysconfigs/config.yaml | 4 ++++ env/merlin/py-hiqsimulator/spack.yaml | 5 +++++ env/merlin/py-hiqsimulator/sysconfigs/config.yaml | 4 ++++ env/merlin/py-hiqsimulator/sysconfigs/packages.yaml | 10 +++++----- 5 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 env/merlin/hyquas/sysconfigs/config.yaml create mode 100644 env/merlin/py-hiqsimulator/sysconfigs/config.yaml diff --git a/env/merlin/hyquas/spack.yaml b/env/merlin/hyquas/spack.yaml index 7693290..dea8de6 100644 --- a/env/merlin/hyquas/spack.yaml +++ b/env/merlin/hyquas/spack.yaml @@ -2,6 +2,7 @@ spack: concretizer: unify: when_possible include: + - sysconfigs/config.yaml - sysconfigs/compilers.yaml - sysconfigs/packages.yaml repos: diff --git a/env/merlin/hyquas/sysconfigs/config.yaml b/env/merlin/hyquas/sysconfigs/config.yaml new file mode 100644 index 0000000..84981bf --- /dev/null +++ b/env/merlin/hyquas/sysconfigs/config.yaml @@ -0,0 +1,4 @@ +config: + build_stage: + - /scratch/$USER/spack/spack-stages + source_cache: /scratch/$USER/spack/spack-source_cache diff --git a/env/merlin/py-hiqsimulator/spack.yaml b/env/merlin/py-hiqsimulator/spack.yaml index 470d546..f2b610f 100644 --- a/env/merlin/py-hiqsimulator/spack.yaml +++ b/env/merlin/py-hiqsimulator/spack.yaml @@ -1,8 +1,13 @@ spack: + concretizer: + unify: when_possible include: + - sysconfigs/config.yaml - sysconfigs/compilers.yaml - sysconfigs/packages.yaml repos: - . specs: + - openmpi%gcc+cuda fabrics=ucx,xpmem,knem,ofi,cma schedulers=slurm ^ucx@1.13.0 + ^hwloc@2.7.1 ^knem@1.1.4 ^xpmem@2.6.3 ^pmix@4.1.2 - py-hiqsimulator@develop%gcc diff --git a/env/merlin/py-hiqsimulator/sysconfigs/config.yaml b/env/merlin/py-hiqsimulator/sysconfigs/config.yaml new file mode 100644 index 0000000..84981bf --- /dev/null +++ b/env/merlin/py-hiqsimulator/sysconfigs/config.yaml @@ -0,0 +1,4 @@ +config: + build_stage: + - /scratch/$USER/spack/spack-stages + source_cache: /scratch/$USER/spack/spack-source_cache diff --git a/env/merlin/py-hiqsimulator/sysconfigs/packages.yaml b/env/merlin/py-hiqsimulator/sysconfigs/packages.yaml index 02d4f62..8891040 100644 --- a/env/merlin/py-hiqsimulator/sysconfigs/packages.yaml +++ b/env/merlin/py-hiqsimulator/sysconfigs/packages.yaml @@ -225,11 +225,6 @@ packages: externals: - prefix: /usr spec: numactl@2.0.14 - openmpi: - buildable: false - externals: - - prefix: /opt/psi/Compiler/openmpi/4.1.3_slurm/gcc/11.2.0 - spec: openmpi@4.1.4 openssh: buildable: false externals: @@ -265,6 +260,11 @@ packages: externals: - prefix: /usr spec: sed@4.2.2 + slurm: + buildable: false + externals: + - prefix: /usr + spec: slurm@21-08-8-2 sqlite: buildable: false externals: