Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
osc-plugins
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
Container registry
Model registry
Operate
Environments
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
mpcdf
obs
osc-plugins
Commits
8ad7caa0
Commit
8ad7caa0
authored
5 months ago
by
Tobias Melson
Browse files
Options
Downloads
Patches
Plain Diff
Fix compiler selection in enable_repositories
parent
179405bc
No related branches found
No related tags found
No related merge requests found
Pipeline
#239377
passed
5 months ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mpcdf_common.py
+9
-8
9 additions, 8 deletions
mpcdf_common.py
with
9 additions
and
8 deletions
mpcdf_common.py
+
9
−
8
View file @
8ad7caa0
...
@@ -7,6 +7,7 @@ import textwrap
...
@@ -7,6 +7,7 @@ import textwrap
import
urllib
import
urllib
from
typing
import
Optional
from
typing
import
Optional
from
functools
import
partial
from
functools
import
partial
from
itertools
import
chain
from
xml.etree
import
ElementTree
from
xml.etree
import
ElementTree
if
sys
.
version_info
[
0
]
<
3
:
if
sys
.
version_info
[
0
]
<
3
:
...
@@ -688,12 +689,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
...
@@ -688,12 +689,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
enable
(
mpi
+
"
_
"
+
compiler
+
"
_
"
+
of
)
enable
(
mpi
+
"
_
"
+
compiler
+
"
_
"
+
of
)
if
flag
==
"
cuda
"
:
if
flag
==
"
cuda
"
:
for
cuda
,
compiler
in
product
(
actual_cudas
(),
a
l
l_compilers
+
al
l_pgis
):
for
cuda
,
compiler
in
product
(
actual_cudas
(),
chain
(
actu
al_compilers
(),
actua
l_pgis
())
):
if
valid_cuda
(
cuda
,
compiler
):
if
valid_cuda
(
cuda
,
compiler
):
enable
(
cuda
+
"
_
"
+
compiler
)
enable
(
cuda
+
"
_
"
+
compiler
)
if
flag
==
"
cuda_mpi
"
:
if
flag
==
"
cuda_mpi
"
:
for
cuda
,
mpi
,
compiler
in
product
(
actual_cudas
(),
actual_mpis
(),
a
l
l_compilers
):
for
cuda
,
mpi
,
compiler
in
product
(
actual_cudas
(),
actual_mpis
(),
a
ctua
l_compilers
()
):
if
valid_cuda
(
cuda
,
compiler
)
and
valid_mpi
(
compiler
,
mpi
):
if
valid_cuda
(
cuda
,
compiler
)
and
valid_mpi
(
compiler
,
mpi
):
enable
(
cuda
+
"
_
"
+
mpi
+
"
_
"
+
compiler
)
enable
(
cuda
+
"
_
"
+
mpi
+
"
_
"
+
compiler
)
...
@@ -707,22 +708,22 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
...
@@ -707,22 +708,22 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
enable
(
mpi
+
"
_
"
+
amd
)
enable
(
mpi
+
"
_
"
+
amd
)
if
flag
==
"
rocm
"
:
if
flag
==
"
rocm
"
:
for
rocm
,
compiler
in
product
(
actual_rocms
(),
a
l
l_compilers
+
al
l_amds
):
for
rocm
,
compiler
in
product
(
actual_rocms
(),
chain
(
actu
al_compilers
(),
actua
l_amds
())
):
if
valid_rocm
(
compiler
):
if
valid_rocm
(
compiler
):
enable
(
rocm
+
"
_
"
+
compiler
)
enable
(
rocm
+
"
_
"
+
compiler
)
if
flag
==
"
rocm_mpi
"
:
if
flag
==
"
rocm_mpi
"
:
for
rocm
,
mpi
,
compiler
in
product
(
actual_rocms
(),
actual_mpis
(),
a
l
l_compilers
+
al
l_amds
):
for
rocm
,
mpi
,
compiler
in
product
(
actual_rocms
(),
actual_mpis
(),
chain
(
actu
al_compilers
(),
actua
l_amds
())
):
if
valid_rocm
(
compiler
)
and
is_openmpi
(
mpi
)
and
valid_mpi
(
compiler
,
mpi
):
if
valid_rocm
(
compiler
)
and
is_openmpi
(
mpi
)
and
valid_mpi
(
compiler
,
mpi
):
enable
(
rocm
+
"
_
"
+
mpi
+
"
_
"
+
compiler
)
enable
(
rocm
+
"
_
"
+
mpi
+
"
_
"
+
compiler
)
if
flag
==
"
rocm_aware_mpi
"
:
if
flag
==
"
rocm_aware_mpi
"
:
for
rocm
,
mpi
,
compiler
in
product
(
actual_rocms
(),
actual_mpis
(),
a
l
l_compilers
+
al
l_amds
):
for
rocm
,
mpi
,
compiler
in
product
(
actual_rocms
(),
actual_mpis
(),
chain
(
actu
al_compilers
(),
actua
l_amds
())
):
if
valid_rocm
(
compiler
)
and
is_openmpi
(
mpi
)
and
valid_mpi
(
compiler
,
mpi
):
if
valid_rocm
(
compiler
)
and
is_openmpi
(
mpi
)
and
valid_mpi
(
compiler
,
mpi
):
enable
(
rocm
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
)
enable
(
rocm
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
)
if
flag
==
"
rocm_aware_openmpi_flavors
"
:
if
flag
==
"
rocm_aware_openmpi_flavors
"
:
for
rocm
,
mpi
,
compiler
in
product
(
actual_rocms
(),
actual_mpis
(),
a
l
l_compilers
+
al
l_amds
):
for
rocm
,
mpi
,
compiler
in
product
(
actual_rocms
(),
actual_mpis
(),
chain
(
actu
al_compilers
(),
actua
l_amds
())
):
if
valid_rocm
(
compiler
)
and
is_openmpi
(
mpi
)
and
valid_mpi
(
compiler
,
mpi
):
if
valid_rocm
(
compiler
)
and
is_openmpi
(
mpi
)
and
valid_mpi
(
compiler
,
mpi
):
for
of
in
actual_openmpi_flavors
():
for
of
in
actual_openmpi_flavors
():
enable
(
rocm
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
+
"
_
"
+
of
)
enable
(
rocm
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
+
"
_
"
+
of
)
...
@@ -737,12 +738,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
...
@@ -737,12 +738,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
enable
(
mpi
+
"
_
"
+
pgi
)
enable
(
mpi
+
"
_
"
+
pgi
)
if
flag
==
"
cuda_aware_mpi
"
:
if
flag
==
"
cuda_aware_mpi
"
:
for
cuda
,
mpi
,
compiler
in
product
(
actual_cudas
(),
actual_mpis
(),
a
l
l_compilers
+
al
l_pgis
):
for
cuda
,
mpi
,
compiler
in
product
(
actual_cudas
(),
actual_mpis
(),
chain
(
actu
al_compilers
(),
actua
l_pgis
())
):
if
"
openmpi
"
in
mpi
and
valid_cuda
(
cuda
,
compiler
)
and
valid_mpi
(
compiler
,
mpi
):
if
"
openmpi
"
in
mpi
and
valid_cuda
(
cuda
,
compiler
)
and
valid_mpi
(
compiler
,
mpi
):
enable
(
cuda
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
)
enable
(
cuda
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
)
if
flag
==
"
cuda_aware_openmpi_flavors
"
:
if
flag
==
"
cuda_aware_openmpi_flavors
"
:
for
cuda
,
mpi
,
compiler
in
product
(
actual_cudas
(),
actual_mpis
(),
a
l
l_compilers
+
al
l_pgis
):
for
cuda
,
mpi
,
compiler
in
product
(
actual_cudas
(),
actual_mpis
(),
chain
(
actu
al_compilers
(),
actua
l_pgis
())
):
if
"
openmpi
"
in
mpi
and
valid_cuda
(
cuda
,
compiler
)
and
valid_mpi
(
compiler
,
mpi
):
if
"
openmpi
"
in
mpi
and
valid_cuda
(
cuda
,
compiler
)
and
valid_mpi
(
compiler
,
mpi
):
for
of
in
actual_openmpi_flavors
():
for
of
in
actual_openmpi_flavors
():
enable
(
cuda
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
+
"
_
"
+
of
)
enable
(
cuda
+
"
_aware_
"
+
mpi
+
"
_
"
+
compiler
+
"
_
"
+
of
)
...
...
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