diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2017-10-12 19:23:38 -0700 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-10-12 20:23:38 -0600 |
| commit | bd185b8146e0c2bc83ec113e16c81e41279cddab (patch) | |
| tree | 76e4a668c11a29b16f34ab42f945f5089252577f | |
| parent | f2a6685d8c79194ef0bb1fdffafed9a232082ab1 (diff) | |
| download | spack-bd185b8146e0c2bc83ec113e16c81e41279cddab.tar.gz spack-bd185b8146e0c2bc83ec113e16c81e41279cddab.tar.bz2 spack-bd185b8146e0c2bc83ec113e16c81e41279cddab.tar.xz spack-bd185b8146e0c2bc83ec113e16c81e41279cddab.zip | |
Lbann flags (#5747)
* Fixed the datatype flag in the LBANN package. Also added develop
version to OpenBLAS.
* Fixed where the datatype flag should be set.
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openblas/package.py | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index a1f1a19948..1e4c484c63 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -60,9 +60,6 @@ class Lbann(CMakePackage): CPPFLAGS = [] CPPFLAGS.append('-DLBANN_SET_EL_RNG') - CPPFLAGS.append('-DLBANN_DATATYPE={0}'.format( - int(spec.variants['dtype'].value))) - args = [ '-DCMAKE_INSTALL_MESSAGE=LAZY', '-DCMAKE_CXX_FLAGS=%s' % ' '.join(CPPFLAGS), @@ -77,6 +74,7 @@ class Lbann(CMakePackage): '-DELEMENTAL_MATH_LIBS={0}'.format( spec['elemental'].libs), '-DSEQ_INIT:BOOL=%s' % ('+seq_init' in spec), + '-DDATATYPE={0}'.format(int(spec.variants['dtype'].value)), '-DVERBOSE=0', '-DLBANN_HOME=.', '-DLBANN_VER=spack'] diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 1cf436df1f..b2e792c18c 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -33,6 +33,7 @@ class Openblas(MakefilePackage): homepage = 'http://www.openblas.net' url = 'http://github.com/xianyi/OpenBLAS/archive/v0.2.19.tar.gz' + version('develop', git='https://github.com/xianyi/OpenBLAS.git', branch="develop") version('0.2.20', '48637eb29f5b492b91459175dcc574b1') version('0.2.19', '28c998054fd377279741c6f0b9ea7941') version('0.2.18', '805e7f660877d588ea7e3792cda2ee65') |