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

release/1.5.0: always apply Python cray-rpath patch, add missing dependencies for gsi-env, add conflicts for mapl variants #322

Merged
merged 4 commits into from
Sep 12, 2023
Merged

release/1.5.0: always apply Python cray-rpath patch, add missing dependencies for gsi-env, add conflicts for mapl variants #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23b350c
Rename var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch a…
climbfuji Sep 11, 2023
5d9f1c7
Add missing dependencies blas and lapack to gsi-env virtual package
climbfuji Sep 11, 2023
79fd79d
Add conflict statements for mapl variants pflogger and extdata2g with…
climbfuji Sep 11, 2023
2b150c8
Revert previous change for tcl modulefiles to test for both LMOD_VERS…
climbfuji Sep 11, 2023
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
45 changes: 5 additions & 40 deletions lib/spack/spack/test/modules/tcl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@ def test_autoload_direct(self, modulefile_content, module_configuration):
content = modulefile_content(mpileaks_spec_string)

assert (
len(
[
x
for x in content
if "if {![info exists ::env(LMOD_VERSION_MAJOR)] && ![info exists ::env(LMOD_VERSION)]} {" # noqa: E501
in x
]
)
len([x for x in content if "if {![info exists ::env(LMOD_VERSION_MAJOR)]} {" in x])
== 1
)
assert len([x for x in content if "depends-on " in x]) == 2
Expand All @@ -59,14 +52,7 @@ def test_autoload_direct(self, modulefile_content, module_configuration):
content = modulefile_content("dtbuild1")

assert (
len(
[
x
for x in content
if "if {![info exists ::env(LMOD_VERSION_MAJOR)] && ![info exists ::env(LMOD_VERSION)]} {" # noqa: E501
in x
]
)
len([x for x in content if "if {![info exists ::env(LMOD_VERSION_MAJOR)]} {" in x])
== 1
)
assert len([x for x in content if "depends-on " in x]) == 2
Expand All @@ -83,14 +69,7 @@ def test_autoload_all(self, modulefile_content, module_configuration):
content = modulefile_content(mpileaks_spec_string)

assert (
len(
[
x
for x in content
if "if {![info exists ::env(LMOD_VERSION_MAJOR)] && ![info exists ::env(LMOD_VERSION)]} {" # noqa: E501
in x
]
)
len([x for x in content if "if {![info exists ::env(LMOD_VERSION_MAJOR)]} {" in x])
== 1
)
assert len([x for x in content if "depends-on " in x]) == 5
Expand All @@ -104,14 +83,7 @@ def test_autoload_all(self, modulefile_content, module_configuration):
content = modulefile_content("dtbuild1")

assert (
len(
[
x
for x in content
if "if {![info exists ::env(LMOD_VERSION_MAJOR)] && ![info exists ::env(LMOD_VERSION)]} {" # noqa: E501
in x
]
)
len([x for x in content if "if {![info exists ::env(LMOD_VERSION_MAJOR)]} {" in x])
== 1
)
assert len([x for x in content if "depends-on " in x]) == 2
Expand Down Expand Up @@ -504,14 +476,7 @@ def test_autoload_with_constraints(self, modulefile_content, module_configuratio
# Test the mpileaks that should NOT have the autoloaded dependencies
content = modulefile_content("mpileaks ^mpich")
assert (
len(
[
x
for x in content
if "if {![info exists ::env(LMOD_VERSION_MAJOR)] && ![info exists ::env(LMOD_VERSION)]} {" # noqa: E501
in x
]
)
len([x for x in content if "if {![info exists ::env(LMOD_VERSION_MAJOR)]} {" in x])
== 0
)
assert len([x for x in content if "depends-on " in x]) == 0
Expand Down
2 changes: 1 addition & 1 deletion share/spack/templates/modules/modulefile.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ proc ModulesHelp { } {

{% block autoloads %}
{% if autoload|length > 0 %}
if {![info exists ::env(LMOD_VERSION_MAJOR)] && ![info exists ::env(LMOD_VERSION)]} {
if {![info exists ::env(LMOD_VERSION_MAJOR)]} {
{% for module in autoload %}
module load {{ module }}
{% endfor %}
Expand Down
4 changes: 4 additions & 0 deletions var/spack/repos/builtin/packages/mapl/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ class Mapl(CMakePackage):
values=("Debug", "Release", "Aggressive"),
)

# https://github.com/JCSDA/spack-stack/issues/769
conflicts("+pflogger", when="@:2.40.3 %[email protected]:")
conflicts("+extdata2g", when="@:2.40.3 %[email protected]:")

depends_on("[email protected]:", type="build")
depends_on("mpi")
depends_on("hdf5")
Expand Down
4 changes: 2 additions & 2 deletions var/spack/repos/builtin/packages/python/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ class Python(Package):
patch("tkinter-3.10.patch", when="@3.10.0:3.10 ~tkinter")
patch("tkinter-3.11.patch", when="@3.11.0:3.11 ~tkinter")

# Ensure that distutils chooses correct compiler option for RPATH on cray:
patch("cray-rpath-3.1.patch", when="@3 platform=cray")
# Ensure that distutils chooses correct compiler option for RPATH:
patch("rpath-non-gcc.patch")

# Ensure that distutils chooses correct compiler option for RPATH on fj:
patch("fj-rpath-3.1.patch", when="@:3.9.7,3.10.0 %fj")
Expand Down
0 ...ltin/packages/python/cray-rpath-3.1.patch → ...iltin/packages/python/rpath-non-gcc.patch
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions var/spack/repos/jcsda-emc-bundles/packages/gsi-env/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class GsiEnv(BundlePackage):

version("1.0.0")

depends_on("blas")
depends_on("lapack")
depends_on("netcdf-c")
depends_on("netcdf-fortran")
depends_on("bufr")
Expand Down