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
Compare revisions
cd7803a2609e221aff16fbff66de491d50ef7021 to 9ffc43e09a606454c7a0500eec4ffcc2c30faaab
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
mpsd-cs/mpsd-software-manager-2
Select target project
No results found
9ffc43e09a606454c7a0500eec4ffcc2c30faaab
Select Git revision
Branches
dummy
main
metamodule-refactoring
rewrite-metamodule-generation
Tags
0.1
Swap
Target
mpsd-cs/mpsd-software-manager-2
Select target project
mpsd-cs/mpsd-software-manager-2
1 result
cd7803a2609e221aff16fbff66de491d50ef7021
Select Git revision
Branches
dummy
main
metamodule-refactoring
rewrite-metamodule-generation
Tags
0.1
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Drop licence pre-commit check
· de4a9b5a
Martin Lang
authored
3 months ago
de4a9b5a
Expose cuda_arch to toolchain yaml templates
· 9ffc43e0
Martin Lang
authored
3 months ago
9ffc43e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.pre-commit-config.yaml
+0
-6
0 additions, 6 deletions
.pre-commit-config.yaml
src/mpsd_software_manager/spack.py
+8
-6
8 additions, 6 deletions
src/mpsd_software_manager/spack.py
with
8 additions
and
12 deletions
.pre-commit-config.yaml
View file @
9ffc43e0
...
...
@@ -21,9 +21,3 @@ repos:
rev
:
v0.18
hooks
:
-
id
:
validate-pyproject
-
repo
:
https://github.com/src-r-r/pre-commit-license-year
rev
:
bde06feb9eeb1438a6d1d80b2471e668dd34162b
hooks
:
-
id
:
check_year
name
:
check LICENSE year
This diff is collapsed.
Click to expand it.
src/mpsd_software_manager/spack.py
View file @
9ffc43e0
...
...
@@ -351,7 +351,11 @@ def install_package_set_from_environment(spack_environment: str) -> None:
logger
.
debug
(
spack
(
f
"
env create
{
spack_environment
}
"
))
config
=
Config
()
context
=
{
"
toolchain_compiler
"
:
compilers
[
"
default
"
][
"
name
"
]}
context
=
{
"
toolchain_compiler
"
:
compilers
[
"
default
"
][
"
name
"
],
# cuda arch: avocado (61), gpu (70), gpu-ayyer (70), accelerated tentacles (75)
"
cuda_arch
"
:
"
61,70,75
"
,
}
if
"
fallback
"
in
compilers
:
context
[
"
fallback_compiler
"
]
=
compilers
[
"
fallback
"
][
"
name
"
]
render_template
(
...
...
@@ -634,11 +638,9 @@ def install_toolchain_compiler(spack_environment: str) -> dict[str, dict[str, st
gcc
=
compilers
[
"
fallback
"
]
intel
=
compilers
[
"
default
"
]
arch_tag
=
platform
.
machine
()
cflags
=
f
"
-idirafter/usr/include/
{
arch_tag
}
-linux-gnu
"
"
-diag-disable=10441
"
cxxflags
=
(
f
"
-idirafter/usr/include/
{
arch_tag
}
-linux-gnu
"
"
-diag-disable=10441
"
)
fflags
=
f
"
-idirafter/usr/include/
{
arch_tag
}
-linux-gnu
"
"
-diag-disable=10441
"
cflags
=
f
"
-idirafter/usr/include/
{
arch_tag
}
-linux-gnu -diag-disable=10441
"
cxxflags
=
f
"
-idirafter/usr/include/
{
arch_tag
}
-linux-gnu -diag-disable=10441
"
fflags
=
f
"
-idirafter/usr/include/
{
arch_tag
}
-linux-gnu -diag-disable=10441
"
intel_spec
=
intel
[
"
name
"
].
replace
(
"
@
"
,
"
@=
"
)
...
...
This diff is collapsed.
Click to expand it.