diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2019-10-28 13:24:50 -0700 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-10-28 13:24:50 -0700 |
| commit | 802c3c0c5133c44bd037cac2f798b0fe3ea444fb (patch) | |
| tree | 5ba3db4076b726ca5341565a9527f0b53e6582c2 | |
| parent | f4e6f28e6dc0f1b16ed81fe0e14b2ce653ff63a0 (diff) | |
| download | spack-802c3c0c5133c44bd037cac2f798b0fe3ea444fb.tar.gz spack-802c3c0c5133c44bd037cac2f798b0fe3ea444fb.tar.bz2 spack-802c3c0c5133c44bd037cac2f798b0fe3ea444fb.tar.xz spack-802c3c0c5133c44bd037cac2f798b0fe3ea444fb.zip | |
Packages: Add cuDNN versions; update LBANN dependencies (#13412)
* Add cuDNN version 7.6.3-10.1 (for x86_64 and ppc64le)
* Add py-pytest and py-protobuf depenencies to LBANN
| -rw-r--r-- | var/spack/repos/builtin/packages/cudnn/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index b56aacab4f..8a872ce949 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -13,6 +13,10 @@ class Cudnn(Package): homepage = "https://developer.nvidia.com/cudnn" + version('7.6.3-10.1-x86_64', sha256='352557346d8111e2f954c494be1a90207103d316b8777c33e62b3a7f7b708961', + url='https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.3/cudnn-10.1-linux-x64-v7.6.3.30.tgz') + version('7.6.3-10.1-ppc64le', sha256='f274735a8fc31923d3623b1c3d2b1d0d35bb176687077c6a4d4353c6b900d8ee', + url='https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.3/cudnn-10.1-linux-ppc64le-v7.6.3.30.tgz') version('7.5.1-10.1-x86_64', sha256='2c833f43c9147d9a25a20947a4c5a5f5c33b2443240fd767f63b330c482e68e0', url='https://developer.download.nvidia.com/compute/redist/cudnn/v7.5.1/cudnn-10.1-linux-x64-v7.5.1.10.tgz') version('7.5.1-10.1-ppc64le', sha256='a9e23bc83c970daec20874ccd1d8d80b648adf15440ecd0164818b330b1e2663', @@ -41,7 +45,7 @@ class Cudnn(Package): depends_on('cuda@8:', when='@5.1:@7') depends_on('cuda@9:', when='@7.2:@7.4') depends_on('cuda@10:', when='@7.5.0-10.0-ppc64le,7.5.0-10.0-x86_64,7.5.1-10.0-ppc64le,7.5.1-10.0-x86_64') - depends_on('cuda@10.1:', when='@7.5.0-10.1-ppc64le,7.5.0-10.1-x86_64,7.5.1-10.1-ppc64le,7.5.1-10.1-x86_64') + depends_on('cuda@10.1:', when='@7.5.0-10.1-ppc64le,7.5.0-10.1-x86_64,7.5.1-10.1-ppc64le,7.5.1-10.1-x86_64,7.6.3-10.1-ppc64le,7.6.3-10.1-x86_64') def install(self, spec, prefix): install_tree('.', prefix) diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index cf39b3e5c1..79fd5f0035 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -112,6 +112,8 @@ class Lbann(CMakePackage): depends_on('py-onnx@1.3.0:', type='run', when='@:0.90,0.99:') depends_on('py-pandas@0.24.1:', type='run', when='@:0.90,0.99:') depends_on('py-texttable@1.4.0:', type='run', when='@:0.90,0.99:') + depends_on('py-pytest', type='test', when='@:0.90,0.99:') + depends_on('py-protobuf+cpp', type='run', when='@:0.90,0.99:') depends_on('py-breathe', type='build', when='+docs') depends_on('py-m2r', type='build', when='+docs') |