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

Remove unnecessary if statements, which are harmful since +blas+lapack variants have been removed. (#42936)

Browse Source 
Co-authored-by: Yuichi Otsuka <otsukay@riken.jp>
This commit is contained in:
otsukay 2024-03-03 14:13:47 +09:00 committed by GitHub
parent a8a9e0160a
commit fcb2f7d3aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
var/spack/repos/builtin/packages/py-numpy/package.py
View File

@ -346,42 +346,36 @@ def write_library_dirs(f, dirs):
if "^netlib-lapack" in spec or "^cray-libsci" in spec: if "^netlib-lapack" in spec or "^cray-libsci" in spec:
# netlib and Cray require blas and lapack listed # netlib and Cray require blas and lapack listed
# separately so that scipy can find them # separately so that scipy can find them
if spec.satisfies("+blas"): f.write("[blas]\n")
f.write("[blas]\n") f.write("libraries = {0}\n".format(blas_lib_names))
f.write("libraries = {0}\n".format(blas_lib_names)) write_library_dirs(f, blas_lib_dirs)
write_library_dirs(f, blas_lib_dirs) f.write("include_dirs = {0}\n".format(blas_header_dirs))
f.write("include_dirs = {0}\n".format(blas_header_dirs)) f.write("[lapack]\n")
if spec.satisfies("+lapack"): f.write("libraries = {0}\n".format(lapack_lib_names))
f.write("[lapack]\n") write_library_dirs(f, lapack_lib_dirs)
f.write("libraries = {0}\n".format(lapack_lib_names)) f.write("include_dirs = {0}\n".format(lapack_header_dirs))
write_library_dirs(f, lapack_lib_dirs)
f.write("include_dirs = {0}\n".format(lapack_header_dirs))
if "^fujitsu-ssl2" in spec: if "^fujitsu-ssl2" in spec:
if spec.satisfies("+blas"): f.write("[blas]\n")
f.write("[blas]\n") f.write("libraries = {0}\n".format(spec["blas"].libs.names[0]))
f.write("libraries = {0}\n".format(spec["blas"].libs.names[0])) write_library_dirs(f, blas_lib_dirs)
write_library_dirs(f, blas_lib_dirs) f.write("include_dirs = {0}\n".format(blas_header_dirs))
f.write("include_dirs = {0}\n".format(blas_header_dirs)) f.write("extra_link_args = {0}\n".format(self.spec["blas"].libs.ld_flags))
f.write("extra_link_args = {0}\n".format(self.spec["blas"].libs.ld_flags)) f.write("[lapack]\n")
if spec.satisfies("+lapack"): f.write("libraries = {0}\n".format(spec["lapack"].libs.names[0]))
f.write("[lapack]\n") write_library_dirs(f, lapack_lib_dirs)
f.write("libraries = {0}\n".format(spec["lapack"].libs.names[0])) f.write("include_dirs = {0}\n".format(lapack_header_dirs))
write_library_dirs(f, lapack_lib_dirs) f.write("extra_link_args = {0}\n".format(self.spec["lapack"].libs.ld_flags))
f.write("include_dirs = {0}\n".format(lapack_header_dirs))
f.write("extra_link_args = {0}\n".format(self.spec["lapack"].libs.ld_flags))
if "^armpl-gcc" in spec or "^acfl" in spec: if "^armpl-gcc" in spec or "^acfl" in spec:
if spec.satisfies("+blas"): f.write("[blas]\n")
f.write("[blas]\n") f.write("libraries = {0}\n".format(blas_lib_names))
f.write("libraries = {0}\n".format(blas_lib_names)) write_library_dirs(f, blas_lib_dirs)
write_library_dirs(f, blas_lib_dirs) f.write("include_dirs = {0}\n".format(blas_header_dirs))
f.write("include_dirs = {0}\n".format(blas_header_dirs)) f.write("[lapack]\n")
if spec.satisfies("+lapack"): f.write("libraries = {0}\n".format(lapack_lib_names))
f.write("[lapack]\n") write_library_dirs(f, lapack_lib_dirs)
f.write("libraries = {0}\n".format(lapack_lib_names)) f.write("include_dirs = {0}\n".format(lapack_header_dirs))
write_library_dirs(f, lapack_lib_dirs)
f.write("include_dirs = {0}\n".format(lapack_header_dirs))
@when("@:1.25") @when("@:1.25")
@run_before("install") @run_before("install")