Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
easybuild-repository-public-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
DEEP-SEA
easybuild-repository-public-release
Commits
4c7f4bc7
Commit
4c7f4bc7
authored
3 years ago
by
Damian Alvarez
Browse files
Options
Downloads
Patches
Plain Diff
To make AOCC and Clang side compilers
parent
9c1d7f10
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Custom_Hooks/eb_hooks.py
+10
-0
10 additions, 0 deletions
Custom_Hooks/eb_hooks.py
Custom_MNS/flexible_custom_hierarchical_mns.py
+6
-0
6 additions, 0 deletions
Custom_MNS/flexible_custom_hierarchical_mns.py
with
16 additions
and
0 deletions
Custom_Hooks/eb_hooks.py
+
10
−
0
View file @
4c7f4bc7
...
@@ -68,6 +68,8 @@ TWEAKABLE_DEPENDENCIES = {
...
@@ -68,6 +68,8 @@ TWEAKABLE_DEPENDENCIES = {
'
glew
'
:
(
'
OpenGL
'
,
'
2021b
'
),
'
glew
'
:
(
'
OpenGL
'
,
'
2021b
'
),
}
}
SIDECOMPILERS
=
[
'
AOCC
'
,
'
Clang
'
]
common_site_contact
=
'
Support <sc@fz-juelich.de>
'
common_site_contact
=
'
Support <sc@fz-juelich.de>
'
# Also maintain a list of CUDA enabled compilers
# Also maintain a list of CUDA enabled compilers
...
@@ -228,6 +230,8 @@ def parse_hook(ec, *args, **kwargs):
...
@@ -228,6 +230,8 @@ def parse_hook(ec, *args, **kwargs):
if
os
.
getenv
(
'
CI
'
)
is
None
:
if
os
.
getenv
(
'
CI
'
)
is
None
:
ec
=
tweak_dependencies
(
ec
)
ec
=
tweak_dependencies
(
ec
)
ec
=
tweak_moduleclass
(
ec
)
# If we are parsing we are not searching, in this case if the easyconfig is
# If we are parsing we are not searching, in this case if the easyconfig is
# located in the search path, warn that it's dependencies will (most probably)
# located in the search path, warn that it's dependencies will (most probably)
# not be resolved
# not be resolved
...
@@ -278,6 +282,12 @@ def tweak_dependencies(ec):
...
@@ -278,6 +282,12 @@ def tweak_dependencies(ec):
return
ec
return
ec
def
tweak_moduleclass
(
ec
):
if
ec
[
'
name
'
]
in
SIDECOMPILERS
:
ec
[
'
moduleclass
'
]
=
'
sidecompiler
'
return
ec
def
inject_site_contact_and_user_labels
(
ec
):
def
inject_site_contact_and_user_labels
(
ec
):
ec_dict
=
ec
.
asdict
()
ec_dict
=
ec
.
asdict
()
# Check where installations are going to go and add appropriate site contact
# Check where installations are going to go and add appropriate site contact
...
...
This diff is collapsed.
Click to expand it.
Custom_MNS/flexible_custom_hierarchical_mns.py
+
6
−
0
View file @
4c7f4bc7
...
@@ -23,6 +23,7 @@ COMM_SETTINGS = 'comm_settings'
...
@@ -23,6 +23,7 @@ COMM_SETTINGS = 'comm_settings'
MODULECLASS_COMPILER
=
'
compiler
'
MODULECLASS_COMPILER
=
'
compiler
'
MODULECLASS_MPI
=
'
mpi
'
MODULECLASS_MPI
=
'
mpi
'
MODULECLASS_SIDECOMPILER
=
'
sidecompiler
'
GCCCORE
=
'
GCCcore
'
GCCCORE
=
'
GCCcore
'
...
@@ -185,6 +186,8 @@ class FlexibleCustomHierarchicalMNS(HierarchicalMNS):
...
@@ -185,6 +186,8 @@ class FlexibleCustomHierarchicalMNS(HierarchicalMNS):
# but we want the mpi module class to stand alone
# but we want the mpi module class to stand alone
if
ec
[
'
moduleclass
'
]
==
MODULECLASS_MPI
:
if
ec
[
'
moduleclass
'
]
==
MODULECLASS_MPI
:
subdir
=
os
.
path
.
join
(
COMPILER
,
MODULECLASS_MPI
,
tc_comp_name
,
tc_comp_ver
)
subdir
=
os
.
path
.
join
(
COMPILER
,
MODULECLASS_MPI
,
tc_comp_name
,
tc_comp_ver
)
elif
ec
[
'
moduleclass
'
]
==
MODULECLASS_SIDECOMPILER
:
subdir
=
os
.
path
.
join
(
COMPILER
,
MODULECLASS_SIDECOMPILER
,
tc_comp_name
,
tc_comp_ver
)
else
:
else
:
subdir
=
os
.
path
.
join
(
COMPILER
,
tc_comp_name
,
tc_comp_ver
)
subdir
=
os
.
path
.
join
(
COMPILER
,
tc_comp_name
,
tc_comp_ver
)
else
:
else
:
...
@@ -254,6 +257,9 @@ class FlexibleCustomHierarchicalMNS(HierarchicalMNS):
...
@@ -254,6 +257,9 @@ class FlexibleCustomHierarchicalMNS(HierarchicalMNS):
# Always extend to capture the MPI implementations too (which are in a separate directory)
# Always extend to capture the MPI implementations too (which are in a separate directory)
if
ec
[
'
name
'
]
not
in
[
GCCCORE
]:
if
ec
[
'
name
'
]
not
in
[
GCCCORE
]:
paths
.
append
(
os
.
path
.
join
(
COMPILER
,
MODULECLASS_MPI
,
*
comp_name_ver
))
paths
.
append
(
os
.
path
.
join
(
COMPILER
,
MODULECLASS_MPI
,
*
comp_name_ver
))
# Extend the MOODULEPATH to include the side compilers available in GCCcore
else
:
paths
.
append
(
os
.
path
.
join
(
COMPILER
,
MODULECLASS_SIDECOMPILER
,
*
comp_name_ver
))
elif
modclass
==
MODULECLASS_MPI
:
elif
modclass
==
MODULECLASS_MPI
:
if
tc_comp_info
is
None
:
if
tc_comp_info
is
None
:
...
...
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