Skip to content

Commit 1e0f0ca

Browse files
jamesobutlerjamesobutler
committed
Remove 32bit testing in CI
1 parent 7186734 commit 1e0f0ca

6 files changed

Lines changed: 28 additions & 65 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ trigger:
33

44
variables:
55
# Change the following along with adding new TEST_START_INDEX.
6-
TEST_COUNT: 20
6+
TEST_COUNT: 19
77

88
jobs:
99
# Mac and Linux use the same template with different matrixes
@@ -29,99 +29,92 @@ jobs:
2929
name: Linux
3030
vmImage: ubuntu-20.04
3131
matrix:
32-
py38_np118_32bit:
33-
# 32 bit linux only has np 1.15
34-
PYTHON: '3.8'
35-
NUMPY: '1.18'
36-
CONDA_ENV: azure_ci
37-
BITS32: yes
38-
TEST_START_INDEX: 2
3932
py38_np118_vanilla:
4033
PYTHON: '3.8'
4134
NUMPY: '1.18'
4235
CONDA_ENV: azure_ci
4336
VANILLA_INSTALL: yes
44-
TEST_START_INDEX: 3
37+
TEST_START_INDEX: 2
4538
py38_np118_cov:
4639
PYTHON: '3.8'
4740
NUMPY: '1.18'
4841
CONDA_ENV: azure_ci
4942
RUN_COVERAGE: yes
5043
RUN_FLAKE8: yes
5144
RUN_MYPY: yes
52-
TEST_START_INDEX: 4
45+
TEST_START_INDEX: 3
5346
py38_np119_tbb:
5447
PYTHON: '3.8'
5548
NUMPY: '1.19.2=*_0'
5649
CONDA_ENV: azure_ci
5750
TEST_THREADING: 'tbb'
58-
TEST_START_INDEX: 5
51+
TEST_START_INDEX: 4
5952
py38_np119_omp:
6053
PYTHON: '3.8'
6154
NUMPY: '1.19.2=*_0'
6255
CONDA_ENV: azure_ci
6356
TEST_THREADING: omp
64-
TEST_START_INDEX: 6
57+
TEST_START_INDEX: 5
6558
py38_np119_workqueue:
6659
PYTHON: '3.8'
6760
NUMPY: '1.19.2=*_0'
6861
CONDA_ENV: azure_ci
6962
TEST_THREADING: workqueue
70-
TEST_START_INDEX: 7
63+
TEST_START_INDEX: 6
7164
py38_np120_doc:
7265
PYTHON: '3.8'
7366
NUMPY: '1.20'
7467
CONDA_ENV: azure_ci
7568
BUILD_DOC: yes
76-
TEST_START_INDEX: 8
69+
TEST_START_INDEX: 7
7770
py38_np120_pickle5:
7871
PYTHON: '3.8'
7972
NUMPY: '1.20'
8073
CONDA_ENV: azure_ci
8174
TEST_PICKLE5: yes
82-
TEST_START_INDEX: 9
75+
TEST_START_INDEX: 8
8376
py38_np120_svml:
8477
PYTHON: '3.8'
8578
NUMPY: '1.20'
8679
CONDA_ENV: azure_ci
8780
TEST_SVML: yes
88-
TEST_START_INDEX: 10
81+
TEST_START_INDEX: 9
8982
py38_np122:
9083
PYTHON: '3.8'
9184
NUMPY: '1.22'
9285
CONDA_ENV: azure_ci
93-
TEST_START_INDEX: 11
86+
TEST_START_INDEX: 10
9487
py39_np119:
9588
PYTHON: '3.9'
9689
NUMPY: '1.19.2=*_0'
9790
CONDA_ENV: azure_ci
98-
TEST_START_INDEX: 12
91+
TEST_START_INDEX: 11
9992
py39_np120_typeguard:
10093
PYTHON: '3.9'
10194
NUMPY: '1.20'
10295
CONDA_ENV: azure_ci
10396
RUN_TYPEGUARD: yes
104-
TEST_START_INDEX: 13
97+
TEST_START_INDEX: 12
10598
py39_np121:
10699
PYTHON: '3.9'
107100
NUMPY: '1.21'
108101
CONDA_ENV: azure_ci
109-
TEST_START_INDEX: 14
102+
TEST_START_INDEX: 13
110103
py39_np123:
111104
PYTHON: '3.9'
112105
NUMPY: '1.23'
113106
CONDA_ENV: azure_ci
114-
TEST_START_INDEX: 15
107+
TEST_START_INDEX: 14
115108
py310_np121:
116109
PYTHON: '3.10'
117110
NUMPY: '1.21'
118111
CONDA_ENV: azure_ci
119-
TEST_START_INDEX: 16
112+
TEST_START_INDEX: 15
120113
py310_np123:
121114
PYTHON: '3.10'
122115
NUMPY: '1.23'
123116
CONDA_ENV: azure_ci
124-
TEST_START_INDEX: 17
117+
TEST_START_INDEX: 16
125118

126119
- template: buildscripts/azure/azure-windows.yml
127120
parameters:

‎buildscripts/azure/azure-linux-macos.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313

1414
steps:
1515
- script: |
16-
if [ "$(uname)" == "Linux" ] && [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]]; then sudo apt-get install -y libc6-dev-i386; fi
17-
if [ "$(uname)" == "Linux" ] && [[ "$CONDA_SUBDIR" != "linux-32" && "$BITS32" != "yes" ]]; then sudo apt-get install -y gdb; fi
16+
sudo apt-get install -y gdb
1817
echo "Installing Miniconda"
1918
buildscripts/incremental/install_miniconda.sh
2019
export PATH=$HOME/miniconda3/bin:$PATH

‎buildscripts/azure/azure-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
PYTHON: '3.10'
1313
NUMPY: '1.23'
1414
CONDA_ENV: 'testenv'
15-
TEST_START_INDEX: 18
15+
TEST_START_INDEX: 17
1616
py38_np118:
1717
PYTHON: '3.8'
1818
NUMPY: '1.18'
1919
CONDA_ENV: 'testenv'
20-
TEST_START_INDEX: 19
20+
TEST_START_INDEX: 18
2121

2222
steps:
2323
- task: CondaEnvironment@1

‎buildscripts/incremental/install_miniconda.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ set -v -e
55
# Install Miniconda
66
unamestr=`uname`
77
if [[ "$unamestr" == 'Linux' ]]; then
8-
if [[ "$BITS32" == "yes" ]]; then
9-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86.sh -O miniconda.sh
10-
else
11-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
12-
fi
8+
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
139
elif [[ "$unamestr" == 'Darwin' ]]; then
1410
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
1511
else

‎buildscripts/incremental/setup_conda_environment.sh‎

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ conda config --set remote_max_retries 10
1010
conda config --set remote_read_timeout_secs 120.2
1111
conda config --set show_channel_urls true
1212
if [[ $(uname) == Linux ]]; then
13-
if [[ "$CONDA_SUBDIR" != "linux-32" && "$BITS32" != "yes" ]] ; then
14-
conda config --set restore_free_channel true
15-
fi
13+
conda config --set restore_free_channel true
1614
fi
1715
conda info
1816
conda config --show
@@ -38,13 +36,7 @@ conda list
3836
# Create a base env first and then add to it...
3937
# NOTE: gitpython is needed for CI testing to do the test slicing
4038
# NOTE: pyyaml is used to ensure that the Azure CI config is valid
41-
# NOTE: 32 bit linux... do not install NumPy, there's no conda package for >1.15
42-
# so it has to come from pip later
43-
if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]]; then
44-
conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON pip gitpython pyyaml
45-
else
46-
conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON numpy=$NUMPY pip gitpython pyyaml "setuptools<60"
47-
fi
39+
conda create -n $CONDA_ENV -q -y ${EXTRA_CHANNELS} python=$PYTHON numpy=$NUMPY pip gitpython pyyaml "setuptools<60"
4840

4941
# Activate first
5042
set +v
@@ -60,36 +52,23 @@ if [ "${VANILLA_INSTALL}" != "yes" ]; then
6052
# pexpect is used to run the gdb tests.
6153
# ipykernel is used for testing ipython behaviours.
6254
$CONDA_INSTALL ${EXTRA_CHANNELS} cffi jinja2 ipython ipykernel pygments pexpect
63-
# Only install scipy on 64bit, else it'll pull in NumPy, 32bit linux needs
64-
# to get scipy from pip
65-
if [[ "$CONDA_SUBDIR" != "linux-32" && "$BITS32" != "yes" ]] ; then
66-
if [[ "$NUMPY" == "1.23" ]] ; then
67-
$CONDA_INSTALL ${EXTRA_CHANNELS} conda-forge::scipy
68-
else
69-
$CONDA_INSTALL ${EXTRA_CHANNELS} scipy
70-
fi
55+
if [[ "$NUMPY" == "1.23" ]] ; then
56+
$CONDA_INSTALL ${EXTRA_CHANNELS} conda-forge::scipy
57+
else
58+
$CONDA_INSTALL ${EXTRA_CHANNELS} scipy
7159
fi
7260
fi
7361

7462
# Install the compiler toolchain
7563
if [[ $(uname) == Linux ]]; then
76-
if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]] ; then
77-
$CONDA_INSTALL gcc_linux-32 gxx_linux-32
78-
else
79-
$CONDA_INSTALL gcc_linux-64 gxx_linux-64
80-
fi
64+
$CONDA_INSTALL gcc_linux-64 gxx_linux-64
8165
elif [[ $(uname) == Darwin ]]; then
8266
$CONDA_INSTALL clang_osx-64 clangxx_osx-64
8367
# Install llvm-openmp on OSX for headers during build and runtime during
8468
# testing
8569
$CONDA_INSTALL llvm-openmp
8670
fi
8771

88-
# If on 32bit linux, now pip install NumPy (no conda package), SciPy is broken?!
89-
if [[ "$CONDA_SUBDIR" == "linux-32" || "$BITS32" == "yes" ]] ; then
90-
$PIP_INSTALL numpy==$NUMPY
91-
fi
92-
9372
# Install latest correct build
9473
$CONDA_INSTALL -c numba/label/dev llvmlite=0.40
9574

‎buildscripts/incremental/test.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ fi
8282
# Find catchsegv
8383
unamestr=`uname`
8484
if [[ "$unamestr" == 'Linux' ]]; then
85-
if [[ "${BITS32}" == "yes" ]]; then
86-
SEGVCATCH=""
87-
else
88-
SEGVCATCH=catchsegv
89-
fi
85+
SEGVCATCH=catchsegv
9086
elif [[ "$unamestr" == 'Darwin' ]]; then
9187
SEGVCATCH=""
9288
else

0 commit comments

Comments
 (0)