diff options
author | Tracy-Pantleo <91685320+Tracy-Pantleo@users.noreply.github.com> | 2022-03-09 18:11:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-09 17:11:14 -0800 |
commit | 9ab21024e26ab0394475d957a0ca2c5246cce35d (patch) | |
tree | 7ea75e891ff72dd193832abe0070cee8cafb68db /var | |
parent | a4703b122078107856abea5327a56e040e044bd4 (diff) | |
download | spack-9ab21024e26ab0394475d957a0ca2c5246cce35d.tar.gz spack-9ab21024e26ab0394475d957a0ca2c5246cce35d.tar.bz2 spack-9ab21024e26ab0394475d957a0ca2c5246cce35d.tar.xz spack-9ab21024e26ab0394475d957a0ca2c5246cce35d.zip |
Jali/Wonton packages: add version 1.1.6 and 1.3.2, respectively (#28597)
* The new version of Wonton requires the new version of Jali
* Wonton: versions after 1.2.10 don't require boost at all
Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/jali/package.py | 2 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/wonton/package.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/jali/package.py b/var/spack/repos/builtin/packages/jali/package.py index 859e0e658c..e6fc10e8b7 100644 --- a/var/spack/repos/builtin/packages/jali/package.py +++ b/var/spack/repos/builtin/packages/jali/package.py @@ -18,7 +18,7 @@ class Jali(CMakePackage): maintainers = ['raovgarimella'] version('master', branch='master') - version('1.1.6', sha256='1321c0ca847bb74f760398a25eeb640d09f87764d3527737d9b84d7ce601d163') + version('1.1.6', sha256='a2f4e4f238c60ea78486e0c9ea5b3e2cdd9d91c2ae5ea006a1d33a12e9eafa3a') version('1.1.5', sha256='4f18f3e8b50f20a89918e99596a7226c215944d84df642bc1fb2d6c31464b95b') version('1.1.4', sha256='135ab02be1487fcdfb039613cbed630bce336d581a66468c66209db0a9d8a104') version('1.1.1', sha256='c96c000b3893ea7f15bbc886524476dd466ae145e77deedc27e412fcc3541207') diff --git a/var/spack/repos/builtin/packages/wonton/package.py b/var/spack/repos/builtin/packages/wonton/package.py index 9ea9013171..23c22d08fe 100644 --- a/var/spack/repos/builtin/packages/wonton/package.py +++ b/var/spack/repos/builtin/packages/wonton/package.py @@ -21,6 +21,7 @@ class Wonton(CMakePackage): maintainers = ['raovgarimella'] + version('1.3.2', sha256='a03f00cd95290c2dbe8724d430de19537ea644b75161614ed4ac918376fcf64d') version('1.2.11', sha256='613436c799b392a99355db1cbf1062f1da39f3287eed665a5cd43bb65364d926') version('1.2.10', sha256='c5c2c99f040f1fa5a8da21ac5ccbbc5b226d1fd43ce3eb14c76d211601b65a72') version('1.2.1', sha256='4f00513d1abe86f256214d2b5171b1575b2cd464df8609307c24cbc4c595c305') @@ -49,15 +50,14 @@ class Wonton(CMakePackage): depends_on('mpi', when='+mpi') depends_on('flecsi', when='+flecsi') + depends_on('jali@1.1.6', when='@1.3.2: +jali') depends_on('jali +mstk', when='+jali') depends_on('mpi', when='+jali') - # We need boost only when no thrust option - depends_on('boost', when='~thrust') - - # NVidia thrust library depends_on('thrust@1.8.3', when='+thrust') + depends_on('boost', when='@:1.2.10 ~thrust') + # CUDA library depends_on('cuda', when='+cuda') |