Merge branch 'develop' of https://github.com/jcsda/spack-stack into b…

…ugfix/discover_scu16_ldflags
JCSDA · Mar 8, 2024 · 14fd885 · 14fd885
2 parents 1a26f1e + b148ba5
commit 14fd885
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py b/spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py
@@ -466,7 +466,7 @@ def setup_meta_modules():
                             (package_name_dummy, package_version) = get_name_and_version_from_spec(
                                 package_config[package_name]["externals"][i]["spec"]
                             )
-                            if package_version == mpi_version:
+                            if package_version == mpi_version.split("-")[0]:
                                 package_found = True
                                 external_mpi_package_config = package_config[package_name][
                                     "externals"
@@ -511,7 +511,7 @@ def setup_meta_modules():
                         module_dir, compiler_name, compiler_version, "stack-" + mpi_name
                     )
                     mpi_module_file = os.path.join(
-                        mpi_module_dir, mpi_version + MODULE_FILE_EXTENSION[module_choice]
+                        mpi_module_dir, mpi_version.split("-")[0] + MODULE_FILE_EXTENSION[module_choice]
                     )
                     substitutes = SUBSTITUTES_TEMPLATE.copy()
                     #
@@ -600,10 +600,10 @@ def setup_meta_modules():
                         # and load it with the wrapper, don't set any of the other substitutes
                         module = "{}/{}".format(mpi_name, mpi_version)
                         substitutes["MODULELOADS"] += module_load_command(
-                            module_choice, module
+                            module_choice, module.split("-")[0]
                         ).rstrip("\n")
                         substitutes["MODULEPREREQS"] += module_prereq_command(
-                            module_choice, module
+                            module_choice, module.split("-")[0]
                         ).rstrip("\n")
                         logging.debug(
                             "  ... ... MODULELOADS: {}".format(substitutes["MODULELOADS"])