From 033c7d6e90156b3e3bb02f7da8ddc9d6006efa91 Mon Sep 17 00:00:00 2001
From: Andreas Baumbach <andreas.baumbach@kip.uni-heidelberg.de>
Date: Tue, 5 Jul 2022 11:32:57 +0200
Subject: [PATCH] Remove dependency pinnings and visionary-simulation
no longer needed for new spack
Depends-On: 17740
Change-Id: Iab9d270c9c3881bdb667fdf18b06310e6801b8f1
---
.ci/asic_create_recipe.sh | 1 -
.ci/commons.sh | 33 +-----------------------------
.ci/install_spack.sh | 8 ++++++++
.ci/visionary_create_recipe.sh | 7 -------
.ci/visionary_spack_collection.sh | 18 +++++++---------
.ci/visionary_spack_custom_view.sh | 3 ---
6 files changed, 16 insertions(+), 54 deletions(-)
diff --git a/.ci/asic_create_recipe.sh b/.ci/asic_create_recipe.sh
index e658b337..665907f5 100755
--- a/.ci/asic_create_recipe.sh
+++ b/.ci/asic_create_recipe.sh
@@ -35,7 +35,6 @@ From: ${DOCKER_BASE_IMAGE}
mkdir "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${SOURCE_DIR}"/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${SOURCE_DIR}"/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
- rsync -av "${SOURCE_DIR}"/pinned "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${SOURCE_DIR}"/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
mkdir -p "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
rsync -av "${META_DIR_OUTSIDE}"/* "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
diff --git a/.ci/commons.sh b/.ci/commons.sh
index 7c1a66e7..da230357 100755
--- a/.ci/commons.sh
+++ b/.ci/commons.sh
@@ -169,39 +169,8 @@ fi
# PACKAGES #
############
-# Usage: get_pinned_deps <name>
-#
-# Note: This pinning is used only to help the concretizer make suitable picks.
-# The actual incompatabilities should still be expressed in the spack packages.
-#
-# The real reason for this machinery is the fact that the concretizer, despite
-# specifying which version of the package is compatible with python 2 and 3, is
-# unable to determine the last version still compatible with python 2
-#
-# Arguments:
-# <name> has to correspond to a list of pinned dependencies residing under
-# <yashchiki-root>/container-build-files/pinned/<name>.list
-# The file should contain a list of spec constraints (one spec per line).
-# Lines starting with and everything followed by # will be considered
-# comments and removed.
-get_pinned_deps() {
- local depsname="${1}"
- local filename="${COMMONS_DIR}/pinned/${depsname}.list"
-
- if [ ! -f "${filename}" ]; then
- echo "ERROR: No dependencies for ${depsname} found at ${filename}!" >&2
- exit 1
- fi
- # The grep call removes lines starting with # as well as blank lines. sed
- # then removes trailing comments. Afterwards we insert a tilde (^) in front
- # of every line (i.e., dependency) and join all lines by replacing the
- # newline character with spaces.
- grep -v "\(^#\|^\s*$\)" "${filename}" | sed -e "s:#.*$::" \
- | sed -e "s:^:\^:" | tr '\n' ' '
-}
-
# the version of dev tools we want in our view
-SPEC_VIEW_VISIONARY_DEV_TOOLS="visionary-dev-tools ^${DEPENDENCY_PYTHON3} $(get_pinned_deps dev) %${YASHCHIKI_SPACK_GCC}"
+SPEC_VIEW_VISIONARY_DEV_TOOLS="visionary-dev-tools ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
# used in VIEWS section below but needs to be defined before sourcing
# associative array: spec to add -> view names seperated by spaces
diff --git a/.ci/install_spack.sh b/.ci/install_spack.sh
index 42b4ec9b..974943f5 100755
--- a/.ci/install_spack.sh
+++ b/.ci/install_spack.sh
@@ -13,6 +13,14 @@ cd "$HOME"
install_from_buildcache "${spack_packages[@]+"${spack_packages[@]}"}"
+echo "DUMMY-INSTALLING PACKAGES"
+for package in "${spack_packages[@]+"${spack_packages[@]}"}"; do
+ specfile="$(get_specfiles "${package}")"
+ if (( $(wc -l <"${specfile}") == 0 )); then
+ echo "ERROR: Failed to concretize ${package} for install." >&2
+ fi
+done
+
echo "INSTALLING PACKAGES"
for package in "${spack_packages[@]+"${spack_packages[@]}"}"; do
# Disable cache because we already installed from build cache.
diff --git a/.ci/visionary_create_recipe.sh b/.ci/visionary_create_recipe.sh
index d01033f7..7f6422f6 100755
--- a/.ci/visionary_create_recipe.sh
+++ b/.ci/visionary_create_recipe.sh
@@ -40,7 +40,6 @@ From: ${DOCKER_BASE_IMAGE}
mkdir "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${SOURCE_DIR}"/*.sh "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${SOURCE_DIR}"/*.awk "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
- rsync -av "${SOURCE_DIR}"/pinned "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
rsync -av "${SOURCE_DIR}"/patches "\${SINGULARITY_ROOTFS}/${SPACK_INSTALL_SCRIPTS}"
mkdir -p "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
rsync -av "${META_DIR_OUTSIDE}"/* "\${SINGULARITY_ROOTFS}/${META_DIR_INSIDE}"
@@ -138,10 +137,4 @@ for view in "${spack_views[@]}"; do
generate_appenv "${view}" "${view}"
[[ "${view}" =~ ^visionary- ]] && generate_appenv "${view#visionary-}" "${view}"
) >> "${RECIPE_FILENAME}"
-
- if [ "${view}" = "visionary-simulation" ];then
-cat <<EOF >>"${RECIPE_FILENAME}"
- export NEST_MODULES=visionarymodule
-EOF
- fi
done
diff --git a/.ci/visionary_spack_collection.sh b/.ci/visionary_spack_collection.sh
index 9275c2d2..c86dd4b7 100644
--- a/.ci/visionary_spack_collection.sh
+++ b/.ci/visionary_spack_collection.sh
@@ -1,17 +1,15 @@
# All spack packages that should be fetched/installed in the container
spack_packages=(
"${SPEC_VIEW_VISIONARY_DEV_TOOLS}"
- "visionary-simulation~dev ^${DEPENDENCY_PYTHON} $(get_pinned_deps simulation) %${YASHCHIKI_SPACK_GCC}"
- "visionary-simulation ^${DEPENDENCY_PYTHON} $(get_pinned_deps simulation) %${YASHCHIKI_SPACK_GCC}"
# START python 3 packages
- "visionary-wafer~dev ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${YASHCHIKI_SPACK_GCC}"
- "visionary-wafer ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${YASHCHIKI_SPACK_GCC}"
- "visionary-wafer~dev+gccxml ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${YASHCHIKI_SPACK_GCC}"
- "visionary-wafer+gccxml ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${YASHCHIKI_SPACK_GCC}"
- "visionary-wafer-visu ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer-visu) %${YASHCHIKI_SPACK_GCC}"
+ "visionary-wafer~dev ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
+ "visionary-wafer ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
+ "visionary-wafer~dev+gccxml ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
+ "visionary-wafer+gccxml ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
+ "visionary-wafer-visu ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
"visionary-clusterservices ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
- "visionary-dls~dev ^${DEPENDENCY_PYTHON3} $(get_pinned_deps dls) %${YASHCHIKI_SPACK_GCC}"
- "visionary-dls ^${DEPENDENCY_PYTHON3} $(get_pinned_deps dls) %${YASHCHIKI_SPACK_GCC}"
+ "visionary-dls~dev ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
+ "visionary-dls ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
"py-jupyterhub ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
"py-jupyterhub-dummyauthenticator ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
"py-jupyterhub-simplespawner ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
@@ -23,8 +21,6 @@ spack_views=(\
visionary-dls-core
visionary-dls
visionary-dls-nodev
- visionary-simulation
- visionary-simulation-nodev
visionary-slurmviz
visionary-wafer
visionary-wafer-nodev
diff --git a/.ci/visionary_spack_custom_view.sh b/.ci/visionary_spack_custom_view.sh
index 22be6163..947f8e07 100644
--- a/.ci/visionary_spack_custom_view.sh
+++ b/.ci/visionary_spack_custom_view.sh
@@ -10,9 +10,6 @@ ${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlin
# Strong independent packages who need no gccxml #
##################################################
-${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-simulation $(get_latest_hash "visionary-simulation+dev")
-${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-simulation-nodev $(get_latest_hash "visionary-simulation~dev")
-
${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls-core $(get_latest_hash visionary-dls-core "^${DEPENDENCY_PYTHON3}")
${MY_SPACK_BIN} ${SPACK_ARGS_VIEW[@]+"${SPACK_ARGS_VIEW[@]}"} view -d yes symlink -i ${MY_SPACK_VIEW_PREFIX}/visionary-dls $(get_latest_hash visionary-dls+dev "^${DEPENDENCY_PYTHON3}")
--
GitLab