From bd185b8146e0c2bc83ec113e16c81e41279cddab Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Thu, 12 Oct 2017 19:23:38 -0700 Subject: [PATCH] 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. --- var/spack/repos/builtin/packages/lbann/package.py | 4 +--- 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 @@ def cmake_args(self): 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 @@ def cmake_args(self): '-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')