From eb98f41b86338ffc1cbd314e6eb3bc23c28cbc8a Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Wed, 14 Feb 2024 19:57:31 +0100
Subject: [PATCH] chore: Reduce difference between visionary and asic
create_recipe.sh
Change-Id: I3b19acd63b2f9b1c851fe3946db89d8dfa4a93d4
---
share/yashchiki/styles/asic/create_recipe.sh | 12 +++---------
share/yashchiki/styles/visionary/create_recipe.sh | 4 ++--
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/share/yashchiki/styles/asic/create_recipe.sh b/share/yashchiki/styles/asic/create_recipe.sh
index d89ecddc..c599df7b 100755
--- a/share/yashchiki/styles/asic/create_recipe.sh
+++ b/share/yashchiki/styles/asic/create_recipe.sh
@@ -13,10 +13,10 @@ From: ${DOCKER_BASE_IMAGE}
%setup
# bind-mount spack-folder as moving involves copying the complete download cache
mkdir \${SINGULARITY_ROOTFS}/opt/spack
- mount --no-mtab --bind "${WORKSPACE}/spack" "\${SINGULARITY_ROOTFS}/opt/spack"
+ mount --no-mtab --bind "${YASHCHIKI_SPACK_PATH}" "\${SINGULARITY_ROOTFS}/opt/spack"
# bind-mount ccache
mkdir \${SINGULARITY_ROOTFS}/opt/ccache
- mount --no-mtab --bind "${HOME}/spack_ccache" "\${SINGULARITY_ROOTFS}/opt/ccache"
+ mount --no-mtab --bind "${YASHCHIKI_CACHES_ROOT}/spack_ccache" "\${SINGULARITY_ROOTFS}/opt/ccache"
# bind-mount build_cache
mkdir -p "\${SINGULARITY_ROOTFS}${BUILD_CACHE_INSIDE}"
# create buildcache directory if it does not exist
@@ -34,7 +34,7 @@ From: ${DOCKER_BASE_IMAGE}
mount --no-mtab --bind "${YASHCHIKI_SPACK_CONFIG}" "\${SINGULARITY_ROOTFS}/tmp/spack_config"
# copy install scripts
mkdir "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
- rsync -av --chmod 0755 "${ROOT_DIR}"/share/yashchiki/styles/asic/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
+ rsync -av --chmod 0755 "${ROOT_DIR}"/share/yashchiki/styles/${CONTAINER_STYLE}/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av --chmod 0755 "${ROOT_DIR}"/lib/yashchiki/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${ROOT_DIR}"/lib/yashchiki/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${ROOT_DIR}"/share/yashchiki/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
@@ -303,10 +303,4 @@ for view in "${spack_views[@]}"; do
generate_appenv "${view}" "${view}"
[[ "${view}" =~ ^visionary- ]] && generate_appenv "${view#visionary-}" "${view}"
) >> "${YASHCHIKI_RECIPE_PATH}"
-
- if [ "${view}" = "visionary-simulation" ];then
-cat <<EOF >>"${YASHCHIKI_RECIPE_PATH}"
- export NEST_MODULES=visionarymodule
-EOF
- fi
done
diff --git a/share/yashchiki/styles/visionary/create_recipe.sh b/share/yashchiki/styles/visionary/create_recipe.sh
index d0d4fe8a..a1bae05e 100755
--- a/share/yashchiki/styles/visionary/create_recipe.sh
+++ b/share/yashchiki/styles/visionary/create_recipe.sh
@@ -39,7 +39,7 @@ From: ${DOCKER_BASE_IMAGE}
mount --no-mtab --bind "${YASHCHIKI_SPACK_CONFIG}" "\${SINGULARITY_ROOTFS}/tmp/spack_config"
# copy install scripts
mkdir "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
- rsync -av --chmod 0755 "${ROOT_DIR}"/share/yashchiki/styles/visionary/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
+ rsync -av --chmod 0755 "${ROOT_DIR}"/share/yashchiki/styles/${CONTAINER_STYLE}/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av --chmod 0755 "${ROOT_DIR}"/lib/yashchiki/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${ROOT_DIR}"/lib/yashchiki/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${ROOT_DIR}"/share/yashchiki/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
@@ -74,7 +74,7 @@ From: ${DOCKER_BASE_IMAGE}
locale-gen
# propagate environment variables to container recipe
export DEPENDENCY_PYTHON="${DEPENDENCY_PYTHON}"
- export YASHCHIKI_BUILD_SPACK_GCC=${YASHCHIKI_BUILD_SPACK_GCC}
+ export YASHCHIKI_BUILD_SPACK_GCC="${YASHCHIKI_BUILD_SPACK_GCC}"
export YASHCHIKI_SPACK_GCC="${YASHCHIKI_SPACK_GCC}"
export YASHCHIKI_SPACK_GCC_VERSION="${YASHCHIKI_SPACK_GCC_VERSION}"
export YASHCHIKI_SPACK_CONFIG="/tmp/spack_config"
--
GitLab