hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

blis: FIX threads option, HPL: enable opemp variant for 2.3 (#16476)

Browse source 
* blis: FIX threads option

* HPL: openmp variant is ignored for 2.3

* blis: FIX flake8

* blis: FIX spacing

* Update var/spack/repos/builtin/packages/hpl/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* hpl: FIX spec --> self.spec, FIX blas with amdblis

* HPL: fix flake8

* HPL: FIX flake8

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
yellowhat 2020-05-06 21:36:29 +01:00 committed by GitHub
parent 1aacdc4e18
commit d1983d7395
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
var/spack/repos/builtin/packages/blis/package.py
View file

@ -104,7 +104,9 @@ def darwin_fix(self):
@property @property
def libs(self): def libs(self):
return find_libraries(['libblis'], root=self.prefix, recursive=True) return find_libraries(
["libblis", "libblis-mt"], root=self.prefix, recursive=True
)
class Blis(BlisBase): class Blis(BlisBase):

12
var/spack/repos/builtin/packages/hpl/package.py
View file

@ -101,9 +101,15 @@ def configure(self, spec, prefix):
@when('@2.3:') @when('@2.3:')
def configure_args(self): def configure_args(self):
config = [ filter_file(
'CFLAGS=-O3' r"^libs10=.*", "libs10=%s" % self.spec["blas"].libs.ld_flags,
] "configure"
)
if '+openmp' in self.spec:
config = ['CFLAGS=-O3 ' + self.compiler.openmp_flag]
else:
config = ['CFLAGS=-O3']
if (self.spec.satisfies('^intel-mkl') or if (self.spec.satisfies('^intel-mkl') or
self.spec.satisfies('^intel-parallel-studio+mkl')): self.spec.satisfies('^intel-parallel-studio+mkl')):