zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cp2k: fix build issues without cuda, and with elpa on openSUSE (#27738)

Browse Source
This commit is contained in:
Tiziano Müller 2021-12-02 00:00:01 +01:00 committed by GitHub
parent 326acea29d
commit 08b00f8804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/cp2k/package.py
View File

@ -486,11 +486,11 @@ def edit(self, spec, prefix):
# Currently AOCC support only static libraries of ELPA # Currently AOCC support only static libraries of ELPA
if '%aocc' in spec: if '%aocc' in spec:
libs.append(join_path(elpa.prefix.lib, libs.append(join_path(elpa.libs.directories[0],
('libelpa{elpa_suffix}.a' ('libelpa{elpa_suffix}.a'
.format(elpa_suffix=elpa_suffix)))) .format(elpa_suffix=elpa_suffix))))
else: else:
libs.append(join_path(elpa.prefix.lib, libs.append(join_path(elpa.libs.directories[0],
('libelpa{elpa_suffix}.{dso_suffix}' ('libelpa{elpa_suffix}.{dso_suffix}'
.format(elpa_suffix=elpa_suffix, .format(elpa_suffix=elpa_suffix,
dso_suffix=dso_suffix)))) dso_suffix=dso_suffix))))
@ -661,7 +661,7 @@ def build_targets(self):
] ]
def build(self, spec, prefix): def build(self, spec, prefix):
if len(spec.variants['cuda_arch'].value) > 1: if '+cuda' in spec and len(spec.variants['cuda_arch'].value) > 1:
raise InstallError("cp2k supports only one cuda_arch at a time") raise InstallError("cp2k supports only one cuda_arch at a time")
# Apparently the Makefile bases its paths on PWD # Apparently the Makefile bases its paths on PWD