From 7bc2853a1429a578c02ff91fb734c72a61fda588 Mon Sep 17 00:00:00 2001
From: "Fabian.Jakub" <fabian@jakub.com>
Date: Wed, 22 Mar 2023 15:15:14 +0100
Subject: [PATCH] dbg
---
conf/real-from-ideal/jobs.yaml | 2 --
platforms/common/spack_utils.sh | 25 ++++++++++++-------------
templates/common/build_icon.sh | 2 +-
3 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/conf/real-from-ideal/jobs.yaml b/conf/real-from-ideal/jobs.yaml
index b40d3e9..2079a89 100644
--- a/conf/real-from-ideal/jobs.yaml
+++ b/conf/real-from-ideal/jobs.yaml
@@ -57,7 +57,6 @@ JOBS:
# EXECUTABLE: /my_python_env/python3
TRANSFER_PROJECT:
FILE: templates/common/transfer_project.sh
- EXPORT: platforms/common/spack_utils.sh
PLATFORM: LOCAL
BUILD_ICON:
@@ -65,7 +64,6 @@ JOBS:
DEPENDENCIES: TRANSFER_PROJECT
WALLCLOCK: 01:00
PROCESSORS: 16
- EXPORT: platforms/common/spack_utils.sh
BUILD_PYTHON_ENVIRONMENT:
FILE: templates/common/build_python_environment.sh
diff --git a/platforms/common/spack_utils.sh b/platforms/common/spack_utils.sh
index 4c4b251..fab55d4 100644
--- a/platforms/common/spack_utils.sh
+++ b/platforms/common/spack_utils.sh
@@ -1,19 +1,9 @@
+# static settings when using spack
function spack_env() {
-export SPACK_URL=%spack.url%
-export SPACK_BRANCH=%spack.branch%
-export SPACK_ROOT=%spack.root%
-export SPACK_COMPILER=%spack.compiler%
-export SPACK_DISABLE_LOCAL_CONFIG=%spack.disable_local_config%
-
-if [ ! -z "%spack.user_cache_path%" ]; then
- echo "setting SPACK_USER_CACHE_PATH=%spack.user_cache_path%"
- export SPACK_USER_CACHE_PATH=%spack.user_cache_path%
-fi
-
export SPACK_SETUP_ENV=$SPACK_ROOT/share/spack/setup-env.sh
}
-function install_spack() {
+function _install_spack() {
spack_env
if [ ! -f ${SPACK_ROOT} ]; then
@@ -32,8 +22,17 @@ fi
}
function load_spack() {
+export SPACK_ROOT=$1
+export SPACK_URL=$2
+export SPACK_BRANCH=$3
+export SPACK_COMPILER=$4
+export SPACK_DISABLE_LOCAL_CONFIG=$5
+export SPACK_USER_CACHE_PATH=$6
+if [ ! -z "$SPACK_USER_CACHE_PATH" ]; then
+ echo "setting SPACK_USER_CACHE_PATH=$SPACK_USER_CACHE_PATH"
+fi
spack_env
-if [ ! -f ${SPACK_ROOT} ]; then install_spack; fi
+if [ ! -f ${SPACK_ROOT} ]; then _install_spack; fi
. ${SPACK_SETUP_ENV}
}
diff --git a/templates/common/build_icon.sh b/templates/common/build_icon.sh
index 1138480..65b6386 100644
--- a/templates/common/build_icon.sh
+++ b/templates/common/build_icon.sh
@@ -12,7 +12,7 @@ fi
cd ${WORKDIR}
. ${WORKDIR}/proj/platforms/common/spack_utils.sh
-load_spack
+load_spack "%spack.root%" "%spack.url%" "%spack.branch%" "%spack.compiler%" "%spack.disable_local_config%" "%spack.user_cache_path%"
SPACK_BUILD_ICON=%icon.spack_cmd%
if [ ! -z $SPACK_BUILD_ICON ]; then
--
GitLab