Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scitas-software-stacks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SCITAS
Software stack
scitas-software-stacks
Commits
a5ea37ac
Commit
a5ea37ac
authored
1 year ago
by
Nicolas Richart
Browse files
Options
Downloads
Patches
Plain Diff
Lots of small fixes
parent
e533e289
No related branches found
No related tags found
No related merge requests found
Pipeline
#180537
failed
1 year ago
Stage: environment
Stage: compilers
Stage: concretize
Stage: install
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ci/install_compilers.sh
+4
-4
4 additions, 4 deletions
ci/install_compilers.sh
ci/setup_spack.sh
+2
-2
2 additions, 2 deletions
ci/setup_spack.sh
config.json
+10
-2
10 additions, 2 deletions
config.json
config.yaml
+2
-2
2 additions, 2 deletions
config.yaml
with
18 additions
and
10 deletions
ci/install_compilers.sh
+
4
−
4
View file @
a5ea37ac
#!/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
This diff is collapsed.
Click to expand it.
ci/setup_spack.sh
+
2
−
2
View file @
a5ea37ac
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
config.json
+
10
−
2
View file @
a5ea37ac
...
@@ -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"
}
}
}
}
}
}
}
This diff is collapsed.
Click to expand it.
config.yaml
+
2
−
2
View file @
a5ea37ac
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment