From 669c8411c4d9d6ddc2f2dae2af731b4161dcf374 Mon Sep 17 00:00:00 2001
From: "Fabian.Jakub" <fabian@jakub.com>
Date: Mon, 22 May 2023 13:50:54 +0200
Subject: [PATCH] remove subdirs spack/opt/spack from upstream definitions, as
it collides with the naming scheme at DKRZ
---
examples/01_real-from-ideal+psp.sh | 2 +-
examples/01_real-from-ideal.sh | 2 +-
platforms/common/spack_utils.sh | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/examples/01_real-from-ideal+psp.sh b/examples/01_real-from-ideal+psp.sh
index 1d0bc10..b28676b 100755
--- a/examples/01_real-from-ideal+psp.sh
+++ b/examples/01_real-from-ideal+psp.sh
@@ -104,7 +104,7 @@ spack:
user_cache_path: "$SCRATCH/autoicon-spackcache" # spack puts data here when bootstrapping, leave empty to use home folder
user_config_path: "$SCRATCH/autoicon-spackconfig" # spack puts data here when bootstrapping, leave empty to use home folder
disable_local_config: false # if true, spack installs into spack source dir
- upstreams: "/software/opt/focal/x86_64/spack/2023.02"
+ upstreams: "/software/opt/focal/x86_64/spack/2023.02/spack/opt/spack"
icon:
#build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER%+debug+petsc target=x86_64_v2 ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs"
diff --git a/examples/01_real-from-ideal.sh b/examples/01_real-from-ideal.sh
index 07e6121..13b7812 100755
--- a/examples/01_real-from-ideal.sh
+++ b/examples/01_real-from-ideal.sh
@@ -104,7 +104,7 @@ spack:
user_cache_path: "$SCRATCH/autoicon-spackcache" # spack puts data here when bootstrapping, leave empty to use home folder
user_config_path: "$SCRATCH/autoicon-spackconfig" # spack puts data here when bootstrapping, leave empty to use home folder
disable_local_config: false # if true, spack installs into spack source dir
- upstreams: "/software/opt/focal/x86_64/spack/2023.02"
+ upstreams: "/software/opt/focal/x86_64/spack/2023.02/spack/opt/spack"
icon:
#build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER%+debug+petsc target=x86_64_v2 ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs"
diff --git a/platforms/common/spack_utils.sh b/platforms/common/spack_utils.sh
index 6ed36cb..66cec0b 100644
--- a/platforms/common/spack_utils.sh
+++ b/platforms/common/spack_utils.sh
@@ -15,9 +15,7 @@ function _install_spack() {
i=$((i+1))
cat << EOF >> $UPSTREAMS_CONFIG
spack-instance-$i:
- install_tree: $UP/spack/opt/spack
- modules:
- tcl: $UP/spack/share/spack/modules
+ install_tree: $UP
EOF
done
fi
--
GitLab