summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pavel <rspavel@lanl.gov>2020-12-11 01:08:02 -0700
committerGitHub <noreply@github.com>2020-12-11 09:08:02 +0100
commit1728b0ea250bc1ad7fc55ab9ebf377f52b0406f5 (patch)
treecd3dddcebd35c0653f5b9159acda974b33a9f19d
parent6f6855d4375dc668661a3052fc75ecad410b8abc (diff)
downloadspack-1728b0ea250bc1ad7fc55ab9ebf377f52b0406f5.tar.gz
spack-1728b0ea250bc1ad7fc55ab9ebf377f52b0406f5.tar.bz2
spack-1728b0ea250bc1ad7fc55ab9ebf377f52b0406f5.tar.xz
spack-1728b0ea250bc1ad7fc55ab9ebf377f52b0406f5.zip
flux: added v0.20.0 and v0.21.0 (#20322)
Fixed hard tab in flux-sched edit and unbound hwloc in flux-core after testing to better support modern MPIs in spack environments Verified that flux-core@0.17 is when hwloc@2: became viable
-rw-r--r--var/spack/repos/builtin/packages/flux-core/package.py5
-rw-r--r--var/spack/repos/builtin/packages/flux-sched/package.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py
index adb34f2611..7faa757526 100644
--- a/var/spack/repos/builtin/packages/flux-core/package.py
+++ b/var/spack/repos/builtin/packages/flux-core/package.py
@@ -15,6 +15,8 @@ class FluxCore(AutotoolsPackage):
git = "https://github.com/flux-framework/flux-core.git"
version('master', branch='master')
+ version('0.21.0', sha256='cc1b7a46d7c1c1a3e99e8861bba0dde89a97351eabd6f1b264788bd76e64c329')
+ version('0.20.0', sha256='2970b9b1c389fc4a381f9e605921ce0eb6aa9339387ea741978bcffb4bd81b6f')
version('0.19.0', sha256='f45328a37d989c308c46639a9ed771f47b11184422cf5604249919fbd320d6f5')
version('0.18.0', sha256='9784bbca94177a32dbbc99728e8925bf894f3aebaa316961d6ea85df32d59545')
version('0.17.0', sha256='3f8c6cb72982028f86a96c0098cacd3a6e9de359fa1cf077380c835a20e7b7f7')
@@ -39,7 +41,8 @@ class FluxCore(AutotoolsPackage):
depends_on("czmq")
depends_on("czmq@2.2:3.99", when="@0.1:0.6")
depends_on("czmq@3.0.1:", when="@0.7:")
- depends_on("hwloc@1.11.1:1.99")
+ depends_on("hwloc@1.11.1:1.99", when="@:0.17.0")
+ depends_on("hwloc@1.11.1:", when="@0.17.0:")
depends_on("hwloc +cuda", when='+cuda')
# Provide version hints for lua so that the concretizer succeeds when no
# explicit flux-core version is given. See issue #10000 for details
diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py
index 99bbce3b52..9b07a3d956 100644
--- a/var/spack/repos/builtin/packages/flux-sched/package.py
+++ b/var/spack/repos/builtin/packages/flux-sched/package.py
@@ -15,6 +15,8 @@ class FluxSched(AutotoolsPackage):
git = "https://github.com/flux-framework/flux-sched.git"
version('master', branch='master')
+ version('0.13.0', sha256='ba17fc0451239fe31a1524b6a270741873f59a5057514d2524fd3e9215c47a82')
+ version('0.12.0', sha256='b41ecaebba254abfb5a7995fd9100bd45a59d4ad0a79bdca8b3db02785d97b1d')
version('0.11.0', sha256='6a0e3c0678f85da8724e5399b02be9686311c835617f6036235ef54b489cc336')
version('0.10.0', sha256='5944927774709b5f52ddf64a0e825d9b0f24c9dea890b5504b87a8576d217cf6')
version('0.9.0', sha256='0e1eb408a937c2843bdaaed915d4d7e2ea763b98c31e7b849a96a74758d66a21')