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

py-scipy: Fortran compiler specify code is change to setup.cfg for Fujitsu compiler (#32142)

Browse Source 
* py-numpy: Change Fortran detect order for Fujitsu Compiler.

* create setup.cfg instead of command line.
This commit is contained in:
Toyohisa Kameyama 2022-08-24 02:06:49 +09:00 committed by GitHub
parent 00feccde34
commit a08d6e790d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/py-scipy/package.py
View File

@ -112,6 +112,13 @@ def set_blas_lapack(self):
# Pick up Blas/Lapack from numpy # Pick up Blas/Lapack from numpy
self.spec["py-numpy"].package.set_blas_lapack() self.spec["py-numpy"].package.set_blas_lapack()
@run_before("install")
def set_fortran_compiler(self):
if self.spec.satisfies("%fj"):
with open("setup.cfg", "w") as f:
f.write("[config_fc]\n")
f.write("fcompiler = fujitsu\n")
def setup_build_environment(self, env): def setup_build_environment(self, env):
# https://github.com/scipy/scipy/issues/9080 # https://github.com/scipy/scipy/issues/9080
env.set("F90", spack_fc) env.set("F90", spack_fc)
@ -125,12 +132,6 @@ def setup_build_environment(self, env):
# Pick up Blas/Lapack from numpy # Pick up Blas/Lapack from numpy
self.spec["py-numpy"].package.setup_build_environment(env) self.spec["py-numpy"].package.setup_build_environment(env)
def install_options(self, spec, prefix):
args = []
if spec.satisfies("%fj"):
args.extend(["config_fc", "--fcompiler=fujitsu"])
return args
@run_after("install") @run_after("install")
@on_package_attributes(run_tests=True) @on_package_attributes(run_tests=True)
def install_test(self): def install_test(self):