Commit bcfe384a authored by Lorenz Hüdepohl's avatar Lorenz Hüdepohl
Browse files

Remove version suffix (_5_0, etc.) from openmpi flavor

This makes it easier in the spec files, e.g. in conditionals
parent c1ae3fff
...@@ -810,9 +810,10 @@ Macros: ...@@ -810,9 +810,10 @@ Macros:
dependencies = ((project, compiler),) dependencies = ((project, compiler),)
if not parent: if not parent:
dependencies = openmpi_flavor_dependencies(of, distribution) + dependencies dependencies = openmpi_flavor_dependencies(of, distribution) + dependencies
flavor_kind = re.sub("(_[0-9]+)*$", "", of)
repo(mpi + "_" + compiler + "_" + of, dependencies, mpi=True, repo(mpi + "_" + compiler + "_" + of, dependencies, mpi=True,
mpi_repository=mpi, mpi_module=mpi_module(mpi), mpi_repository=mpi, mpi_module=mpi_module(mpi),
openmpi_flavor=of) openmpi_flavor=flavor_kind)
for cuda in cudas: for cuda in cudas:
for compiler in filter(partial(valid_cuda, cuda), compilers): for compiler in filter(partial(valid_cuda, cuda), compilers):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment