Merge pull request #16730 from danbeibei/fcompiler

charris · web-flow · commit e7c1d0152556 · 2020-07-30T10:23:21.000-06:00
ENH: Use f90 compiler specified in f2py command line args for pgi compiler
diff --git a/doc/release/upcoming_changes/16730.improvement.rst b/doc/release/upcoming_changes/16730.improvement.rst
@@ -0,0 +1,9 @@
+Use f90 compiler specified in command line args
+--------------------------------------------------------
+
+The compiler command selection for Fortran Portland Group Compiler is changed in `numpy.distutils.fcompiler`.
+This only affects the linking command.
+This forces the use of the executable provided by the command line option (if provided)
+instead of the pgfortran executable.
+If no executable is provided to the command line option it defaults to the pgf90 executable,
+wich is an alias for pgfortran according to the PGI documentation.
diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py
@@ -31,7 +31,7 @@ class PGroupFCompiler(FCompiler):
             'compiler_f77': ["pgfortran"],
             'compiler_fix': ["pgfortran", "-Mfixed"],
             'compiler_f90': ["pgfortran"],
-            'linker_so': ["pgfortran"],
+            'linker_so': ["<F90>"],
             'archiver': ["ar", "-cr"],
             'ranlib': ["ranlib"]
         }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class PGroupFCompiler(FCompiler):`
`31`	`31`	`'compiler_f77': ["pgfortran"],`
`32`	`32`	`'compiler_fix': ["pgfortran", "-Mfixed"],`
`33`	`33`	`'compiler_f90': ["pgfortran"],`
`34`		`- 'linker_so': ["pgfortran"],`
	`34`	`+ 'linker_so': ["<F90>"],`
`35`	`35`	`'archiver': ["ar", "-cr"],`
`36`	`36`	`'ranlib': ["ranlib"]`
`37`	`37`	`}`