BLD: use 0.3.7 release version, add dependency on libgfortran5

notanton · Jan 17, 2020 · 879d0e4 · 879d0e4
1 parent 21bc6b6
commit 879d0e4
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,14 +3,16 @@
 language: python
 group: travis_latest
 os: linux
-dist: xenial
+dist: bionic
 
 # Travis whitelists the installable packages, additions can be requested
 #   https://github.com/travis-ci/apt-package-whitelist
 addons:
   apt:
     packages: &common_packages
       - gfortran
+      - libgfortran5
+      - libgfortran3
       - libatlas-base-dev
       # Speedup builds, particularly when USE_CHROOT=1
       - eatmydata
@@ -47,7 +49,6 @@ jobs:
     - python: 3.7
 
     - python: 3.6
-      dist: bionic
       env: USE_DEBUG=1
       addons:
         apt:
@@ -112,8 +113,18 @@ jobs:
       arch: s390x
       env:
        # use s390x OpenBLAS build, not system ATLAS
+       - DOWNLOAD_OPENBLAS=1
        - ATLAS=None
 
+    - python: 3.7
+      os: linux
+      arch: aarch64
+      env:
+       # use ppc64le OpenBLAS build, not system ATLAS
+       - DOWNLOAD_OPENBLAS=1
+       - ATLAS=None
+
+
 
 before_install:
   - ./tools/travis-before-install.sh

diff --git a/numpy/fft/_pocketfft.c b/numpy/fft/_pocketfft.c
@@ -10,6 +10,11 @@
  *  \author Martin Reinecke
  */
 
+#define NPY_NO_DEPRECATED_API NPY_API_VERSION
+
+#include "Python.h"
+#include "numpy/arrayobject.h"
+
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
@@ -2184,11 +2189,6 @@ WARN_UNUSED_RESULT static int rfft_forward(rfft_plan plan, double c[], double fc
     return rfftblue_forward(plan->blueplan,c,fct);
   }
 
-#define NPY_NO_DEPRECATED_API NPY_API_VERSION
-
-#include "Python.h"
-#include "numpy/arrayobject.h"
-
 static PyObject *
 execute_complex(PyObject *a1, int is_forward, double fct)
 {

diff --git a/numpy/random/src/distributions/random_mvhg_count.c b/numpy/random/src/distributions/random_mvhg_count.c
@@ -1,8 +1,8 @@
+#include "numpy/random/distributions.h"
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "numpy/random/distributions.h"
 
 /*
  *  random_multivariate_hypergeometric_count

diff --git a/numpy/random/src/distributions/random_mvhg_marginals.c b/numpy/random/src/distributions/random_mvhg_marginals.c
@@ -1,9 +1,9 @@
+#include "numpy/random/distributions.h"
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
 #include <math.h>
 
-#include "numpy/random/distributions.h"
 #include "logfactorial.h"
 
 

diff --git a/shippable.yml b/shippable.yml
@@ -21,9 +21,10 @@ runtime:
 
 build:
     ci:
-    # install dependencies
+    # install dependencies and newer toolchain for gfortran5
+    - sudo add-apt-repository ppa:ubuntu-toolchain-r/test
     - sudo apt-get update
-    - sudo apt-get install gcc gfortran
+    - sudo apt-get install gcc gfortran libgfortran5
     - target=$(python tools/openblas_support.py)
     - ls -lR "${target}"
     - sudo cp -r "${target}"/lib/* /usr/lib

diff --git a/tools/openblas_support.py b/tools/openblas_support.py
@@ -16,7 +16,7 @@
 import tarfile
 
 OPENBLAS_V = 'v0.3.7'
-OPENBLAS_LONG = 'v0.3.5-605-gc815b8fb' 
+OPENBLAS_LONG = 'v0.3.7' 
 BASE_LOC = ''
 RACKSPACE = 'https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com'
 ARCHITECTURES = ['', 'windows', 'darwin', 'aarch64', 'x86', 'ppc64le', 's390x']