Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mpsd-software-manager-2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MPSD Computational Science
mpsd-software-manager-2
Commits
bb5e9242
Commit
bb5e9242
authored
4 months ago
by
Martin Lang
Browse files
Options
Downloads
Patches
Plain Diff
Fix missing spaces
parent
6996f09f
No related branches found
No related tags found
2 merge requests
!2
Deprecate toolchain metamodules and extend octopus-dependencies
,
!1
Code review of main
Pipeline
#530130
failed
4 months ago
Stage: linting
Stage: static-code-analysis
Stage: tests
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mpsd_software_manager/spack.py
+2
-2
2 additions, 2 deletions
src/mpsd_software_manager/spack.py
tests/test_spack_workflow.py
+2
-5
2 additions, 5 deletions
tests/test_spack_workflow.py
with
4 additions
and
7 deletions
src/mpsd_software_manager/spack.py
+
2
−
2
View file @
bb5e9242
...
...
@@ -444,8 +444,8 @@ def generate_meta_modules(
f
"
The toolchain modules are deprecated; load
{
hierarchy_modules
}
and other
"
"
modules explicitly. For compiling octopus: the octopus-dependencies
"
"
module in variants min (full) contains all required (required and
"
f
"
optional) dependencies. Use:
'
module load
{
hierarchy_modules
}
"
"
octopus-dependencies/VARIANT
'"
f
"
optional) dependencies. Use:
'
module load
{
hierarchy_modules
}
"
"
octopus-dependencies/VARIANT
'"
)
write_lua_module
(
Config
().
lmod_root
/
"
Core
"
/
"
toolchain
"
/
f
"
{
toolchain_module_name
}
.lua
"
,
...
...
This diff is collapsed.
Click to expand it.
tests/test_spack_workflow.py
+
2
−
5
View file @
bb5e9242
...
...
@@ -416,12 +416,9 @@ def test_install_toolchain(
assert
"
generating lmod metamodules
"
in
caplog
.
text
assert
f
"
{
TOOLCHAIN
}
: Installation succeeded
"
in
caplog
.
text
# not "toolchain" metamodules for new releases
toolchain_module
=
Config
().
lmod_root
/
"
Core
"
/
"
toolchain
"
/
f
"
{
TOOLCHAIN
}
.lua
"
assert
toolchain_module
.
is_file
()
with
toolchain_module
.
open
()
as
f
:
content
=
f
.
read
()
assert
f
'
depends_on(
"
{
Config
().
system_compiler
.
replace
(
"
@
"
,
"
/
"
)
}
"
)
'
in
content
assert
"
toolchain modules are deprecated
"
in
content
assert
not
toolchain_module
.
is_file
()
octopus_full_dependencies_module
=
(
Config
().
lmod_root
...
...
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