diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/numpy')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/numpy/default.nix | 72 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch | 31 |
2 files changed, 103 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix new file mode 100644 index 000000000000..291a80a521b4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -0,0 +1,72 @@ +{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas, writeTextFile }: + +let + blasImplementation = lib.nameFromURL blas.name "-"; + cfg = writeTextFile { + name = "site.cfg"; + text = (lib.generators.toINI {} { + "${blasImplementation}" = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + }); + }; +in buildPythonPackage rec { + pname = "numpy"; + version = "1.16.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288"; + }; + + disabled = isPyPy; + nativeBuildInputs = [ gfortran pytest ]; + buildInputs = [ blas ]; + + patches = lib.optionals (python.hasDistutilsCxxPatch or false) [ + # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 + # Patching of numpy.distutils is needed to prevent it from undoing the + # patch to distutils. + ./numpy-distutils-C++.patch + ]; + + preConfigure = '' + sed -i 's/-faltivec//' numpy/distutils/system_info.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + + preBuild = '' + ln -s ${cfg} site.cfg + ''; + + enableParallelBuilding = true; + + checkPhase = '' + runHook preCheck + pushd dist + ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)' + popd + runHook postCheck + ''; + + passthru = { + blas = blas; + inherit blasImplementation cfg; + }; + + # Disable two tests + # - test_f2py: f2py isn't yet on path. + # - test_large_file_support: takes a long time and can cause the machine to run out of disk space + NOSE_EXCLUDE="test_f2py,test_large_file_support"; + + meta = { + description = "Scientific tools for Python"; + homepage = http://numpy.scipy.org/; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch new file mode 100644 index 000000000000..771da8cf3ffa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch @@ -0,0 +1,31 @@ +diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py +index 6ed5eec..82a88b5 100644 +--- a/numpy/distutils/unixccompiler.py ++++ b/numpy/distutils/unixccompiler.py +@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts + if opt not in llink_s: + self.linker_so = llink_s.split() + opt.split() + +- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) +- + # gcc style automatic dependencies, outputs a makefile (-MF) that lists + # all headers needed by a c file as a side effect of compilation (-MMD) + if getattr(self, '_auto_depends', False): +@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts + deps = [] + + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + +- extra_postargs, display = display) ++ if self.detect_language(src) == 'c++': ++ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + ++ extra_postargs, display = display) ++ else: ++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + ++ extra_postargs, display = display) ++ + except DistutilsExecError: + msg = str(get_exception()) + raise CompileError(msg) |