From 62b78042651a02cc7b3dddf52fdbc5e8307d0165 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 13 Oct 2021 22:34:26 +1100 Subject: [PATCH 1/4] drop ppc builds --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index ff4aa23e..7b674193 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,6 +1,6 @@ build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true -provider: {linux_aarch64: azure, linux_ppc64le: azure} +provider: {linux_aarch64: azure} test_on_native_only: true azure: settings_win: From 365ec4e91bcff0e400d9f45e36dc58076520347f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 13 Oct 2021 22:35:38 +1100 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.10.13.20.28.53 --- .azure-pipelines/azure-pipelines-linux.yml | 16 ------- ...thon3.7.____cpythonpython_implcpython.yaml | 2 +- ...thon3.8.____cpythonpython_implcpython.yaml | 2 +- ...9python3.7.____73_pypypython_implpypy.yaml | 2 +- ...thon3.9.____cpythonpython_implcpython.yaml | 2 +- ...thon3.7.____cpythonpython_implcpython.yaml | 45 ------------------- ...thon3.8.____cpythonpython_implcpython.yaml | 45 ------------------- ...9python3.7.____73_pypypython_implpypy.yaml | 45 ------------------- ...thon3.9.____cpythonpython_implcpython.yaml | 45 ------------------- ...thon3.7.____cpythonpython_implcpython.yaml | 2 +- ...thon3.8.____cpythonpython_implcpython.yaml | 2 +- ...9python3.7.____73_pypypython_implpypy.yaml | 2 +- ...thon3.9.____cpythonpython_implcpython.yaml | 2 +- ...thon3.7.____cpythonpython_implcpython.yaml | 2 +- ...thon3.8.____cpythonpython_implcpython.yaml | 2 +- ...9python3.7.____73_pypypython_implpypy.yaml | 2 +- ...thon3.9.____cpythonpython_implcpython.yaml | 2 +- README.md | 28 ------------ 18 files changed, 12 insertions(+), 236 deletions(-) delete mode 100644 .ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy.yaml delete mode 100644 .ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b3690a48..2c7d4b3b 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -40,22 +40,6 @@ jobs: CONFIG: linux_aarch64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy: - CONFIG: linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index a0d12bab..c70db16e 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index f301726a..7ee360d2 100644 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index 4e7236df..aa4b921f 100644 --- a/.ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index fc435fe2..94b38294 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml deleted file mode 100644 index 5e0298b4..00000000 --- a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -python_impl: -- cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 0aba9854..00000000 --- a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy.yaml deleted file mode 100644 index 699d94dc..00000000 --- a/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml deleted file mode 100644 index 04734e8a..00000000 --- a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.19' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -python_impl: -- cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index 414ebd84..9d26f868 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 08e50767..dcefd3cc 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index ac9250bd..c8b17494 100644 --- a/.ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index 4de334e5..b81326e2 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index 157270bb..2ef5b1fd 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index d3ef612c..43ebf594 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index 780c6ca9..9d4151dc 100644 --- a/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml index 20601447..8085b19e 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/README.md b/README.md index f17ddfa0..a7e3c24d 100644 --- a/README.md +++ b/README.md @@ -90,34 +90,6 @@ Current build status variant - - linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython - - - variant - - - - linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython - - - variant - - - - linux_ppc64le_numpy1.19python3.7.____73_pypypython_implpypy - - - variant - - - - linux_ppc64le_numpy1.19python3.9.____cpythonpython_implcpython - - - variant - - osx_64_numpy1.18python3.7.____cpythonpython_implcpython From 1040b06de3e715646fcfdb44f85d7f615536ee68 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 15 Oct 2021 19:20:50 +1100 Subject: [PATCH 3/4] re-enable (almost) complete test suite for aarch only skipping the known slowest upstream tests with label='fast' --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 216e43e6..9cd7a286 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -66,11 +66,10 @@ test: # show SIMD features (some failures occur depending on presence/absence of e.g. AVX512) # change to np.show_config() for v>=1.22.0, cf. numpy/numpy#19130 - python -c "import numpy; numpy._pytesttester._show_numpy_info()" - # Run only fast tests for key modules on drone as it times out; otherwise set label='full' (note default: label='fast') + # Run only fast tests for aarch; otherwise set label='full' (note default: label='fast') {% set label = "'fast'" if aarch64 else "'full'" %} - {% set tests = "['scipy.linalg', 'scipy.fft']" if aarch64 else "None" %} # for signature, see https://github.com/scipy/scipy/blob/v1.7.0/scipy/_lib/_testutils.py#L27 - - python -c "import scipy; scipy.test(verbose=2, label={{ label }}, tests={{ tests }}, extra_argv=['--durations=50'])" + - python -c "import scipy; scipy.test(verbose=2, label={{ label }}, extra_argv=['--durations=50'])" imports: - scipy - scipy.cluster._hierarchy From c483adee0e1a117a265217d395efe5614078b872 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 20 Oct 2021 21:03:42 +1100 Subject: [PATCH 4/4] Revert "re-enable (almost) complete test suite for aarch" This reverts commit 1040b06de3e715646fcfdb44f85d7f615536ee68. --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9cd7a286..216e43e6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -66,10 +66,11 @@ test: # show SIMD features (some failures occur depending on presence/absence of e.g. AVX512) # change to np.show_config() for v>=1.22.0, cf. numpy/numpy#19130 - python -c "import numpy; numpy._pytesttester._show_numpy_info()" - # Run only fast tests for aarch; otherwise set label='full' (note default: label='fast') + # Run only fast tests for key modules on drone as it times out; otherwise set label='full' (note default: label='fast') {% set label = "'fast'" if aarch64 else "'full'" %} + {% set tests = "['scipy.linalg', 'scipy.fft']" if aarch64 else "None" %} # for signature, see https://github.com/scipy/scipy/blob/v1.7.0/scipy/_lib/_testutils.py#L27 - - python -c "import scipy; scipy.test(verbose=2, label={{ label }}, extra_argv=['--durations=50'])" + - python -c "import scipy; scipy.test(verbose=2, label={{ label }}, tests={{ tests }}, extra_argv=['--durations=50'])" imports: - scipy - scipy.cluster._hierarchy