summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2023-08-04 15:04:54 -0700
committerGitHub <noreply@github.com>2023-08-04 15:04:54 -0700
commit49576070051488550d1da382f2ce6facd4a9eb6c (patch)
treeef4bb4df25564a9609992696753242551b8d164b
parent78bca131fb4fa0981f6abf30d2ec790656ef8812 (diff)
downloadspack-49576070051488550d1da382f2ce6facd4a9eb6c.tar.gz
spack-49576070051488550d1da382f2ce6facd4a9eb6c.tar.bz2
spack-49576070051488550d1da382f2ce6facd4a9eb6c.tar.xz
spack-49576070051488550d1da382f2ce6facd4a9eb6c.zip
FIX libfabric module file (#39271)
* Add support to export the LD_LIBRARY_PATH for the libfabric package and subsequent module files. Fix the AWS OFI RCCL package so that it prepends the enviornment variables. * Fixed comment
-rw-r--r--var/spack/repos/builtin/packages/aws-ofi-rccl/package.py4
-rw-r--r--var/spack/repos/builtin/packages/libfabric/package.py10
2 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py
index 76fab34439..d21a1600d6 100644
--- a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py
+++ b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py
@@ -35,12 +35,12 @@ class AwsOfiRccl(AutotoolsPackage):
# To enable this plug-in to work with RCCL add it to the LD_LIBRARY_PATH
def setup_run_environment(self, env):
aws_ofi_rccl_home = self.spec["aws-ofi-rccl"].prefix
- env.append_path("LD_LIBRARY_PATH", aws_ofi_rccl_home.lib)
+ env.prepend_path("LD_LIBRARY_PATH", aws_ofi_rccl_home.lib)
# To enable this plug-in to work with RCCL add it to the LD_LIBRARY_PATH
def setup_dependent_run_environment(self, env, dependent_spec):
aws_ofi_rccl_home = self.spec["aws-ofi-rccl"].prefix
- env.append_path("LD_LIBRARY_PATH", aws_ofi_rccl_home.lib)
+ env.prepend_path("LD_LIBRARY_PATH", aws_ofi_rccl_home.lib)
def configure_args(self):
spec = self.spec
diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py
index 0f48b16f9a..0c296736fb 100644
--- a/var/spack/repos/builtin/packages/libfabric/package.py
+++ b/var/spack/repos/builtin/packages/libfabric/package.py
@@ -153,6 +153,16 @@ class Libfabric(AutotoolsPackage):
if self.run_tests:
env.prepend_path("PATH", self.prefix.bin)
+ # To enable this package add it to the LD_LIBRARY_PATH
+ def setup_run_environment(self, env):
+ libfabric_home = self.spec["libfabric"].prefix
+ env.prepend_path("LD_LIBRARY_PATH", libfabric_home.lib)
+
+ # To enable this package add it to the LD_LIBRARY_PATH
+ def setup_dependent_run_environment(self, env, dependent_spec):
+ libfabric_home = self.spec["libfabric"].prefix
+ env.prepend_path("LD_LIBRARY_PATH", libfabric_home.lib)
+
@when("@main")
def autoreconf(self, spec, prefix):
bash = which("bash")