Add support for 'cuda_aware_openmpi_flavors' flag

mpcdf_common.py

@@ -586,6 +586,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
                     if "openmpi" in mpi and valid_cuda(cuda, compiler) and valid_mpi(compiler, mpi):
                         enable(cuda + "_aware_" + mpi + "_" + compiler)
 
+            if flag == "cuda_aware_openmpi_flavors":
+                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), all_compilers):
+                    if "openmpi" in mpi and valid_cuda(cuda, compiler) and valid_mpi(compiler, mpi):
+                        for of in actual_openmpi_flavors():
+                            enable(cuda + "_aware_" + mpi + "_" + compiler + "_" + of)
+
     if len(build.getchildren()) > 0:
         build.getchildren()[-1].tail = "\n  "
 
@@ -822,7 +828,16 @@ Macros:
                     repo(cuda + "_aware_" + mpi + "_" + compiler,
                          ((project, cuda + "_" + mpi + "_" + compiler),),
                          cuda_aware_mpi=True,
-                         additional_tags=("Prefer: mpcdf_mpi_" + mpi + "_" + cuda,))
+                         additional_tags=("Prefer: mpcdf_mpi_" + mpi + "_" + cuda,
+                                          "Prefer: mpcdf_" + cuda,))
+                    for of in openmpi_flavors:
+                        dependencies = ((project, cuda + "_" + mpi + "_" + compiler),)
+                        if "mofed" in of:
+                            dependencies = (("extern:" + of, distribution),) + dependencies
+                        repo(cuda + "_aware_" + mpi + "_" + compiler + "_" + of,
+                             dependencies,
+                             cuda_aware_mpi=True, openmpi_flavor=of,
+                             additional_tags=("Prefer: mpcdf_" + cuda,))
 
     if old_repos and not remove_old:
         print("Warning: Keeping the prjconf sections for the following obsolete repositories:")