diff options
| author | Vanessasaurus <814322+vsoch@users.noreply.github.com> | 2023-04-07 18:27:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 20:27:32 -0400 |
| commit | 04209599ef093497ebe1401e029cddb12f3343d4 (patch) | |
| tree | 5c13fa00fdf8ee185b69f9396ddc2830bcd418a4 /var | |
| parent | 9d05e655780982b6732234ba9affecc2ba759ae7 (diff) | |
| download | spack-04209599ef093497ebe1401e029cddb12f3343d4.tar.gz spack-04209599ef093497ebe1401e029cddb12f3343d4.tar.bz2 spack-04209599ef093497ebe1401e029cddb12f3343d4.tar.xz spack-04209599ef093497ebe1401e029cddb12f3343d4.zip | |
Automated deployment to update package flux-pmix 2023-04-07 (#36700)
* Automated deployment to update package flux-pmix 2023-04-07
* fix style
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---------
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@users.noreply.github.com>
Co-authored-by: vsoch <vsoch@users.noreply.github.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/flux-pmix/package.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/flux-pmix/package.py b/var/spack/repos/builtin/packages/flux-pmix/package.py index 29c1fef112..5969da47b2 100644 --- a/var/spack/repos/builtin/packages/flux-pmix/package.py +++ b/var/spack/repos/builtin/packages/flux-pmix/package.py @@ -18,8 +18,10 @@ class FluxPmix(AutotoolsPackage): maintainers("grondo") version("main", branch="main") + version("0.3.0", sha256="88edb2afaeb6058b56ff915105a36972acc0d83204cff7f4a4d2f65a5dee9d34") version("0.2.0", sha256="d09f1fe6ffe54f83be4677e1e727640521d8110090515d94013eba0f58216934") + depends_on("flux-core@0.49.0:", when="@0.3.0:") depends_on("flux-core@0.30.0:") depends_on("pmix@v4.1.0:") depends_on("openmpi") @@ -37,10 +39,22 @@ class FluxPmix(AutotoolsPackage): @run_after("install") def add_pluginpath(self): - rcfile = join_path(self.prefix.etc, "flux/shell/lua.d/mpi/openmpi@5.lua") - filter_file( - r"pmix/pmix.so", join_path(self.prefix.lib, "flux/shell/plugins/pmix/pmix.so"), rcfile - ) + spec = self.spec + pluginpath = join_path(self.prefix.lib, "flux/shell/plugins/pmix.so") + if spec.satisfies("@:0.3.0"): + rcfile = join_path(self.prefix.etc, "flux/shell/lua.d/mpi/openmpi@5.lua") + filter_file(r"pmix/pmix.so", pluginpath) + else: + rcdir = join_path(self.prefix.etc, "flux/shell/lua.d") + rcfile = join_path(rcdir, "pmix.lua") + mkdirp(rcdir) + with open(rcfile, "w") as fp: + fp.write('plugin.load("' + pluginpath + '")') def setup_run_environment(self, env): + spec = self.spec env.prepend_path("FLUX_SHELL_RC_PATH", join_path(self.prefix, "etc/flux/shell/lua.d")) + if spec.satisfies("@0.3.0:"): + env.prepend_path( + "FLUX_PMI_CLIENT_SEARCHPATH", join_path(self.prefix, "flux/upmi/plugins") + ) |