andyfaff · andyfaff · May 28, 2020 · Jun 4, 2020 · Nov 5, 2020 · Nov 6, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,13 +1,23 @@
 version: 2
-jobs:
-  build_docs:
-    docker:
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      - image: circleci/python:3.7.0
 
-    working_directory: ~/repo
+# Aliases to reuse
+_defaults: &defaults
+  docker:
+    # CircleCI maintains a library of pre-built images
+    # documented at https://circleci.com/docs/2.0/circleci-images/
+    - image: circleci/python:3.7.0
+  working_directory: ~/repo
+
+_debian: &debian
+  name: install Debian dependencies
+  command: |
+    sudo apt-get update
+    sudo apt-get install libatlas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libfreetype6-dev libpng-dev zlib1g zlib1g-dev texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra texlive-generic-extra latexmk texlive-xetex fonts-freefont-otf
 
+jobs:
+# Build SciPy from source
+  build_scipy:
+    <<: *defaults
     steps:
       - checkout
 
@@ -30,10 +40,7 @@ jobs:
             git submodule update
 
       - run:
-          name: install Debian dependencies
-          command: |
-            sudo apt-get update
-            sudo apt-get install libatlas-dev libatlas-base-dev liblapack-dev gfortran libgmp-dev libmpfr-dev libfreetype6-dev libpng-dev zlib1g zlib1g-dev texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra texlive-generic-extra latexmk texlive-xetex fonts-freefont-otf
+          <<: *debian
 
       - run:
           name: setup Python venv
@@ -42,9 +49,31 @@ jobs:
             . venv/bin/activate
             pip install --install-option="--no-cython-compile" cython
             pip install numpy
-            pip install nose mpmath argparse Pillow codecov matplotlib "Sphinx!=3.1.0"
+            pip install nose mpmath argparse Pillow codecov matplotlib "Sphinx!=3.1.0" asv
             pip install pybind11
 
+      - run:
+          name: build SciPy
+          command: |
+            . venv/bin/activate
+            export SHELL=$(which bash)
+            python -u runtests.py -gbj2
+
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - repo
+
+# Build docs
+  build_docs:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/
+
+      - run:
+          <<: *debian
+
       - run:
           name: build docs
           command: |
@@ -67,18 +96,41 @@ jobs:
           paths:
             - html-scipyorg
 
+# Run benchmarks
+
+  run_benchmarks:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/
+
+      - run:
+          <<: *debian
+
+      - run:
+          name: run asv
+          command: |
+            . venv/bin/activate
+            pip install pyfftw cffi pytest
+            export PYTHONPATH=$PWD/build/testenv/lib/python3.7/site-packages
+            cd benchmarks
+            asv machine --machine CircleCI
+            export SCIPY_GLOBAL_BENCH_NUMTRIALS=1
+            export SCIPY_ALLOW_BENCH_IMPORT_ERRORS=0
+            time asv --config asv.conf.json dev -m CircleCI --python=same --bench '^((?!BenchGlobal|QuadraticAssignment).)*$'
+            asv --config asv.conf.json publish
+
+      - store_artifacts:
+          path: benchmarks/html
+          destination: html-benchmarks
 
 # Upload build output to scipy/devdocs repository, using SSH deploy keys.
 # The keys are only available for builds on master branch.
 # https://developer.github.com/guides/managing-deploy-keys/
 # https://circleci.com/docs/2.0/configuration-reference/#add_ssh_keys
 
   deploy:
-    docker:
-      - image: circleci/python:3.7.0
-
-    working_directory: ~/repo
-
+    <<: *defaults
     steps:
       - attach_workspace:
           at: /tmp/build
@@ -112,11 +164,16 @@ workflows:
   version: 2
   default:
     jobs:
-      - build_docs
+      - build_scipy
+      - build_docs:
+          requires:
+            - build_scipy
+      - run_benchmarks:
+          requires:
+            - build_scipy
       - deploy:
           requires:
             - build_docs
-
           filters:
             branches:
               only: master
diff --git a/.travis.yml b/.travis.yml
@@ -40,7 +40,10 @@ matrix:
         - pycodestyle scipy benchmarks/benchmarks
         - |
           if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-             python tools/lint_diff.py --branch $TRAVIS_BRANCH
+             git fetch --unshallow
+             git config remote.origin.fetch "+refs/heads/maintenance/*:refs/remotes/origin/maintenance/*"
+             git fetch origin --no-tags
+             python tools/lint_diff.py --branch origin/$TRAVIS_BRANCH
           fi
         - tools/unicode-check.py
     - python: 3.7
@@ -274,9 +277,10 @@ script:
     if [ "${TRAVIS_PULL_REQUEST}" != "false" ] && [ "${REFGUIDE_CHECK}" == "1" ]; then
       python runtests.py -g --refguide-check
     fi
+  # pyfftw missing should raise an error when running benchmarks with SCIPY_ALLOW_BENCH_IMPORT_ERRORS=0
   - |
     if [ "${TRAVIS_PULL_REQUEST}" != "false" ] && [ "${ASV_CHECK}" == "1" ]; then
-      (cd benchmarks && python -masv check -E existing)
+      (cd benchmarks && python -masv check -E existing && ! SCIPY_ALLOW_BENCH_IMPORT_ERRORS=0 python -masv check -E existing > /dev/null)
     fi
   # Check dynamic symbol hiding works on Linux
   - |

diff --git a/benchmarks/benchmarks/blas_lapack.py b/benchmarks/benchmarks/blas_lapack.py
@@ -1,12 +1,9 @@
 import numpy as np
+from .common import Benchmark, safe_import
 
-try:
+with safe_import():
     import scipy.linalg.lapack as la
     import scipy.linalg.blas as bla
-except ImportError:
-    pass
-
-from .common import Benchmark
 
 
 class GetBlasLapackFuncs(Benchmark):

diff --git a/benchmarks/benchmarks/cluster.py b/benchmarks/benchmarks/cluster.py
@@ -1,13 +1,11 @@
 import numpy as np
 from numpy.testing import suppress_warnings
 
-from .common import Benchmark
+from .common import Benchmark, safe_import
 
-try:
+with safe_import():
     from scipy.cluster.hierarchy import linkage
     from scipy.cluster.vq import kmeans, kmeans2, vq
-except ImportError:
-    pass
 
 
 class HierarchyLinkage(Benchmark):

diff --git a/benchmarks/benchmarks/common.py b/benchmarks/benchmarks/common.py
@@ -142,3 +142,18 @@ def decorator(func):
             setattr(func, key, value)
         return func
     return decorator
+
+
+class safe_import(object):
+
+    def __enter__(self):
+        self.error = False
+        return self
+
+    def __exit__(self, type_, value, traceback):
+        if type_ is not None:
+            self.error = True
+            suppress = not (
+                os.getenv('SCIPY_ALLOW_BENCH_IMPORT_ERRORS', '1').lower() in
+                ('0', 'false') or not issubclass(type_, ImportError))
+            return suppress
diff --git a/benchmarks/benchmarks/cython_special.py b/benchmarks/benchmarks/cython_special.py
@@ -2,12 +2,10 @@
 import numpy as np
 from scipy import special
 
-try:
-    from scipy.special import cython_special
-except ImportError:
-    pass
+from .common import with_attributes, safe_import
 
-from .common import with_attributes
+with safe_import():
+    from scipy.special import cython_special
 
 
 FUNC_ARGS = {

diff --git a/benchmarks/benchmarks/fft_basic.py b/benchmarks/benchmarks/fft_basic.py
@@ -8,24 +8,25 @@
 
 import scipy.fftpack
 import numpy.fft
-try:
+from .common import Benchmark, safe_import
+
+with safe_import() as exc:
     import scipy.fft as scipy_fft
     has_scipy_fft = True
-except ImportError:
-    scipy_fft = {}
+if exc.error:
     has_scipy_fft = False
 
-from .common import Benchmark
 
-try:
+with safe_import() as exc:
     import pyfftw.interfaces.numpy_fft as pyfftw_fft
     import pyfftw
     pyfftw.interfaces.cache.enable()
     has_pyfftw = True
-except ImportError:
+if exc.error:
     pyfftw_fft = {}
     has_pyfftw = False
 
+
 class PyfftwBackend:
     """Backend for pyfftw"""
     __ua_domain__ = 'numpy.scipy.fft'

diff --git a/benchmarks/benchmarks/fftpack_pseudo_diffs.py b/benchmarks/benchmarks/fftpack_pseudo_diffs.py
@@ -1,13 +1,10 @@
 """ Benchmark functions for fftpack.pseudo_diffs module
 """
 from numpy import arange, sin, cos, pi, exp, tanh, sign
+from .common import Benchmark, safe_import
 
-try:
+with safe_import():
     from scipy.fftpack import diff, fft, ifft, tilbert, hilbert, shift, fftfreq
-except ImportError:
-    pass
-
-from .common import Benchmark
 
 
 def direct_diff(x, k=1, period=None):

diff --git a/benchmarks/benchmarks/go_benchmark_functions/go_benchmark.py b/benchmarks/benchmarks/go_benchmark_functions/go_benchmark.py
@@ -2,10 +2,10 @@
 import numpy as np
 from numpy import abs, asarray
 
-try:
+from ..common import safe_import
+
+with safe_import():
     from scipy.special import factorial
-except ImportError:
-    pass
 
 
 class Benchmark(object):
@@ -49,10 +49,10 @@ class Benchmark(object):
     def __init__(self, dimensions):
         """
         Initialises the problem
-        
+
         Parameters
         ----------
-        
+
         dimensions : int
             The dimensionality of the problem
         """
@@ -172,9 +172,9 @@ def bounds(self):
 
     @property
     def N(self):
-        """        
+        """
         The dimensionality of the problem.
-        
+
         Returns
         -------
         N : int