Merge numba-master and update numba to recent version with overloads inlining

.travis.yml

@@ -23,10 +23,10 @@ before_install:
     - buildscripts/install_conda.sh $CONDA_PREFIX_PATH
 
 install:
-    - travis_wait 40 $CONDA_PREFIX_PATH/bin/python buildscripts/build.py --build-mode=$BUILD_MODE --python=$PYTHON_VER --numpy=$NUMPY_VER --conda-prefix=$CONDA_PREFIX_PATH
+    - travis_wait 40 $CONDA_PREFIX_PATH/bin/python buildscripts/build.py --build-mode=$BUILD_MODE --python=$PYTHON_VER --numpy=$NUMPY_VER --use-numba-master --skip-smoke-tests --conda-prefix=$CONDA_PREFIX_PATH
 
 script:
-    - $CONDA_PREFIX_PATH/bin/python buildscripts/test.py --test-mode=$TEST_MODE --python=$PYTHON_VER --numpy=$NUMPY_VER --conda-prefix=$CONDA_PREFIX_PATH --run-coverage=$RUN_COVERAGE
+    - $CONDA_PREFIX_PATH/bin/python buildscripts/test.py --test-mode=$TEST_MODE --python=$PYTHON_VER --numpy=$NUMPY_VER --use-numba-master --conda-prefix=$CONDA_PREFIX_PATH --run-coverage=$RUN_COVERAGE
 
 after_success: skip
 

azure-pipelines.yml

@@ -14,7 +14,7 @@ jobs:
       py3.7_numpy1.17:
         PYTHON_VER: '3.7'
         NUMPY_VER: '1.17'
-        USE_NUMBA_MASTER: 'False'
+        USE_NUMBA_MASTER: 'True'
         SDC_CONFIG_PIPELINE_SDC: 'False'
 
 - template: buildscripts/azure/template-linux-macos.yml
@@ -26,7 +26,7 @@ jobs:
       py3.7_numpy1.17:
         PYTHON_VER: '3.7'
         NUMPY_VER: '1.17'
-        USE_NUMBA_MASTER: 'False'
+        USE_NUMBA_MASTER: 'True'
         SDC_CONFIG_PIPELINE_SDC: 'False'
 
 - template: buildscripts/azure/template-linux-macos.yml
@@ -38,5 +38,5 @@ jobs:
       py3.7_numpy1.17:
         PYTHON_VER: '3.7'
         NUMPY_VER: '1.17'
-        USE_NUMBA_MASTER: 'False'
+        USE_NUMBA_MASTER: 'True'
         SDC_CONFIG_PIPELINE_SDC: 'False'

buildscripts/azure/template-linux-macos.yml

@@ -24,7 +24,7 @@ jobs:
         if [ "$USE_NUMBA_MASTER" == "False" ]; then
             $HOME/miniconda3/bin/python buildscripts/build.py --build-mode=package --python=$PYTHON_VER --numpy=$NUMPY_VER --skip-smoke-tests --conda-prefix=$HOME/miniconda3;
         else
-            $HOME/miniconda3/bin/python buildscripts/build.py --build-mode=package --python=$PYTHON_VER --numpy=$NUMPY_VER --use-numba-master --conda-prefix=$HOME/miniconda3;
+            $HOME/miniconda3/bin/python buildscripts/build.py --build-mode=package --python=$PYTHON_VER --numpy=$NUMPY_VER --use-numba-master --skip-smoke-tests --conda-prefix=$HOME/miniconda3;
         fi
       displayName: 'Build conda and wheel packages'
       continueOnError: ${{ parameters.allowFailure }}

buildscripts/azure/template-windows.yml

@@ -23,7 +23,7 @@ jobs:
         IF "%USE_NUMBA_MASTER%" == "False" (
             "C:\\Miniconda\\python.exe" buildscripts\\build.py --build-mode=package --python=%PYTHON_VER% --numpy=%NUMPY_VER% --skip-smoke-tests --conda-prefix="C:\\Miniconda"
             ) ELSE (
-            "C:\\Miniconda\\python.exe" buildscripts\\build.py --build-mode=package --python=%PYTHON_VER% --numpy=%NUMPY_VER% --use-numba-master --conda-prefix="C:\\Miniconda")
+            "C:\\Miniconda\\python.exe" buildscripts\\build.py --build-mode=package --python=%PYTHON_VER% --numpy=%NUMPY_VER% --use-numba-master --skip-smoke-tests --conda-prefix="C:\\Miniconda")
       displayName: 'Build conda and wheel packages'
       continueOnError: ${{ parameters.allowFailure }}
 

buildscripts/build.py

@@ -103,7 +103,10 @@ def run_smoke_tests(sdc_src, test_env_activate):
     develop_env_activate = get_activate_env_cmd(conda_activate, develop_env)
 
     conda_channels = f'-c {numba_channel} -c conda-forge -c intel -c defaults --override-channels'
-    numba_conda_channels = '-c conda-forge -c intel --override-channels'
+    # If numba is taken from custom channel, need to add numba channel to get dependencies
+    if numba_channel != 'numba':
+        conda_channels = f'-c {numba_channel} -c numba -c conda-forge -c intel -c defaults --override-channels'
+    numba_conda_channels = '-c numba -c conda-forge -c intel --override-channels'
     if channel_list:
         conda_channels = f'{channel_list} --override-channels'
 

buildscripts/numba-conda-recipe/recipe/meta.yaml

@@ -7,7 +7,7 @@ package:
 
 source:
   git_url: https://github.com/numba/numba
-  git_tag: master
+  git_tag: 8044d6edc79e56847778164656a8c0856383503a
 
 build:
   number: 0
@@ -34,15 +34,17 @@ requirements:
     - python
     - numpy
     - setuptools
-    - llvmlite 0.30.*
+    - llvmlite 0.31.*
     - funcsigs                 # [py27]
     - singledispatch           # [py27]
     - tbb-devel >=2018.0.5     # [not (win and py27)]
+    - llvm-openmp              # [osx]
+    - intel-openmp             # [osx]
   run:
     - python
     - {{ pin_compatible('numpy') }}
     - {{ pin_compatible('llvmlite', max_pin='x.x') }}
-    - llvmlite >=0.30.0
+    - llvmlite
     - funcsigs                 # [py27]
     - singledispatch           # [py27]
   run_constrained:

buildscripts/test.py

@@ -102,6 +102,9 @@
     develop_env_activate = get_activate_env_cmd(conda_activate, develop_env)
 
     conda_channels = f'-c {numba_channel} -c conda-forge -c intel -c defaults --override-channels'
+    # If numba is taken from custom channel, need to add numba channel to get dependencies
+    if numba_channel != 'numba':
+        conda_channels = f'-c {numba_channel} -c numba -c conda-forge -c intel -c defaults --override-channels'
     if channel_list:
         conda_channels = f'{channel_list} --override-channels'