Skip to content
Snippets Groups Projects
Commit a5ea37ac authored by Nicolas Richart's avatar Nicolas Richart
Browse files

Lots of small fixes

parent e533e289
No related branches found
No related tags found
No related merge requests found
Pipeline #180537 failed
#!/usr/bin/env sh #!/usr/bin/env sh
COMPILER_LIST_SPECS=$(jq -Mr '.stack | .core_compiler as $core | .compilers | map("\(.spec)@\(.version) %\($core)")[]' config.json) COMPILER_LIST_SPECS=$(jq -Mr '.stack | .core_compiler as $core | .compilers | map("\(.spec)@\(.spec_version) %\($core)")[]' config.json)
echo "Getting system compiler" echo "Getting system compiler"
spack/bin/spack compiler find --scope system /usr spack/bin/spack compiler find --scope system /usr
...@@ -40,7 +40,7 @@ spack/bin/spack buildcache create \ ...@@ -40,7 +40,7 @@ spack/bin/spack buildcache create \
core_compiler=$(jq -Mrc '.stack | .core_compiler' config.json) core_compiler=$(jq -Mrc '.stack | .core_compiler' config.json)
compilers=$(jq -Mrc '.stack | .compilers | to_entries | map("\(.key)@\(.value.version)")' config.json) compilers=$(jq -Mrc '.stack | .compilers | to_entries | map("\(.key)@\(.value.version)")' config.json)
compilers_specs=$(jq -Mrc '.stack | .compilers | map("\(.spec)@\(.version)")' config.json) compilers_specs=$(jq -Mrc '.stack | .compilers | map("\(.spec)@\(.spec_version)")' config.json)
cat > compiler_definitions.yaml << EOF cat > compiler_definitions.yaml << EOF
definitions: definitions:
...@@ -55,10 +55,10 @@ for compiler_hash in $(echo ${hashes}); do ...@@ -55,10 +55,10 @@ for compiler_hash in $(echo ${hashes}); do
location=$(spack/bin/spack location -i ${compiler_hash}) location=$(spack/bin/spack location -i ${compiler_hash})
echo "Checking for compiler in locations:" echo "Checking for compiler in locations:"
echo " - ${location}" echo " - ${location}"
echo " - ${location}/compiler/latest" echo " - ${location}/compiler/latest/linux"
spack/bin/spack compiler find \ spack/bin/spack compiler find \
--scope system \ --scope system \
${location} \ ${location} \
${location}/compiler/latest ${location}/compiler/latest/linux
done done
...@@ -27,8 +27,8 @@ EXTERNAL_REPOS=$(jq -r '.spack.repos | keys[]' config.json) ...@@ -27,8 +27,8 @@ EXTERNAL_REPOS=$(jq -r '.spack.repos | keys[]' config.json)
for file in mirrors.yaml repos.yaml packages.yaml concretizer.yaml config.yaml for file in mirrors.yaml repos.yaml packages.yaml concretizer.yaml config.yaml
do do
if [ -e ${file} ]; then if [ -e "${file}" ]; then
cp ${file} ${SPACK_SYSTEM_CONFIG_PATH} cp "${file}" ${SPACK_SYSTEM_CONFIG_PATH}
fi fi
done done
......
...@@ -16,8 +16,16 @@ ...@@ -16,8 +16,16 @@
"mount_point": "/stack", "mount_point": "/stack",
"core_compiler": "gcc@11.4.1 arch=linux-rhel9-x86_64_v2", "core_compiler": "gcc@11.4.1 arch=linux-rhel9-x86_64_v2",
"compilers": { "compilers": {
"gcc": { "spec": "gcc", "version": "12.2.0" }, "gcc": {
"oneapi": { "spec": "intel-oneapi-compilers", "version": "2023.2.1" } "spec": "gcc",
"spec_version": "12.2.0",
"version": "12.2.0"
},
"oneapi": {
"spec": "intel-oneapi-compilers",
"spec_version": "2023.2.1",
"version": "2023.2.0"
}
} }
} }
} }
...@@ -2,5 +2,5 @@ config: ...@@ -2,5 +2,5 @@ config:
# ccache: true # ccache: true
install_missing_compilers: false install_missing_compilers: false
install_tree: # install_tree:
padded_length: true # padded_length: true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment