From 49576070051488550d1da382f2ce6facd4a9eb6c Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Fri, 4 Aug 2023 15:04:54 -0700 Subject: 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 --- var/spack/repos/builtin/packages/aws-ofi-rccl/package.py | 4 ++-- var/spack/repos/builtin/packages/libfabric/package.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'var') 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") -- cgit v1.2.3-60-g2f50