summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--numpy/distutils/__init__.py12
-rw-r--r--numpy/distutils/fcompiler/absoft.py6
-rw-r--r--numpy/distutils/fcompiler/compaq.py6
-rw-r--r--numpy/distutils/fcompiler/g95.py5
-rw-r--r--numpy/distutils/fcompiler/gnu.py13
-rw-r--r--numpy/distutils/fcompiler/hpux.py6
-rw-r--r--numpy/distutils/fcompiler/ibm.py5
-rw-r--r--numpy/distutils/fcompiler/intel.py6
-rw-r--r--numpy/distutils/fcompiler/lahey.py6
-rw-r--r--numpy/distutils/fcompiler/mips.py6
-rw-r--r--numpy/distutils/fcompiler/nag.py5
-rw-r--r--numpy/distutils/fcompiler/none.py5
-rw-r--r--numpy/distutils/fcompiler/pathf95.py7
-rw-r--r--numpy/distutils/fcompiler/pg.py6
-rw-r--r--numpy/distutils/fcompiler/sun.py6
-rw-r--r--numpy/distutils/fcompiler/vast.py6
-rw-r--r--numpy/distutils/system_info.py13
-rw-r--r--numpy/distutils/tests/test_system_info.py11
18 files changed, 53 insertions, 77 deletions
diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py
index 602a3d117..0450334ff 100644
--- a/numpy/distutils/__init__.py
+++ b/numpy/distutils/__init__.py
@@ -21,3 +21,15 @@ try:
test = _numpy_tester().test
except ImportError:
pass
+
+
+def customized_fcompiler(plat=None, compiler=None):
+ from numpy.distutils.fcompiler import new_fcompiler
+ c = new_fcompiler(plat=plat, compiler=compiler)
+ c.customize()
+ return c
+
+def customized_ccompiler(plat=None, compiler=None):
+ c = ccompiler.new_compiler(plat=plat, compiler=compiler)
+ c.customize('')
+ return c
diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py
index bde0529be..2c3edfe02 100644
--- a/numpy/distutils/fcompiler/absoft.py
+++ b/numpy/distutils/fcompiler/absoft.py
@@ -154,7 +154,5 @@ class AbsoftFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='absoft')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='absoft').get_version())
diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py
index 1510ca9d8..07d502706 100644
--- a/numpy/distutils/fcompiler/compaq.py
+++ b/numpy/distutils/fcompiler/compaq.py
@@ -122,7 +122,5 @@ class CompaqVisualFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='compaq')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='compaq').get_version())
diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py
index 26f73b530..e7c659b33 100644
--- a/numpy/distutils/fcompiler/g95.py
+++ b/numpy/distutils/fcompiler/g95.py
@@ -39,7 +39,6 @@ class G95FCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
+ from numpy.distutils import customized_fcompiler
log.set_verbosity(2)
- compiler = G95FCompiler()
- compiler.customize()
- print(compiler.get_version())
+ print(customized_fcompiler('g95').get_version())
diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py
index 10c60dc6f..ccd73ad58 100644
--- a/numpy/distutils/fcompiler/gnu.py
+++ b/numpy/distutils/fcompiler/gnu.py
@@ -504,16 +504,11 @@ def _can_target(cmd, arch):
if __name__ == '__main__':
from distutils import log
+ from numpy.distutils import customized_fcompiler
log.set_verbosity(2)
- compiler = GnuFCompiler()
- compiler.customize()
- print(compiler.get_version())
-
+ print(customized_fcompiler('gnu').get_version())
try:
- compiler = Gnu95FCompiler()
- compiler.customize()
- print(compiler.get_version())
+ print(customized_fcompiler('g95').get_version())
except Exception:
- msg = get_exception()
- print(msg)
+ print(get_exception())
diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py
index 9004961e1..51bad548a 100644
--- a/numpy/distutils/fcompiler/hpux.py
+++ b/numpy/distutils/fcompiler/hpux.py
@@ -39,7 +39,5 @@ class HPUXFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(10)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='hpux')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='hpux').get_version())
diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py
index 388ec99b1..d0c2202d4 100644
--- a/numpy/distutils/fcompiler/ibm.py
+++ b/numpy/distutils/fcompiler/ibm.py
@@ -90,7 +90,6 @@ class IBMFCompiler(FCompiler):
return ['-O3']
if __name__ == '__main__':
+ from numpy.distutils import customized_fcompiler
log.set_verbosity(2)
- compiler = IBMFCompiler()
- compiler.customize()
- print(compiler.get_version())
+ print(customized_fcompiler(compiler='ibm').get_version())
diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py
index e3b922edc..217eac8fb 100644
--- a/numpy/distutils/fcompiler/intel.py
+++ b/numpy/distutils/fcompiler/intel.py
@@ -215,7 +215,5 @@ class IntelEM64VisualFCompiler(IntelVisualFCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='intel')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='intel').get_version())
diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py
index 7a33b4b63..1beb662f4 100644
--- a/numpy/distutils/fcompiler/lahey.py
+++ b/numpy/distutils/fcompiler/lahey.py
@@ -43,7 +43,5 @@ class LaheyFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='lahey')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='lahey').get_version())
diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py
index 6a8d23099..da337b24a 100644
--- a/numpy/distutils/fcompiler/mips.py
+++ b/numpy/distutils/fcompiler/mips.py
@@ -52,7 +52,5 @@ class MIPSFCompiler(FCompiler):
return r
if __name__ == '__main__':
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='mips')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='mips').get_version())
diff --git a/numpy/distutils/fcompiler/nag.py b/numpy/distutils/fcompiler/nag.py
index 09affb2ea..cb71d548c 100644
--- a/numpy/distutils/fcompiler/nag.py
+++ b/numpy/distutils/fcompiler/nag.py
@@ -78,8 +78,7 @@ class NAGFORCompiler(BaseNAGFCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='nagfor')
- compiler.customize()
+ from numpy.distutils import customized_fcompiler
+ compiler = customized_fcompiler(compiler='nagfor')
print(compiler.get_version())
print(compiler.get_flags_debug())
diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py
index 6f602d734..bdeea1560 100644
--- a/numpy/distutils/fcompiler/none.py
+++ b/numpy/distutils/fcompiler/none.py
@@ -1,6 +1,7 @@
from __future__ import division, absolute_import, print_function
from numpy.distutils.fcompiler import FCompiler
+from numpy.distutils import customized_fcompiler
compilers = ['NoneFCompiler']
@@ -26,6 +27,4 @@ class NoneFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- compiler = NoneFCompiler()
- compiler.customize()
- print(compiler.get_version())
+ print(customized_fcompiler(compiler='none').get_version())
diff --git a/numpy/distutils/fcompiler/pathf95.py b/numpy/distutils/fcompiler/pathf95.py
index 1902bbc24..5de86f63a 100644
--- a/numpy/distutils/fcompiler/pathf95.py
+++ b/numpy/distutils/fcompiler/pathf95.py
@@ -31,8 +31,5 @@ class PathScaleFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- #compiler = PathScaleFCompiler()
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='pathf95')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='pathf95').get_version())
diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py
index ee357c6d0..477ce3d3f 100644
--- a/numpy/distutils/fcompiler/pg.py
+++ b/numpy/distutils/fcompiler/pg.py
@@ -57,7 +57,5 @@ class PGroupFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='pg')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='pg').get_version())
diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py
index 76ce1cabc..d477d3308 100644
--- a/numpy/distutils/fcompiler/sun.py
+++ b/numpy/distutils/fcompiler/sun.py
@@ -49,7 +49,5 @@ class SunFCompiler(FCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='sun')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='sun').get_version())
diff --git a/numpy/distutils/fcompiler/vast.py b/numpy/distutils/fcompiler/vast.py
index df3469dff..adc1591bd 100644
--- a/numpy/distutils/fcompiler/vast.py
+++ b/numpy/distutils/fcompiler/vast.py
@@ -50,7 +50,5 @@ class VastFCompiler(GnuFCompiler):
if __name__ == '__main__':
from distutils import log
log.set_verbosity(2)
- from numpy.distutils.fcompiler import new_fcompiler
- compiler = new_fcompiler(compiler='vast')
- compiler.customize()
- print(compiler.get_version())
+ from numpy.distutils import customized_fcompiler
+ print(customized_fcompiler(compiler='vast').get_version())
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index 01d547d8e..19723c29c 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -152,6 +152,7 @@ from numpy.distutils.misc_util import (is_sequence, is_string,
get_shared_lib_extension)
from numpy.distutils.command.config import config as cmd_config
from numpy.distutils.compat import get_exception
+from numpy.distutils import customized_ccompiler
import distutils.ccompiler
import tempfile
import shutil
@@ -713,8 +714,7 @@ class system_info(object):
return self.get_libs(key, '')
def library_extensions(self):
- c = distutils.ccompiler.new_compiler()
- c.customize('')
+ c = customized_ccompiler()
static_exts = []
if c.compiler_type != 'msvc':
# MSVC doesn't understand binutils
@@ -1721,8 +1721,7 @@ class blas_info(system_info):
# primitive cblas check by looking for the header and trying to link
# cblas or blas
res = False
- c = distutils.ccompiler.new_compiler()
- c.customize('')
+ c = customized_ccompiler()
tmpdir = tempfile.mkdtemp()
s = """#include <cblas.h>
int main(int argc, const char *argv[])
@@ -1773,8 +1772,7 @@ class openblas_info(blas_info):
return True
def calc_info(self):
- c = distutils.ccompiler.new_compiler()
- c.customize('')
+ c = customized_ccompiler()
lib_dirs = self.get_lib_dirs()
@@ -1848,8 +1846,7 @@ class openblas_lapack_info(openblas_info):
def check_embedded_lapack(self, info):
res = False
- c = distutils.ccompiler.new_compiler()
- c.customize('')
+ c = customized_ccompiler()
tmpdir = tempfile.mkdtemp()
s = """void zungqr();
diff --git a/numpy/distutils/tests/test_system_info.py b/numpy/distutils/tests/test_system_info.py
index de680298c..50befa15b 100644
--- a/numpy/distutils/tests/test_system_info.py
+++ b/numpy/distutils/tests/test_system_info.py
@@ -6,7 +6,7 @@ from tempfile import mkstemp, mkdtemp
from subprocess import Popen, PIPE
from distutils.errors import DistutilsError
-from numpy.distutils import ccompiler
+from numpy.distutils import ccompiler, customized_ccompiler
from numpy.testing import (
run_module_suite, assert_, assert_equal, dec
)
@@ -60,8 +60,7 @@ void bar(void) {
def have_compiler():
""" Return True if there appears to be an executable compiler
"""
- compiler = ccompiler.new_compiler()
- compiler.customize(None)
+ compiler = customized_ccompiler()
try:
cmd = compiler.compiler # Unix compilers
except AttributeError:
@@ -205,8 +204,7 @@ class TestSystemInfoReading(object):
@dec.skipif(not HAVE_COMPILER)
def test_compile1(self):
# Compile source and link the first source
- c = ccompiler.new_compiler()
- c.customize(None)
+ c = customized_ccompiler()
previousDir = os.getcwd()
try:
# Change directory to not screw up directories
@@ -223,8 +221,7 @@ class TestSystemInfoReading(object):
def test_compile2(self):
# Compile source and link the second source
tsi = self.c_temp2
- c = ccompiler.new_compiler()
- c.customize(None)
+ c = customized_ccompiler()
extra_link_args = tsi.calc_extra_info()['extra_link_args']
previousDir = os.getcwd()
try:
View Lorry Controller Status