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

py-numpy: Fix for new version of numpy with Fujitsu compiler. (#21479)

Browse source 
* Change the version to apply patches.

* Change the name of the Fujitsu compiler to 'fujitsu' in numpy.
This commit is contained in:
Tomoki, Karatsu 2021-02-05 01:58:48 +09:00 committed by GitHub
parent df5992293a
commit f0cafd21ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch
View file

@ -1,13 +1,13 @@
diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/fj.py numpy-1.19.4/numpy/distutils/fcompiler/fj.py diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/fujitsu.py numpy-1.19.4/numpy/distutils/fcompiler/fujitsu.py
--- numpy-1.19.4.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 --- numpy-1.19.4.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900
+++ numpy-1.19.4/numpy/distutils/fcompiler/fj.py 2020-11-10 17:21:43.324928283 +0900 +++ numpy-1.19.4/numpy/distutils/fcompiler/fujitsu.py 2020-11-10 17:21:43.324928283 +0900
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+from numpy.distutils.fcompiler import FCompiler +from numpy.distutils.fcompiler import FCompiler
+ +
+compilers = ['FJFCompiler'] +compilers = ['FujitsuFCompiler']
+ +
+class FJFCompiler(FCompiler): +class FujitsuFCompiler(FCompiler):
+ compiler_type = 'fj' + compiler_type = 'fujitsu'
+ description = 'Fujitsu Fortran Compiler' + description = 'Fujitsu Fortran Compiler'
+ +
+ possible_executables = ['frt'] + possible_executables = ['frt']
@ -41,7 +41,7 @@ diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/fj.py numpy-1.19.4/numpy/di
+ from distutils import log + from distutils import log
+ from numpy.distutils import customized_fcompiler + from numpy.distutils import customized_fcompiler
+ log.set_verbosity(2) + log.set_verbosity(2)
+ print(customized_fcompiler('fj').get_version()) + print(customized_fcompiler('fujitsu').get_version())
diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/__init__.py numpy-1.19.4/numpy/distutils/fcompiler/__init__.py diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/__init__.py numpy-1.19.4/numpy/distutils/fcompiler/__init__.py
--- numpy-1.19.4.org/numpy/distutils/fcompiler/__init__.py 2020-11-09 10:51:35.693490207 +0900 --- numpy-1.19.4.org/numpy/distutils/fcompiler/__init__.py 2020-11-09 10:51:35.693490207 +0900
+++ numpy-1.19.4/numpy/distutils/fcompiler/__init__.py 2020-11-16 17:48:49.316744476 +0900 +++ numpy-1.19.4/numpy/distutils/fcompiler/__init__.py 2020-11-16 17:48:49.316744476 +0900
@ -50,7 +50,7 @@ diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/__init__.py numpy-1.19.4/nu
('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')), ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'nv', 'absoft', 'nag', 'vast', 'compaq', ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'nv', 'absoft', 'nag', 'vast', 'compaq',
- 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')), - 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')),
+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fj')), + 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fujitsu')),
('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
('irix.*', ('mips', 'gnu', 'gnu95',)), ('irix.*', ('mips', 'gnu', 'gnu95',)),

16
var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch
View file

@ -1,13 +1,13 @@
diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py
--- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 --- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900
+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 17:55:57.608802456 +0900 +++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 17:55:57.608802456 +0900
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+from numpy.distutils.fcompiler import FCompiler +from numpy.distutils.fcompiler import FCompiler
+ +
+compilers = ['FJFCompiler'] +compilers = ['FujitsuFCompiler']
+ +
+class FJFCompiler(FCompiler): +class FujitsuFCompiler(FCompiler):
+ compiler_type = 'fj' + compiler_type = 'fujitsu'
+ description = 'Fujitsu Fortran Compiler' + description = 'Fujitsu Fortran Compiler'
+ +
+ possible_executables = ['frt'] + possible_executables = ['frt']
@ -41,7 +41,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutil
+ from distutils import log + from distutils import log
+ from numpy.distutils import customized_fcompiler + from numpy.distutils import customized_fcompiler
+ log.set_verbosity(2) + log.set_verbosity(2)
+ print(customized_fcompiler('fj').get_version()) + print(customized_fcompiler('fujitsu').get_version())
diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py
--- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 17:55:31.638677631 +0900 --- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 17:55:31.638677631 +0900
+++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 17:56:29.978957954 +0900 +++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 17:56:29.978957954 +0900
@ -50,7 +50,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/di
('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')), ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
- 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')), - 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')),
+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fj')), + 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fujitsu')),
('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
('irix.*', ('mips', 'gnu', 'gnu95',)), ('irix.*', ('mips', 'gnu', 'gnu95',)),

16
var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch
View file

@ -1,13 +1,13 @@
diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py
--- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 --- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900
+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 18:30:06.698641953 +0900 +++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 18:30:06.698641953 +0900
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+from numpy.distutils.fcompiler import FCompiler +from numpy.distutils.fcompiler import FCompiler
+ +
+compilers = ['FJFCompiler'] +compilers = ['FujitsuFCompiler']
+ +
+class FJFCompiler(FCompiler): +class FujitsuFCompiler(FCompiler):
+ compiler_type = 'fj' + compiler_type = 'fujitsu'
+ description = 'Fujitsu Fortran Compiler' + description = 'Fujitsu Fortran Compiler'
+ +
+ possible_executables = ['frt'] + possible_executables = ['frt']
@ -41,7 +41,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutil
+ from distutils import log + from distutils import log
+ from numpy.distutils import customized_fcompiler + from numpy.distutils import customized_fcompiler
+ log.set_verbosity(2) + log.set_verbosity(2)
+ print(customized_fcompiler('fj').get_version()) + print(customized_fcompiler('fujitsu').get_version())
diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py
--- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:25:26.087294181 +0900 --- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:25:26.087294181 +0900
+++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:26:19.987553070 +0900 +++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:26:19.987553070 +0900
@ -50,7 +50,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/di
('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')), ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
- 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')), - 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')),
+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fj')), + 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fujitsu')),
('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
('irix.*', ('mips', 'gnu', 'gnu95',)), ('irix.*', ('mips', 'gnu', 'gnu95',)),

16
var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch
View file

@ -1,13 +1,13 @@
diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py
--- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 --- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900
+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 18:42:47.672297372 +0900 +++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 18:42:47.672297372 +0900
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+from numpy.distutils.fcompiler import FCompiler +from numpy.distutils.fcompiler import FCompiler
+ +
+compilers = ['FJFCompiler'] +compilers = ['FujitsuFCompiler']
+ +
+class FJFCompiler(FCompiler): +class FujitsuFCompiler(FCompiler):
+ compiler_type = 'fj' + compiler_type = 'fujitsu'
+ description = 'Fujitsu Fortran Compiler' + description = 'Fujitsu Fortran Compiler'
+ +
+ possible_executables = ['frt'] + possible_executables = ['frt']
@ -41,7 +41,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutil
+ from distutils import log + from distutils import log
+ from numpy.distutils import customized_fcompiler + from numpy.distutils import customized_fcompiler
+ log.set_verbosity(2) + log.set_verbosity(2)
+ print(customized_fcompiler('fj').get_version()) + print(customized_fcompiler('fujitsu').get_version())
diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py
--- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:43:18.112443626 +0900 --- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:43:18.112443626 +0900
+++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:44:54.062904636 +0900 +++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:44:54.062904636 +0900
@ -50,7 +50,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/di
('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')), ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
- 'intele', 'intelem', 'gnu', 'g95', 'pathf95')), - 'intele', 'intelem', 'gnu', 'g95', 'pathf95')),
+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'fj')), + 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'fujitsu')),
('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
('irix.*', ('mips', 'gnu', 'gnu95',)), ('irix.*', ('mips', 'gnu', 'gnu95',)),

2
var/spack/repos/builtin/packages/py-numpy/package.py
View file

@ -100,7 +100,7 @@ class PyNumpy(PythonPackage):
patch('blas-lapack-order.patch', when='@1.15:1.16') patch('blas-lapack-order.patch', when='@1.15:1.16')
# Add Fujitsu Fortran compiler # Add Fujitsu Fortran compiler
patch('add_fj_compiler.patch', when='@1.19.3:%fj') patch('add_fj_compiler.patch', when='@1.19.3:1.19.5%fj')
patch('add_fj_compiler2.patch', when='@1.19.0:1.19.2%fj') patch('add_fj_compiler2.patch', when='@1.19.0:1.19.2%fj')
patch('add_fj_compiler3.patch', when='@1.14.0:1.18.5%fj') patch('add_fj_compiler3.patch', when='@1.14.0:1.18.5%fj')
patch('add_fj_compiler4.patch', when='@:1.13.3%fj') patch('add_fj_compiler4.patch', when='@:1.13.3%fj')

2
var/spack/repos/builtin/packages/py-scipy/package.py
View file

@ -85,7 +85,7 @@ def setup_build_environment(self, env):
def build_args(self, spec, prefix): def build_args(self, spec, prefix):
args = [] args = []
if spec.satisfies('%fj'): if spec.satisfies('%fj'):
args.extend(['config_fc', '--fcompiler=fj']) args.extend(['config_fc', '--fcompiler=fujitsu'])
# Build in parallel # Build in parallel
# Known problems with Python 3.5+ # Known problems with Python 3.5+