Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert modules mods #972

Merged
merged 8 commits into from
Mar 8, 2024
Merged

Revert modules mods #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eed9831
test submodule
AlexanderRichert-NOAA Jan 26, 2024
fff4bbd
update meta_modules.py to support mpi provider module path with hash
AlexanderRichert-NOAA Jan 26, 2024
baf6cb8
fix meta_modules.py for case where building mpi provider
AlexanderRichert-NOAA Jan 27, 2024
1c07061
Revert "fix meta_modules.py for case where building mpi provider"
AlexanderRichert-NOAA Jan 27, 2024
e946769
fix meta_modules.py when building mpi
AlexanderRichert-NOAA Jan 27, 2024
a9975e2
submodule update
AlexanderRichert-NOAA Jan 27, 2024
0a8ee94
revert submodule
AlexanderRichert-NOAA Mar 8, 2024
c8b8dbd
Merge remote-tracking branch 'jcsda/develop' into revert_modules_mods
AlexanderRichert-NOAA Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 6 files
+1 −1 lib/spack/spack/modules/common.py
+2 −26 lib/spack/spack/modules/lmod.py
+7 −15 lib/spack/spack/test/modules/lmod.py
+2 −8 lib/spack/spack/test/modules/tcl.py
+8 −0 var/spack/repos/builtin/packages/awscli-v2/package.py
+7 −7 var/spack/repos/builtin/packages/py-shapely/shapely-1.8.0-geos.py.patch
8 changes: 4 additions & 4 deletions spack-ext/lib/jcsda-emc/spack-stack/stack/meta_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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()
#
Expand Down Expand Up @@ -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"])
Expand Down
Loading