From e03ce2fd9c69a7f5b6be60d8ce039d587e71458f Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Mon, 9 Sep 2024 19:17:56 +0200
Subject: [PATCH] Simplifing by using default path
---
ci/setup_spack.sh | 10 ++--------
stacks/pinot-noir/spack.yaml | 2 --
stacks/pinot-noir/spack_aocc.yaml | 2 --
stacks/pinot-noir/spack_nvhpc.yaml | 2 --
stacks/pinot-noir/spack_oneapi.yaml | 2 --
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 77ed70d..14f1448 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -74,20 +74,14 @@ do
done
done
-echo "config:" > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
if [ -d cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH} ]
then
- cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
- cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
- template_dirs:
- - ${SPACK_SYSTEM_CONFIG_PATH}/templates
-EOF
+ cp -r "${STACK_CONFIG_PATH}/templates" ${STACK_LOCATION}/spack/share/spack
fi
if [ -d "${STACK_CONFIG_PATH}/licenses" ]
then
- cp -r "${STACK_CONFIG_PATH}/licenses" ${SPACK_SYSTEM_CONFIG_PATH}
- echo " license_dir: ${SPACK_SYSTEM_CONFIG_PATH}/licenses" >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+ cp -r "${STACK_CONFIG_PATH}/licenses/*" ${STACK_LOCATION}/spack/etc/spack
fi
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index f071151..61e31e1 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -14,8 +14,6 @@ spack:
- definitions_accel.yaml
- definitions_env.yaml
- - config_stack.yaml
-
modules:
default:
lmod:
diff --git a/stacks/pinot-noir/spack_aocc.yaml b/stacks/pinot-noir/spack_aocc.yaml
index 6c06780..b6e7276 100644
--- a/stacks/pinot-noir/spack_aocc.yaml
+++ b/stacks/pinot-noir/spack_aocc.yaml
@@ -14,8 +14,6 @@ spack:
- definitions_env.yaml
- definitions_stack.yaml
- - config_stack.yaml
-
modules:
default:
lmod:
diff --git a/stacks/pinot-noir/spack_nvhpc.yaml b/stacks/pinot-noir/spack_nvhpc.yaml
index f3b87b8..8f5e962 100644
--- a/stacks/pinot-noir/spack_nvhpc.yaml
+++ b/stacks/pinot-noir/spack_nvhpc.yaml
@@ -14,8 +14,6 @@ spack:
- definitions_env.yaml
- definitions_stack.yaml
- - config_stack.yaml
-
modules:
default:
lmod:
diff --git a/stacks/pinot-noir/spack_oneapi.yaml b/stacks/pinot-noir/spack_oneapi.yaml
index 757d1df..67f92a4 100644
--- a/stacks/pinot-noir/spack_oneapi.yaml
+++ b/stacks/pinot-noir/spack_oneapi.yaml
@@ -14,8 +14,6 @@ spack:
- definitions_env.yaml
- definitions_stack.yaml
- - config_stack.yaml
-
modules:
default:
lmod:
--
GitLab