From f0cafd21ceaecd8243ea2b11653147afa0d3a53b Mon Sep 17 00:00:00 2001 From: "Tomoki, Karatsu" <49965247+t-karatsu@users.noreply.github.com> Date: Fri, 5 Feb 2021 01:58:48 +0900 Subject: py-numpy: Fix for new version of numpy with Fujitsu compiler. (#21479) * Change the version to apply patches. * Change the name of the Fujitsu compiler to 'fujitsu' in numpy. --- .../builtin/packages/py-numpy/add_fj_compiler.patch | 16 ++++++++-------- .../builtin/packages/py-numpy/add_fj_compiler2.patch | 16 ++++++++-------- .../builtin/packages/py-numpy/add_fj_compiler3.patch | 16 ++++++++-------- .../builtin/packages/py-numpy/add_fj_compiler4.patch | 16 ++++++++-------- var/spack/repos/builtin/packages/py-numpy/package.py | 2 +- var/spack/repos/builtin/packages/py-scipy/package.py | 2 +- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch index 7f1943e8cb..50df963581 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch @@ -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 ---- numpy-1.19.4.org/numpy/distutils/fcompiler/fj.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 +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/fujitsu.py 1970-01-01 09:00:00.000000000 +0900 ++++ numpy-1.19.4/numpy/distutils/fcompiler/fujitsu.py 2020-11-10 17:21:43.324928283 +0900 @@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + -+compilers = ['FJFCompiler'] ++compilers = ['FujitsuFCompiler'] + -+class FJFCompiler(FCompiler): -+ compiler_type = 'fj' ++class FujitsuFCompiler(FCompiler): ++ compiler_type = 'fujitsu' + description = 'Fujitsu Fortran Compiler' + + 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 numpy.distutils import customized_fcompiler + 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 --- 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 @@ -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')), ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'nv', 'absoft', 'nag', 'vast', 'compaq', - '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')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('irix.*', ('mips', 'gnu', 'gnu95',)), diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch index e69cc5839b..4526ddeadb 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch @@ -1,13 +1,13 @@ -diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py ---- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 17:55:57.608802456 +0900 +diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py +--- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900 ++++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 17:55:57.608802456 +0900 @@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + -+compilers = ['FJFCompiler'] ++compilers = ['FujitsuFCompiler'] + -+class FJFCompiler(FCompiler): -+ compiler_type = 'fj' ++class FujitsuFCompiler(FCompiler): ++ compiler_type = 'fujitsu' + description = 'Fujitsu Fortran Compiler' + + 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 numpy.distutils import customized_fcompiler + 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 --- 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 @@ -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')), ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', - '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')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('irix.*', ('mips', 'gnu', 'gnu95',)), diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch index 213cd32add..034cac069b 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch @@ -1,13 +1,13 @@ -diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py ---- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 18:30:06.698641953 +0900 +diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py +--- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900 ++++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 18:30:06.698641953 +0900 @@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + -+compilers = ['FJFCompiler'] ++compilers = ['FujitsuFCompiler'] + -+class FJFCompiler(FCompiler): -+ compiler_type = 'fj' ++class FujitsuFCompiler(FCompiler): ++ compiler_type = 'fujitsu' + description = 'Fujitsu Fortran Compiler' + + 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 numpy.distutils import customized_fcompiler + 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 --- 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 @@ -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')), ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', - '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')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('irix.*', ('mips', 'gnu', 'gnu95',)), diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch index b4acdb5c84..83f2be5d82 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch @@ -1,13 +1,13 @@ -diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py ---- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 18:42:47.672297372 +0900 +diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py +--- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900 ++++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 18:42:47.672297372 +0900 @@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + -+compilers = ['FJFCompiler'] ++compilers = ['FujitsuFCompiler'] + -+class FJFCompiler(FCompiler): -+ compiler_type = 'fj' ++class FujitsuFCompiler(FCompiler): ++ compiler_type = 'fujitsu' + description = 'Fujitsu Fortran Compiler' + + 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 numpy.distutils import customized_fcompiler + 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 --- 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 @@ -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')), ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', - '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')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('irix.*', ('mips', 'gnu', 'gnu95',)), diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 55d26b092a..920f8020ba 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -100,7 +100,7 @@ class PyNumpy(PythonPackage): patch('blas-lapack-order.patch', when='@1.15:1.16') # 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_compiler3.patch', when='@1.14.0:1.18.5%fj') patch('add_fj_compiler4.patch', when='@:1.13.3%fj') diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 1e03b05199..9e407a29a9 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -85,7 +85,7 @@ class PyScipy(PythonPackage): def build_args(self, spec, prefix): args = [] if spec.satisfies('%fj'): - args.extend(['config_fc', '--fcompiler=fj']) + args.extend(['config_fc', '--fcompiler=fujitsu']) # Build in parallel # Known problems with Python 3.5+ -- cgit v1.2.3-70-g09d2