From 545b620a44617a00e40abf271fb907680d8865af Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 14:20:41 +0200 Subject: [PATCH 01/23] Improve dependency handling - depend on libcurl instead of curl to get right run_exports - add libaec dependency --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2ada41c2..8509a94f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,22 +67,22 @@ requirements: - m2-m4 # [win] host: - {{ mpi }} # [mpi != 'nompi'] - - msinttypes # [win and vc<14] + - blosc - bzip2 - - curl - - zlib - hdf4 # without this repeat reference, conda-smithy doesn't pin correctly - hdf5 - hdf5 * {{ mpi_prefix }}_* + - libaec + - libcurl - libjpeg-turbo + - libxml2 - libzip + - msinttypes # [win and vc<14] + - zlib - zstd - - libxml2 - - blosc run: - {{ mpi }} # [mpi != 'nompi'] - - curl - hdf5 * {{ mpi_prefix }}_* test: From b5a4818fe12f76a300967b6cc3ff04425278a232 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 14:22:39 +0200 Subject: [PATCH 02/23] Deactivate some suspected unneeded dependencies --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8509a94f..4fc00863 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -59,7 +59,7 @@ requirements: - pkg-config # [not win] - gnuconfig # [unix] - {{ compiler('c') }} - - {{ compiler('cxx') }} + # - {{ compiler('cxx') }} - {{ mpi }} # [mpi == 'openmpi' and build_platform != target_platform] - unzip # [not win] - m2-unzip # [win] @@ -68,16 +68,16 @@ requirements: host: - {{ mpi }} # [mpi != 'nompi'] - blosc - - bzip2 + # - bzip2 - hdf4 # without this repeat reference, conda-smithy doesn't pin correctly - hdf5 - hdf5 * {{ mpi_prefix }}_* - libaec - libcurl - - libjpeg-turbo + # - libjpeg-turbo - libxml2 - - libzip + # - libzip - msinttypes # [win and vc<14] - zlib - zstd From 35a7fcb9d30fcadbb19a9543e90183ddc79e4f0d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:26:50 +0000 Subject: [PATCH 03/23] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.03.12.03.06 --- .ci_support/linux_64_mpimpich.yaml | 19 ++++--------------- .ci_support/linux_64_mpinompi.yaml | 19 ++++--------------- .ci_support/linux_64_mpiopenmpi.yaml | 19 ++++--------------- .ci_support/linux_aarch64_mpimpich.yaml | 19 ++++--------------- .ci_support/linux_aarch64_mpinompi.yaml | 19 ++++--------------- .ci_support/linux_aarch64_mpiopenmpi.yaml | 19 ++++--------------- .ci_support/linux_ppc64le_mpimpich.yaml | 19 ++++--------------- .ci_support/linux_ppc64le_mpinompi.yaml | 19 ++++--------------- .ci_support/linux_ppc64le_mpiopenmpi.yaml | 19 ++++--------------- .ci_support/osx_64_mpimpich.yaml | 19 ++++--------------- .ci_support/osx_64_mpinompi.yaml | 19 ++++--------------- .ci_support/osx_64_mpiopenmpi.yaml | 19 ++++--------------- .ci_support/osx_arm64_mpimpich.yaml | 19 ++++--------------- .ci_support/osx_arm64_mpinompi.yaml | 19 ++++--------------- .ci_support/osx_arm64_mpiopenmpi.yaml | 19 ++++--------------- .ci_support/win_64_.yaml | 14 ++++---------- 16 files changed, 64 insertions(+), 235 deletions(-) diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index fd276319..a2c392ff 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -1,5 +1,3 @@ -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -10,24 +8,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - mpich mpich: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index 200d0892..4c13a3fa 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -1,5 +1,3 @@ -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -10,24 +8,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - nompi mpich: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index e139da3b..d147559c 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -1,5 +1,3 @@ -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -10,24 +8,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - openmpi mpich: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index 94c24a67..16cf4eb9 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -14,24 +12,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - mpich mpich: @@ -40,9 +32,6 @@ openmpi: - '4' target_platform: - linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index d6fa94e0..31e60571 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -14,24 +12,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - nompi mpich: @@ -40,9 +32,6 @@ openmpi: - '4' target_platform: - linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index 132cc607..d6cc3860 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -14,24 +12,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - openmpi mpich: @@ -40,9 +32,6 @@ openmpi: - '4' target_platform: - linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index 10625b1d..47e1f0be 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -1,5 +1,3 @@ -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -10,24 +8,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - mpich mpich: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index 7326f626..29abff4e 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -1,5 +1,3 @@ -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -10,24 +8,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - nompi mpich: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index 55b0be9e..9d44e9fb 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -1,5 +1,3 @@ -bzip2: -- '1' c_compiler: - gcc c_compiler_version: @@ -10,24 +8,18 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - openmpi mpich: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index 51cffcc6..13490990 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -bzip2: -- '1' c_compiler: - clang c_compiler_version: @@ -10,22 +8,16 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index 328fec2e..39bcf650 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -bzip2: -- '1' c_compiler: - clang c_compiler_version: @@ -10,22 +8,16 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index 2195811c..d1d94eed 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -bzip2: -- '1' c_compiler: - clang c_compiler_version: @@ -10,22 +8,16 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpi: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 01819726..163d5528 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -bzip2: -- '1' c_compiler: - clang c_compiler_version: @@ -10,22 +8,16 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' macos_machine: - arm64-apple-darwin20.0.0 mpi: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index d3f8517b..309b60e2 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -bzip2: -- '1' c_compiler: - clang c_compiler_version: @@ -10,22 +8,16 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' macos_machine: - arm64-apple-darwin20.0.0 mpi: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index 11044adc..9bb7bf7e 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -bzip2: -- '1' c_compiler: - clang c_compiler_version: @@ -10,22 +8,16 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- clangxx -cxx_compiler_version: -- '15' hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' macos_machine: - arm64-apple-darwin20.0.0 mpi: @@ -36,9 +28,6 @@ openmpi: - '4' target_platform: - osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index e6f71ae0..a1f92edd 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,25 +1,19 @@ -bzip2: -- '1' c_compiler: - vs2019 channel_sources: - conda-forge channel_targets: - conda-forge main -curl: -- '8' -cxx_compiler: -- vs2019 hdf4: - 4.2.15 hdf5: - 1.14.1 -libjpeg_turbo: -- 2.1.5 +libaec: +- '1' +libcurl: +- '8' libxml2: - '2.11' -libzip: -- '1' mpi: - nompi mpich: From 92d60f35ea8827c973efe3747734f366cc30d9eb Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 14:33:14 +0200 Subject: [PATCH 04/23] Re-add c++ compiler --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4fc00863..1026b07e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -59,7 +59,7 @@ requirements: - pkg-config # [not win] - gnuconfig # [unix] - {{ compiler('c') }} - # - {{ compiler('cxx') }} + - {{ compiler('cxx') }} - {{ mpi }} # [mpi == 'openmpi' and build_platform != target_platform] - unzip # [not win] - m2-unzip # [win] From 6dbcb740b32b232b60d7b10a068dbd7d2c73f779 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 14:35:14 +0200 Subject: [PATCH 05/23] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.03.12.03.06 --- .ci_support/linux_64_mpimpich.yaml | 7 +++++++ .ci_support/linux_64_mpinompi.yaml | 7 +++++++ .ci_support/linux_64_mpiopenmpi.yaml | 7 +++++++ .ci_support/linux_aarch64_mpimpich.yaml | 7 +++++++ .ci_support/linux_aarch64_mpinompi.yaml | 7 +++++++ .ci_support/linux_aarch64_mpiopenmpi.yaml | 7 +++++++ .ci_support/linux_ppc64le_mpimpich.yaml | 7 +++++++ .ci_support/linux_ppc64le_mpinompi.yaml | 7 +++++++ .ci_support/linux_ppc64le_mpiopenmpi.yaml | 7 +++++++ .ci_support/osx_64_mpimpich.yaml | 7 +++++++ .ci_support/osx_64_mpinompi.yaml | 7 +++++++ .ci_support/osx_64_mpiopenmpi.yaml | 7 +++++++ .ci_support/osx_arm64_mpimpich.yaml | 7 +++++++ .ci_support/osx_arm64_mpinompi.yaml | 7 +++++++ .ci_support/osx_arm64_mpiopenmpi.yaml | 7 +++++++ .ci_support/win_64_.yaml | 2 ++ 16 files changed, 107 insertions(+) diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index a2c392ff..b1a19fac 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index 4c13a3fa..d19e2f73 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index d147559c..23d93a73 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index 16cf4eb9..b548a7f6 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -12,6 +12,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -32,6 +36,9 @@ openmpi: - '4' target_platform: - linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index 31e60571..dea9d83b 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -12,6 +12,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -32,6 +36,9 @@ openmpi: - '4' target_platform: - linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index d6cc3860..c73b4cd4 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -12,6 +12,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -32,6 +36,9 @@ openmpi: - '4' target_platform: - linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index 47e1f0be..f6049097 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index 29abff4e..ac6e4686 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index 9d44e9fb..1d8367c5 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf4: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - linux-ppc64le +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index 13490990..6c6f7b2f 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' hdf4: - 4.2.15 hdf5: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index 39bcf650..c9470e2b 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' hdf4: - 4.2.15 hdf5: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index d1d94eed..6adab16d 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' hdf4: - 4.2.15 hdf5: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 163d5528..24667a1d 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' hdf4: - 4.2.15 hdf5: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index 309b60e2..df237df6 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' hdf4: - 4.2.15 hdf5: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index 9bb7bf7e..a2cd4504 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -8,6 +8,10 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' hdf4: - 4.2.15 hdf5: @@ -28,6 +32,9 @@ openmpi: - '4' target_platform: - osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version zlib: - '1.2' zstd: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a1f92edd..a342a804 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -4,6 +4,8 @@ channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 hdf4: - 4.2.15 hdf5: From 2fd52e0547d53b68209174584b4d116a24113bba Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 14:37:21 +0200 Subject: [PATCH 06/23] Remove legacy Win dependency --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1026b07e..70cbf241 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,6 @@ requirements: # - libjpeg-turbo - libxml2 # - libzip - - msinttypes # [win and vc<14] - zlib - zstd run: From a6ad3b68fe1ecf86e24f3443cd089af31caec19b Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 16:29:50 +0200 Subject: [PATCH 07/23] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 70cbf241..c783e20a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "4.9.2" %} -{% set build = 6 %} +{% set build = 7 %} # recipe-lint fails if mpi is undefined {% set mpi = mpi or 'nompi' %} From e0a784a059a342bcb11c69e6bc05018253a94283 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 17:12:12 +0200 Subject: [PATCH 08/23] Enable NCZARR_ZIP support --- recipe/build.sh | 1 + recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d8dd562b..be0e5c32 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -79,6 +79,7 @@ cmake ${CMAKE_ARGS} \ -DENABLE_EXTERNAL_SERVER_TESTS=OFF \ ${PARALLEL} \ -DENABLE_NCZARR=on \ + -DENABLE_NCZARR_ZIP=on \ -DENABLE_NCZARR_S3=off \ -DENABLE_NCZARR_S3_TESTS=off \ ${SRC_DIR} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c783e20a..2af95642 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,7 +77,7 @@ requirements: - libcurl # - libjpeg-turbo - libxml2 - # - libzip + - libzip - zlib - zstd run: From 98b2789e048c916abcaced519e176940d231b331 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 18:28:33 +0200 Subject: [PATCH 09/23] Re-add deps --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2af95642..a72c3cca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -68,14 +68,14 @@ requirements: host: - {{ mpi }} # [mpi != 'nompi'] - blosc - # - bzip2 + - bzip2 - hdf4 # without this repeat reference, conda-smithy doesn't pin correctly - hdf5 - hdf5 * {{ mpi_prefix }}_* - libaec - libcurl - # - libjpeg-turbo + - libjpeg-turbo - libxml2 - libzip - zlib From 9f174bdab37dd702f68ddfdde1045b2eb28301f7 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Mon, 3 Jul 2023 18:29:18 +0200 Subject: [PATCH 10/23] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.03.13.49.19 --- .ci_support/linux_64_mpimpich.yaml | 6 ++++++ .ci_support/linux_64_mpinompi.yaml | 6 ++++++ .ci_support/linux_64_mpiopenmpi.yaml | 6 ++++++ .ci_support/linux_aarch64_mpimpich.yaml | 6 ++++++ .ci_support/linux_aarch64_mpinompi.yaml | 6 ++++++ .ci_support/linux_aarch64_mpiopenmpi.yaml | 6 ++++++ .ci_support/linux_ppc64le_mpimpich.yaml | 6 ++++++ .ci_support/linux_ppc64le_mpinompi.yaml | 6 ++++++ .ci_support/linux_ppc64le_mpiopenmpi.yaml | 6 ++++++ .ci_support/osx_64_mpimpich.yaml | 6 ++++++ .ci_support/osx_64_mpinompi.yaml | 6 ++++++ .ci_support/osx_64_mpiopenmpi.yaml | 6 ++++++ .ci_support/osx_arm64_mpimpich.yaml | 6 ++++++ .ci_support/osx_arm64_mpinompi.yaml | 6 ++++++ .ci_support/osx_arm64_mpiopenmpi.yaml | 6 ++++++ .ci_support/win_64_.yaml | 6 ++++++ 16 files changed, 96 insertions(+) diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index b1a19fac..ac78f7dc 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -22,8 +24,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - mpich mpich: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index d19e2f73..8821ba71 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -22,8 +24,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - nompi mpich: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index 23d93a73..4ab28495 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -22,8 +24,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - openmpi mpich: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index b548a7f6..14b817f7 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -26,8 +28,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - mpich mpich: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index dea9d83b..67e07f9f 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -26,8 +28,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - nompi mpich: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index c73b4cd4..3684e6d3 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -1,5 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -26,8 +28,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - openmpi mpich: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index f6049097..91badb62 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -22,8 +24,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - mpich mpich: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index ac6e4686..5c85e59a 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -22,8 +24,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - nompi mpich: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index 1d8367c5..96697500 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - gcc c_compiler_version: @@ -22,8 +24,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - openmpi mpich: diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index 6c6f7b2f..3481ba9c 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +bzip2: +- '1' c_compiler: - clang c_compiler_version: @@ -20,8 +22,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index c9470e2b..e84391e4 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +bzip2: +- '1' c_compiler: - clang c_compiler_version: @@ -20,8 +22,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index 6adab16d..2e53d788 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +bzip2: +- '1' c_compiler: - clang c_compiler_version: @@ -20,8 +22,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpi: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 24667a1d..7acbbb99 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +bzip2: +- '1' c_compiler: - clang c_compiler_version: @@ -20,8 +22,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index df237df6..3ef6f973 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +bzip2: +- '1' c_compiler: - clang c_compiler_version: @@ -20,8 +22,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index a2cd4504..358f1f1c 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +bzip2: +- '1' c_compiler: - clang c_compiler_version: @@ -20,8 +22,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' macos_machine: - arm64-apple-darwin20.0.0 mpi: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a342a804..420c13e3 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,3 +1,5 @@ +bzip2: +- '1' c_compiler: - vs2019 channel_sources: @@ -14,8 +16,12 @@ libaec: - '1' libcurl: - '8' +libjpeg_turbo: +- 2.1.5 libxml2: - '2.11' +libzip: +- '1' mpi: - nompi mpich: From c9e4d5dc5dbed06c5e03db3aa7cb20390e630a3a Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Tue, 4 Jul 2023 14:43:16 +0200 Subject: [PATCH 11/23] Store artifacts to check run reqs --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 092b9fdf..e99f8cf7 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,3 +12,5 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true +azure: + store_build_artifacts: true From 520904acf7a2ddae28a32462f917ac3cd3f72cdc Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Tue, 4 Jul 2023 14:48:34 +0200 Subject: [PATCH 12/23] Remove run reqs that should come from run_exports --- recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a72c3cca..423b10fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -80,9 +80,6 @@ requirements: - libzip - zlib - zstd - run: - - {{ mpi }} # [mpi != 'nompi'] - - hdf5 * {{ mpi_prefix }}_* test: commands: From 7ecc64d62cc94ec1b5d264145941b8c373de3b49 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Tue, 4 Jul 2023 14:49:24 +0200 Subject: [PATCH 13/23] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.04.06.34.52 --- .azure-pipelines/azure-pipelines-linux.yml | 40 +++++++- .azure-pipelines/azure-pipelines-osx.yml | 37 ++++++- .azure-pipelines/azure-pipelines-win.yml | 28 +++++ .scripts/create_conda_build_artifacts.bat | 80 +++++++++++++++ .scripts/create_conda_build_artifacts.sh | 113 +++++++++++++++++++++ 5 files changed, 296 insertions(+), 2 deletions(-) create mode 100755 .scripts/create_conda_build_artifacts.bat create mode 100755 .scripts/create_conda_build_artifacts.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index eea1bef7..029a45e1 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,38 +12,47 @@ jobs: CONFIG: linux_64_mpimpich UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_mpimpich linux_64_mpinompi: CONFIG: linux_64_mpinompi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_mpinompi linux_64_mpiopenmpi: CONFIG: linux_64_mpiopenmpi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_mpiopenmpi linux_aarch64_mpimpich: CONFIG: linux_aarch64_mpimpich UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_mpimpich linux_aarch64_mpinompi: CONFIG: linux_aarch64_mpinompi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_mpinompi linux_aarch64_mpiopenmpi: CONFIG: linux_aarch64_mpiopenmpi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_mpiopenmpi linux_ppc64le_mpimpich: CONFIG: linux_ppc64le_mpimpich UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_mpimpich linux_ppc64le_mpinompi: CONFIG: linux_ppc64le_mpinompi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_mpinompi linux_ppc64le_mpiopenmpi: CONFIG: linux_ppc64le_mpiopenmpi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_ppc64le_mpiopenmpi timeoutInMinutes: 360 steps: @@ -74,4 +83,33 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export CONDA_BLD_DIR=build_artifacts + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_DIR except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_DIR environments only when the job fails + export ENV_ARTIFACT_PREFIX=conda_envs + fi + ./.scripts/create_conda_build_artifacts.sh + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 0f55bb1a..6c6dade4 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,21 +11,27 @@ jobs: osx_64_mpimpich: CONFIG: osx_64_mpimpich UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_mpimpich osx_64_mpinompi: CONFIG: osx_64_mpinompi UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_mpinompi osx_64_mpiopenmpi: CONFIG: osx_64_mpiopenmpi UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_mpiopenmpi osx_arm64_mpimpich: CONFIG: osx_arm64_mpimpich UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_mpimpich osx_arm64_mpinompi: CONFIG: osx_arm64_mpinompi UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_mpinompi osx_arm64_mpiopenmpi: CONFIG: osx_arm64_mpiopenmpi UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_mpiopenmpi timeoutInMinutes: 360 steps: @@ -45,4 +51,33 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_DIR except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_DIR environments only when the job fails + export ENV_ARTIFACT_PREFIX=conda_envs + fi + ./.scripts/create_conda_build_artifacts.sh + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a96a72e..44f93bca 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,6 +11,7 @@ jobs: win_64_: CONFIG: win_64_ UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_ timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -64,6 +65,33 @@ jobs: displayName: Build recipe env: PYTHONUNBUFFERED: 1 + - script: | + set CI=azure + set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + set FEEDSTOCK_NAME=$(build.Repository.Name) + set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) + set CONDA_BLD_DIR=$(CONDA_BLD_PATH) + set BLD_ARTIFACT_PREFIX=conda_artifacts + if "%AGENT_JOBSTATUS%" == "Failed" ( + set ENV_ARTIFACT_PREFIX=conda_envs + ) + call ".scripts\create_conda_build_artifacts.bat" + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat new file mode 100755 index 00000000..2853cfdc --- /dev/null +++ b/.scripts/create_conda_build_artifacts.bat @@ -0,0 +1,80 @@ +setlocal enableextensions enabledelayedexpansion + +rem INPUTS (environment variables that need to be set before calling this script): +rem +rem CI (azure/github_actions/UNSET) +rem CI_RUN_ID (unique identifier for the CI job run) +rem FEEDSTOCK_NAME +rem CONFIG (build matrix configuration string) +rem SHORT_CONFIG (uniquely-shortened configuration string) +rem CONDA_BLD_DIR (path to the conda-bld directory) +rem ARTIFACT_STAGING_DIR (use working directory if unset) +rem BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) +rem ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) + +rem OUTPUTS +rem +rem BLD_ARTIFACT_NAME +rem BLD_ARTIFACT_PATH +rem ENV_ARTIFACT_NAME +rem ENV_ARTIFACT_PATH + +rem Check that the conda-build directory exists +if not exist %CONDA_BLD_DIR% ( + echo conda-build directory does not exist + exit 1 +) + +if not defined ARTIFACT_STAGING_DIR ( + rem Set staging dir to the working dir + set ARTIFACT_STAGING_DIR=%cd% +) + +rem Set a unique ID for the artifact(s), specialized for this particular job run +set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% +if not "%ARTIFACT_UNIQUE_ID%" == "%ARTIFACT_UNIQUE_ID:~0,80%" ( + set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%SHORT_CONFIG% +) + +rem Set a descriptive ID for the archive(s), specialized for this particular job run +set ARCHIVE_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% + +rem Make the build artifact zip +if defined BLD_ARTIFACT_PREFIX ( + set BLD_ARTIFACT_NAME=%BLD_ARTIFACT_PREFIX%_%ARTIFACT_UNIQUE_ID% + echo BLD_ARTIFACT_NAME: !BLD_ARTIFACT_NAME! + + set "BLD_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%BLD_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" + 7z a "!BLD_ARTIFACT_PATH!" "%CONDA_BLD_DIR%" -xr^^!.git/ -xr^^!_*_env*/ -xr^^!*_cache/ -bb + if errorlevel 1 exit 1 + echo BLD_ARTIFACT_PATH: !BLD_ARTIFACT_PATH! + + if "%CI%" == "azure" ( + echo ##vso[task.setVariable variable=BLD_ARTIFACT_NAME]!BLD_ARTIFACT_NAME! + echo ##vso[task.setVariable variable=BLD_ARTIFACT_PATH]!BLD_ARTIFACT_PATH! + ) + if "%CI%" == "github_actions" ( + echo BLD_ARTIFACT_NAME=!BLD_ARTIFACT_NAME!>> !GITHUB_OUTPUT! + echo BLD_ARTIFACT_PATH=!BLD_ARTIFACT_PATH!>> !GITHUB_OUTPUT! + ) +) + +rem Make the environments artifact zip +if defined ENV_ARTIFACT_PREFIX ( + set ENV_ARTIFACT_NAME=!ENV_ARTIFACT_PREFIX!_%ARTIFACT_UNIQUE_ID% + echo ENV_ARTIFACT_NAME: !ENV_ARTIFACT_NAME! + + set "ENV_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%ENV_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" + 7z a "!ENV_ARTIFACT_PATH!" -r "%CONDA_BLD_DIR%"/_*_env*/ -bb + if errorlevel 1 exit 1 + echo ENV_ARTIFACT_PATH: !ENV_ARTIFACT_PATH! + + if "%CI%" == "azure" ( + echo ##vso[task.setVariable variable=ENV_ARTIFACT_NAME]!ENV_ARTIFACT_NAME! + echo ##vso[task.setVariable variable=ENV_ARTIFACT_PATH]!ENV_ARTIFACT_PATH! + ) + if "%CI%" == "github_actions" ( + echo ENV_ARTIFACT_NAME=!ENV_ARTIFACT_NAME!>> !GITHUB_OUTPUT! + echo ENV_ARTIFACT_PATH=!ENV_ARTIFACT_PATH!>> !GITHUB_OUTPUT! + ) +) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh new file mode 100755 index 00000000..17ec0868 --- /dev/null +++ b/.scripts/create_conda_build_artifacts.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash + +# INPUTS (environment variables that need to be set before calling this script): +# +# CI (azure/github_actions/UNSET) +# CI_RUN_ID (unique identifier for the CI job run) +# FEEDSTOCK_NAME +# CONFIG (build matrix configuration string) +# SHORT_CONFIG (uniquely-shortened configuration string) +# CONDA_BLD_DIR (path to the conda-bld directory) +# ARTIFACT_STAGING_DIR (use working directory if unset) +# BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) +# ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) + +# OUTPUTS +# +# BLD_ARTIFACT_NAME +# BLD_ARTIFACT_PATH +# ENV_ARTIFACT_NAME +# ENV_ARTIFACT_PATH + +source .scripts/logging_utils.sh + +# DON'T do set -x, because it results in double echo-ing pipeline commands +# and that might end up inserting extraneous quotation marks in output variables +set -e + +# Check that the conda-build directory exists +if [ ! -d "$CONDA_BLD_DIR" ]; then + echo "conda-build directory does not exist" + exit 1 +fi + +# Set staging dir to the working dir, in Windows style if applicable +if [[ -z "${ARTIFACT_STAGING_DIR}" ]]; then + if pwd -W; then + ARTIFACT_STAGING_DIR=$(pwd -W) + else + ARTIFACT_STAGING_DIR=$PWD + fi +fi +echo "ARTIFACT_STAGING_DIR: $ARTIFACT_STAGING_DIR" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + +# Set a unique ID for the artifact(s), specialized for this particular job run +ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" +if [[ ${#ARTIFACT_UNIQUE_ID} -gt 80 ]]; then + ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${SHORT_CONFIG}" +fi +echo "ARTIFACT_UNIQUE_ID: $ARTIFACT_UNIQUE_ID" + +# Set a descriptive ID for the archive(s), specialized for this particular job run +ARCHIVE_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" + +# Make the build artifact zip +if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then + export BLD_ARTIFACT_NAME="${BLD_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" + export BLD_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${BLD_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" + + ( startgroup "Archive conda build directory" ) 2> /dev/null + + # Try 7z and fall back to zip if it fails (for cross-platform use) + if ! 7z a "$BLD_ARTIFACT_PATH" "$CONDA_BLD_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then + pushd "$CONDA_BLD_DIR" + zip -r -y -T "$BLD_ARTIFACT_PATH" . -x '*.git/*' '*_*_env*/*' '*_cache/*' + popd + fi + + ( endgroup "Archive conda build directory" ) 2> /dev/null + + echo "BLD_ARTIFACT_NAME: $BLD_ARTIFACT_NAME" + echo "BLD_ARTIFACT_PATH: $BLD_ARTIFACT_PATH" + + if [[ "$CI" == "azure" ]]; then + echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" + echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" + elif [[ "$CI" == "github_actions" ]]; then + echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT + fi +fi + +# Make the environments artifact zip +if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then + export ENV_ARTIFACT_NAME="${ENV_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" + export ENV_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${ENV_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" + + ( startgroup "Archive conda build environments" ) 2> /dev/null + + # Try 7z and fall back to zip if it fails (for cross-platform use) + if ! 7z a "$ENV_ARTIFACT_PATH" -r "$CONDA_BLD_DIR"/'_*_env*/' -bb; then + pushd "$CONDA_BLD_DIR" + zip -r -y -T "$ENV_ARTIFACT_PATH" . -i '*_*_env*/*' + popd + fi + + ( endgroup "Archive conda build environments" ) 2> /dev/null + + echo "ENV_ARTIFACT_NAME: $ENV_ARTIFACT_NAME" + echo "ENV_ARTIFACT_PATH: $ENV_ARTIFACT_PATH" + + if [[ "$CI" == "azure" ]]; then + echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" + echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" + elif [[ "$CI" == "github_actions" ]]; then + echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT + echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT + fi +fi \ No newline at end of file From 8714e06faacc24e813c37e4de9062532a9e5bcfe Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Tue, 4 Jul 2023 16:37:06 +0200 Subject: [PATCH 14/23] Remove artifact storage --- conda-forge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index e99f8cf7..092b9fdf 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -12,5 +12,3 @@ provider: linux_aarch64: default linux_ppc64le: default test_on_native_only: true -azure: - store_build_artifacts: true From 74b8d55bea17f5b722ca96954f1924d25864319d Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Tue, 4 Jul 2023 16:38:07 +0200 Subject: [PATCH 15/23] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.04.14.14.08 --- .azure-pipelines/azure-pipelines-linux.yml | 40 +------- .azure-pipelines/azure-pipelines-osx.yml | 37 +------ .azure-pipelines/azure-pipelines-win.yml | 28 ----- .scripts/create_conda_build_artifacts.bat | 80 --------------- .scripts/create_conda_build_artifacts.sh | 113 --------------------- 5 files changed, 2 insertions(+), 296 deletions(-) delete mode 100755 .scripts/create_conda_build_artifacts.bat delete mode 100755 .scripts/create_conda_build_artifacts.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 029a45e1..eea1bef7 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,47 +12,38 @@ jobs: CONFIG: linux_64_mpimpich UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_mpimpich linux_64_mpinompi: CONFIG: linux_64_mpinompi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_mpinompi linux_64_mpiopenmpi: CONFIG: linux_64_mpiopenmpi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_mpiopenmpi linux_aarch64_mpimpich: CONFIG: linux_aarch64_mpimpich UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_mpimpich linux_aarch64_mpinompi: CONFIG: linux_aarch64_mpinompi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_mpinompi linux_aarch64_mpiopenmpi: CONFIG: linux_aarch64_mpiopenmpi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_mpiopenmpi linux_ppc64le_mpimpich: CONFIG: linux_ppc64le_mpimpich UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_ppc64le_mpimpich linux_ppc64le_mpinompi: CONFIG: linux_ppc64le_mpinompi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_ppc64le_mpinompi linux_ppc64le_mpiopenmpi: CONFIG: linux_ppc64le_mpiopenmpi UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_ppc64le_mpiopenmpi timeoutInMinutes: 360 steps: @@ -83,33 +74,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=build_artifacts - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 6c6dade4..0f55bb1a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,27 +11,21 @@ jobs: osx_64_mpimpich: CONFIG: osx_64_mpimpich UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_mpimpich osx_64_mpinompi: CONFIG: osx_64_mpinompi UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_mpinompi osx_64_mpiopenmpi: CONFIG: osx_64_mpiopenmpi UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_mpiopenmpi osx_arm64_mpimpich: CONFIG: osx_arm64_mpimpich UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_mpimpich osx_arm64_mpinompi: CONFIG: osx_arm64_mpinompi UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_mpinompi osx_arm64_mpiopenmpi: CONFIG: osx_arm64_mpiopenmpi UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_mpiopenmpi timeoutInMinutes: 360 steps: @@ -51,33 +45,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - - script: | - export CI=azure - export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - export CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld - export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" - # Archive everything in CONDA_BLD_DIR except environments - export BLD_ARTIFACT_PREFIX=conda_artifacts - if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then - # Archive the CONDA_BLD_DIR environments only when the job fails - export ENV_ARTIFACT_PREFIX=conda_envs - fi - ./.scripts/create_conda_build_artifacts.sh - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 44f93bca..8a96a72e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,7 +11,6 @@ jobs: win_64_: CONFIG: win_64_ UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_ timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -65,33 +64,6 @@ jobs: displayName: Build recipe env: PYTHONUNBUFFERED: 1 - - script: | - set CI=azure - set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) - set FEEDSTOCK_NAME=$(build.Repository.Name) - set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) - set CONDA_BLD_DIR=$(CONDA_BLD_PATH) - set BLD_ARTIFACT_PREFIX=conda_artifacts - if "%AGENT_JOBSTATUS%" == "Failed" ( - set ENV_ARTIFACT_PREFIX=conda_envs - ) - call ".scripts\create_conda_build_artifacts.bat" - displayName: Prepare conda build artifacts - condition: succeededOrFailed() - - - task: PublishPipelineArtifact@1 - displayName: Store conda build artifacts - condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) - inputs: - targetPath: $(BLD_ARTIFACT_PATH) - artifactName: $(BLD_ARTIFACT_NAME) - - - task: PublishPipelineArtifact@1 - displayName: Store conda build environment artifacts - condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) - inputs: - targetPath: $(ENV_ARTIFACT_PATH) - artifactName: $(ENV_ARTIFACT_NAME) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat deleted file mode 100755 index 2853cfdc..00000000 --- a/.scripts/create_conda_build_artifacts.bat +++ /dev/null @@ -1,80 +0,0 @@ -setlocal enableextensions enabledelayedexpansion - -rem INPUTS (environment variables that need to be set before calling this script): -rem -rem CI (azure/github_actions/UNSET) -rem CI_RUN_ID (unique identifier for the CI job run) -rem FEEDSTOCK_NAME -rem CONFIG (build matrix configuration string) -rem SHORT_CONFIG (uniquely-shortened configuration string) -rem CONDA_BLD_DIR (path to the conda-bld directory) -rem ARTIFACT_STAGING_DIR (use working directory if unset) -rem BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) -rem ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) - -rem OUTPUTS -rem -rem BLD_ARTIFACT_NAME -rem BLD_ARTIFACT_PATH -rem ENV_ARTIFACT_NAME -rem ENV_ARTIFACT_PATH - -rem Check that the conda-build directory exists -if not exist %CONDA_BLD_DIR% ( - echo conda-build directory does not exist - exit 1 -) - -if not defined ARTIFACT_STAGING_DIR ( - rem Set staging dir to the working dir - set ARTIFACT_STAGING_DIR=%cd% -) - -rem Set a unique ID for the artifact(s), specialized for this particular job run -set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% -if not "%ARTIFACT_UNIQUE_ID%" == "%ARTIFACT_UNIQUE_ID:~0,80%" ( - set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%SHORT_CONFIG% -) - -rem Set a descriptive ID for the archive(s), specialized for this particular job run -set ARCHIVE_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% - -rem Make the build artifact zip -if defined BLD_ARTIFACT_PREFIX ( - set BLD_ARTIFACT_NAME=%BLD_ARTIFACT_PREFIX%_%ARTIFACT_UNIQUE_ID% - echo BLD_ARTIFACT_NAME: !BLD_ARTIFACT_NAME! - - set "BLD_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%BLD_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" - 7z a "!BLD_ARTIFACT_PATH!" "%CONDA_BLD_DIR%" -xr^^!.git/ -xr^^!_*_env*/ -xr^^!*_cache/ -bb - if errorlevel 1 exit 1 - echo BLD_ARTIFACT_PATH: !BLD_ARTIFACT_PATH! - - if "%CI%" == "azure" ( - echo ##vso[task.setVariable variable=BLD_ARTIFACT_NAME]!BLD_ARTIFACT_NAME! - echo ##vso[task.setVariable variable=BLD_ARTIFACT_PATH]!BLD_ARTIFACT_PATH! - ) - if "%CI%" == "github_actions" ( - echo BLD_ARTIFACT_NAME=!BLD_ARTIFACT_NAME!>> !GITHUB_OUTPUT! - echo BLD_ARTIFACT_PATH=!BLD_ARTIFACT_PATH!>> !GITHUB_OUTPUT! - ) -) - -rem Make the environments artifact zip -if defined ENV_ARTIFACT_PREFIX ( - set ENV_ARTIFACT_NAME=!ENV_ARTIFACT_PREFIX!_%ARTIFACT_UNIQUE_ID% - echo ENV_ARTIFACT_NAME: !ENV_ARTIFACT_NAME! - - set "ENV_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%ENV_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" - 7z a "!ENV_ARTIFACT_PATH!" -r "%CONDA_BLD_DIR%"/_*_env*/ -bb - if errorlevel 1 exit 1 - echo ENV_ARTIFACT_PATH: !ENV_ARTIFACT_PATH! - - if "%CI%" == "azure" ( - echo ##vso[task.setVariable variable=ENV_ARTIFACT_NAME]!ENV_ARTIFACT_NAME! - echo ##vso[task.setVariable variable=ENV_ARTIFACT_PATH]!ENV_ARTIFACT_PATH! - ) - if "%CI%" == "github_actions" ( - echo ENV_ARTIFACT_NAME=!ENV_ARTIFACT_NAME!>> !GITHUB_OUTPUT! - echo ENV_ARTIFACT_PATH=!ENV_ARTIFACT_PATH!>> !GITHUB_OUTPUT! - ) -) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh deleted file mode 100755 index 17ec0868..00000000 --- a/.scripts/create_conda_build_artifacts.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -# INPUTS (environment variables that need to be set before calling this script): -# -# CI (azure/github_actions/UNSET) -# CI_RUN_ID (unique identifier for the CI job run) -# FEEDSTOCK_NAME -# CONFIG (build matrix configuration string) -# SHORT_CONFIG (uniquely-shortened configuration string) -# CONDA_BLD_DIR (path to the conda-bld directory) -# ARTIFACT_STAGING_DIR (use working directory if unset) -# BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) -# ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) - -# OUTPUTS -# -# BLD_ARTIFACT_NAME -# BLD_ARTIFACT_PATH -# ENV_ARTIFACT_NAME -# ENV_ARTIFACT_PATH - -source .scripts/logging_utils.sh - -# DON'T do set -x, because it results in double echo-ing pipeline commands -# and that might end up inserting extraneous quotation marks in output variables -set -e - -# Check that the conda-build directory exists -if [ ! -d "$CONDA_BLD_DIR" ]; then - echo "conda-build directory does not exist" - exit 1 -fi - -# Set staging dir to the working dir, in Windows style if applicable -if [[ -z "${ARTIFACT_STAGING_DIR}" ]]; then - if pwd -W; then - ARTIFACT_STAGING_DIR=$(pwd -W) - else - ARTIFACT_STAGING_DIR=$PWD - fi -fi -echo "ARTIFACT_STAGING_DIR: $ARTIFACT_STAGING_DIR" - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -if [ -z ${FEEDSTOCK_NAME} ]; then - export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) -fi - -# Set a unique ID for the artifact(s), specialized for this particular job run -ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" -if [[ ${#ARTIFACT_UNIQUE_ID} -gt 80 ]]; then - ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${SHORT_CONFIG}" -fi -echo "ARTIFACT_UNIQUE_ID: $ARTIFACT_UNIQUE_ID" - -# Set a descriptive ID for the archive(s), specialized for this particular job run -ARCHIVE_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" - -# Make the build artifact zip -if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then - export BLD_ARTIFACT_NAME="${BLD_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" - export BLD_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${BLD_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" - - ( startgroup "Archive conda build directory" ) 2> /dev/null - - # Try 7z and fall back to zip if it fails (for cross-platform use) - if ! 7z a "$BLD_ARTIFACT_PATH" "$CONDA_BLD_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then - pushd "$CONDA_BLD_DIR" - zip -r -y -T "$BLD_ARTIFACT_PATH" . -x '*.git/*' '*_*_env*/*' '*_cache/*' - popd - fi - - ( endgroup "Archive conda build directory" ) 2> /dev/null - - echo "BLD_ARTIFACT_NAME: $BLD_ARTIFACT_NAME" - echo "BLD_ARTIFACT_PATH: $BLD_ARTIFACT_PATH" - - if [[ "$CI" == "azure" ]]; then - echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" - echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" - elif [[ "$CI" == "github_actions" ]]; then - echo "BLD_ARTIFACT_NAME=$BLD_ARTIFACT_NAME" >> $GITHUB_OUTPUT - echo "BLD_ARTIFACT_PATH=$BLD_ARTIFACT_PATH" >> $GITHUB_OUTPUT - fi -fi - -# Make the environments artifact zip -if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then - export ENV_ARTIFACT_NAME="${ENV_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" - export ENV_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${ENV_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" - - ( startgroup "Archive conda build environments" ) 2> /dev/null - - # Try 7z and fall back to zip if it fails (for cross-platform use) - if ! 7z a "$ENV_ARTIFACT_PATH" -r "$CONDA_BLD_DIR"/'_*_env*/' -bb; then - pushd "$CONDA_BLD_DIR" - zip -r -y -T "$ENV_ARTIFACT_PATH" . -i '*_*_env*/*' - popd - fi - - ( endgroup "Archive conda build environments" ) 2> /dev/null - - echo "ENV_ARTIFACT_NAME: $ENV_ARTIFACT_NAME" - echo "ENV_ARTIFACT_PATH: $ENV_ARTIFACT_PATH" - - if [[ "$CI" == "azure" ]]; then - echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" - echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" - elif [[ "$CI" == "github_actions" ]]; then - echo "ENV_ARTIFACT_NAME=$ENV_ARTIFACT_NAME" >> $GITHUB_OUTPUT - echo "ENV_ARTIFACT_PATH=$ENV_ARTIFACT_PATH" >> $GITHUB_OUTPUT - fi -fi \ No newline at end of file From 74149c0373db7a9c0eb4f56936df68a003cc520e Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 09:31:02 +0200 Subject: [PATCH 16/23] Enable NCZARR_ZIP support also on Windows --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index f3f0ca8c..fe4f3a95 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -21,6 +21,7 @@ cmake -LAH -G "NMake Makefiles" ^ -DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^ -DCMAKE_C_FLAGS="-DH5_BUILT_AS_DYNAMIC_LIB" ^ -DENABLE_NCZARR=on ^ + -DENABLE_NCZARR_ZIP=on ^ -DENABLE_NCZARR_S3=off ^ -DENABLE_NCZARR_S3_TESTS=off ^ -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^ From 0d68f0a75de96f0e66a156714e1ebece4821f543 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 10:40:04 +0200 Subject: [PATCH 17/23] Make Cmake config for Windows and Unix more similar --- recipe/bld.bat | 27 +++++++++++++++++++-------- recipe/build.sh | 13 +++++++------ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index fe4f3a95..c4009bd5 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,26 +5,37 @@ set BUILD_TYPE=Release :: set BUILD_TYPE=RelWithDebInfo :: set BUILD_TYPE=Debug +rem to be filled with mpi options +set PARALLEL="" + rem manually specify hdf5 paths to work-around https://github.com/Unidata/netcdf-c/issues/1444 cmake -LAH -G "NMake Makefiles" ^ + %CMAKE_ARGS% ^ -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^ + -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^ + -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^ -DBUILD_SHARED_LIBS=ON ^ - -DPLUGIN_INSTALL_DIR=YES ^ + -DBUILD_UTILITIES=ON ^ + -DENABLE_DOXYGEN=OFF ^ -DENABLE_TESTS=ON ^ + -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^ + -DENABLE_DAP=ON ^ + -DENABLE_DAP_REMOTE_TESTS=OFF ^ -DENABLE_HDF4=ON ^ - -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^ - -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^ + -DENABLE_NETCDF_4=ON ^ + -DENABLE_PLUGIN_INSTALL=ON ^ + -DPLUGIN_INSTALL_DIR=YES ^ -DENABLE_CDF5=ON ^ -DENABLE_BYTERANGE=ON ^ - -DHDF5_C_LIBRARY="%LIBRARY_LIB:\=/%/hdf5.lib" ^ - -DHDF5_HL_LIBRARY="%LIBRARY_LIB:\=/%/hdf5_hl.lib" ^ - -DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^ - -DCMAKE_C_FLAGS="-DH5_BUILT_AS_DYNAMIC_LIB" ^ -DENABLE_NCZARR=on ^ -DENABLE_NCZARR_ZIP=on ^ -DENABLE_NCZARR_S3=off ^ -DENABLE_NCZARR_S3_TESTS=off ^ - -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^ + -DHDF5_C_LIBRARY="%LIBRARY_LIB:\=/%/hdf5.lib" ^ + -DHDF5_HL_LIBRARY="%LIBRARY_LIB:\=/%/hdf5_hl.lib" ^ + -DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^ + -DCMAKE_C_FLAGS="-DH5_BUILT_AS_DYNAMIC_LIB" ^ + %PARALLEL% ^ %SRC_DIR% if errorlevel 1 exit \b 1 diff --git a/recipe/build.sh b/recipe/build.sh index be0e5c32..05316ee2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -65,23 +65,24 @@ cd build-shared cmake ${CMAKE_ARGS} \ -DCMAKE_PREFIX_PATH=${PREFIX} \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_UTILITIES=ON \ + -DENABLE_DOXYGEN=OFF \ + -DENABLE_TESTS=ON \ + -DENABLE_EXTERNAL_SERVER_TESTS=OFF \ -DENABLE_DAP=ON \ -DENABLE_DAP_REMOTE_TESTS=OFF \ -DENABLE_HDF4=ON \ -DENABLE_NETCDF_4=ON \ - -DBUILD_SHARED_LIBS=ON \ -DENABLE_PLUGIN_INSTALL=ON \ -DPLUGIN_INSTALL_DIR=${HDF5_PLUGIN_PATH} \ - -DENABLE_TESTS=ON \ - -DBUILD_UTILITIES=ON \ - -DENABLE_DOXYGEN=OFF \ -DENABLE_CDF5=ON \ - -DENABLE_EXTERNAL_SERVER_TESTS=OFF \ - ${PARALLEL} \ + -DENABLE_BYTERANGE=ON \ -DENABLE_NCZARR=on \ -DENABLE_NCZARR_ZIP=on \ -DENABLE_NCZARR_S3=off \ -DENABLE_NCZARR_S3_TESTS=off \ + ${PARALLEL} \ ${SRC_DIR} make install -j${CPU_COUNT} ${VERBOSE_CM} From b923e9606f90b2c3ea6ab118d82db21ae9b60f31 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 11:00:33 +0200 Subject: [PATCH 18/23] Add cmake bzip2 patch --- recipe/meta.yaml | 1 + ...ustom-Bzip2-cmake-module-to-standard.patch | 235 ++++++++++++++++++ 2 files changed, 236 insertions(+) create mode 100644 recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 423b10fc..53318d2f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,6 +21,7 @@ source: - patches/prevent_MS_runtime_libs_being_installed_again.patch # [win] - patches/do_not_use_16_processes_in_tests.patch # [ppc64le] - patches/0001-Fix-issue-2674.patch + - patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch build: number: {{ build }} diff --git a/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch new file mode 100644 index 00000000..a6a0b99a --- /dev/null +++ b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch @@ -0,0 +1,235 @@ +From 3669c38f81cb9cc56a9e38d4ad041002a579fd5a Mon Sep 17 00:00:00 2001 +From: Klaus Zimmermann +Date: Wed, 5 Jul 2023 10:45:08 +0200 +Subject: [PATCH] Switch custom Bzip2 cmake module to standard + +--- + CMakeLists.txt | 15 ++++---- + cmake/modules/FindBz2.cmake | 64 ----------------------------------- + cmake/modules/FindBzip2.cmake | 64 ----------------------------------- + liblib/CMakeLists.txt | 4 +-- + plugins/CMakeLists.txt | 4 +-- + 5 files changed, 12 insertions(+), 139 deletions(-) + delete mode 100644 cmake/modules/FindBz2.cmake + delete mode 100644 cmake/modules/FindBzip2.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3721a8fb..eecd4afe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1125,7 +1125,7 @@ endmacro(set_std_filter) + + # Locate some compressors + FIND_PACKAGE(Szip) +-FIND_PACKAGE(Bz2) ++FIND_PACKAGE(BZip2) + FIND_PACKAGE(Blosc) + FIND_PACKAGE(Zstd) + +@@ -1135,14 +1135,14 @@ set_std_filter(Szip) + SET(HAVE_SZ ${Szip_FOUND}) + set_std_filter(Blosc) + set_std_filter(Zstd) +-IF(Bz2_FOUND) +- set_std_filter(Bz2) ++IF(BZIP2_FOUND) ++ set_std_filter(BZIP2) + ELSE() + # The reason we use a local version is to support a more comples test case + MESSAGE("libbz2 not found using built-in version") +- SET(HAVE_LOCAL_BZ2 ON) +- SET(HAVE_BZ2 ON) +- set(STD_FILTERS "${STD_FILTERS} bz2") ++ SET(HAVE_LOCAL_BZIP2 ON) ++ SET(HAVE_BZIP2 ON) ++ set(STD_FILTERS "${STD_FILTERS} bzip2") + ENDIF() + + # If user wants, then install selected plugins (default on) +@@ -2562,7 +2562,8 @@ is_enabled(HAVE_SZ HAS_SZIP) + is_enabled(HAVE_SZ HAS_SZLIB_WRITE) + is_enabled(HAVE_ZSTD HAS_ZSTD) + is_enabled(HAVE_BLOSC HAS_BLOSC) +-is_enabled(HAVE_BZ2 HAS_BZ2) ++is_enabled(HAVE_BZIP2 HAS_BZIP2) ++is_enabled(HAVE_BZIP2 HAS_BZ2) + is_enabled(ENABLE_REMOTE_FUNCTIONALITY DO_REMOTE_FUNCTIONALITY) + + if(ENABLE_S3_INTERNAL) +diff --git a/cmake/modules/FindBz2.cmake b/cmake/modules/FindBz2.cmake +deleted file mode 100644 +index 89d66e18..00000000 +--- a/cmake/modules/FindBz2.cmake ++++ /dev/null +@@ -1,64 +0,0 @@ +-# Searches for an installation of the bz2 library. On success, it sets the following variables: +-# +-# Bz2_FOUND Set to true to indicate the bz2 library was found +-# Bz2_INCLUDE_DIRS The directory containing the header file bz2/bz2.h +-# Bz2_LIBRARIES The libraries needed to use the bz2 library +-# +-# To specify an additional directory to search, set Bz2_ROOT. +-# +-# Author: Siddhartha Chaudhuri, 2009 +-# +- +-# Look for the header, first in the user-specified location and then in the system locations +-SET(Bz2_INCLUDE_DOC "The directory containing the header file bz2.h") +-FIND_PATH(Bz2_INCLUDE_DIRS NAMES bz2.h bz2/bz2.h PATHS ${Bz2_ROOT} ${Bz2_ROOT}/include DOC ${Bz2_INCLUDE_DOC} NO_DEFAULT_PATH) +-IF(NOT Bz2_INCLUDE_DIRS) # now look in system locations +- FIND_PATH(Bz2_INCLUDE_DIRS NAMES bzlib.h DOC ${Bz2_INCLUDE_DOC}) +-ENDIF(NOT Bz2_INCLUDE_DIRS) +- +-SET(Bz2_FOUND FALSE) +- +-IF(Bz2_INCLUDE_DIRS) +- SET(Bz2_LIBRARY_DIRS ${Bz2_INCLUDE_DIRS}) +- +- IF("${Bz2_LIBRARY_DIRS}" MATCHES "/include$") +- # Strip off the trailing "/include" in the path. +- GET_FILENAME_COMPONENT(Bz2_LIBRARY_DIRS ${Bz2_LIBRARY_DIRS} PATH) +- ENDIF("${Bz2_LIBRARY_DIRS}" MATCHES "/include$") +- +- IF(EXISTS "${Bz2_LIBRARY_DIRS}/lib") +- SET(Bz2_LIBRARY_DIRS ${Bz2_LIBRARY_DIRS}/lib) +- ENDIF(EXISTS "${Bz2_LIBRARY_DIRS}/lib") +- +- # Find Bz2 libraries +- FIND_LIBRARY(Bz2_DEBUG_LIBRARY NAMES bz2d bz2_d libbz2d libbz2_d libbz2 +- PATH_SUFFIXES Debug ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Debug +- PATHS ${Bz2_LIBRARY_DIRS} NO_DEFAULT_PATH) +- FIND_LIBRARY(Bz2_RELEASE_LIBRARY NAMES bz2 libbz2 +- PATH_SUFFIXES Release ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Release +- PATHS ${Bz2_LIBRARY_DIRS} NO_DEFAULT_PATH) +- +- SET(Bz2_LIBRARIES ) +- IF(Bz2_DEBUG_LIBRARY AND Bz2_RELEASE_LIBRARY) +- SET(Bz2_LIBRARIES debug ${Bz2_DEBUG_LIBRARY} optimized ${Bz2_RELEASE_LIBRARY}) +- ELSEIF(Bz2_DEBUG_LIBRARY) +- SET(Bz2_LIBRARIES ${Bz2_DEBUG_LIBRARY}) +- ELSEIF(Bz2_RELEASE_LIBRARY) +- SET(Bz2_LIBRARIES ${Bz2_RELEASE_LIBRARY}) +- ENDIF(Bz2_DEBUG_LIBRARY AND Bz2_RELEASE_LIBRARY) +- +- IF(Bz2_LIBRARIES) +- SET(Bz2_FOUND TRUE) +- ENDIF(Bz2_LIBRARIES) +-ENDIF(Bz2_INCLUDE_DIRS) +- +-IF(Bz2_FOUND) +-# IF(NOT Bz2_FIND_QUIETLY) +- MESSAGE(STATUS "Found Bz2: headers at ${Bz2_INCLUDE_DIRS}, libraries at ${Bz2_LIBRARY_DIRS}") +- MESSAGE(STATUS " library is ${Bz2_LIBRARIES}") +-# ENDIF(NOT Bz2_FIND_QUIETLY) +-ELSE(Bz2_FOUND) +- IF(Bz2_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "Bz2 library not found") +- ENDIF(Bz2_FIND_REQUIRED) +-ENDIF(Bz2_FOUND) +diff --git a/cmake/modules/FindBzip2.cmake b/cmake/modules/FindBzip2.cmake +deleted file mode 100644 +index 9b6c9471..00000000 +--- a/cmake/modules/FindBzip2.cmake ++++ /dev/null +@@ -1,64 +0,0 @@ +-# Searches for an installation of the bzip2 library. On success, it sets the following variables: +-# +-# Bzip2_FOUND Set to true to indicate the bzip2 library was found +-# Bzip2_INCLUDE_DIRS The directory containing the header file bzip2/bzip2.h +-# Bzip2_LIBRARIES The libraries needed to use the bzip2 library +-# +-# To specify an additional directory to search, set Bzip2_ROOT. +-# +-# Author: Siddhartha Chaudhuri, 2009 +-# +- +-# Look for the header, first in the user-specified location and then in the system locations +-SET(Bzip2_INCLUDE_DOC "The directory containing the header file bzip2.h") +-FIND_PATH(Bzip2_INCLUDE_DIRS NAMES bzip2.h bzip2/bzip2.h PATHS ${Bzip2_ROOT} ${Bzip2_ROOT}/include DOC ${Bzip2_INCLUDE_DOC} NO_DEFAULT_PATH) +-IF(NOT Bzip2_INCLUDE_DIRS) # now look in system locations +- FIND_PATH(Bzip2_INCLUDE_DIRS NAMES bzlib.h DOC ${Bzip2_INCLUDE_DOC}) +-ENDIF(NOT Bzip2_INCLUDE_DIRS) +- +-SET(Bzip2_FOUND FALSE) +- +-IF(Bzip2_INCLUDE_DIRS) +- SET(Bzip2_LIBRARY_DIRS ${Bzip2_INCLUDE_DIRS}) +- +- IF("${Bzip2_LIBRARY_DIRS}" MATCHES "/include$") +- # Strip off the trailing "/include" in the path. +- GET_FILENAME_COMPONENT(Bzip2_LIBRARY_DIRS ${Bzip2_LIBRARY_DIRS} PATH) +- ENDIF("${Bzip2_LIBRARY_DIRS}" MATCHES "/include$") +- +- IF(EXISTS "${Bzip2_LIBRARY_DIRS}/lib") +- SET(Bzip2_LIBRARY_DIRS ${Bzip2_LIBRARY_DIRS}/lib) +- ENDIF(EXISTS "${Bzip2_LIBRARY_DIRS}/lib") +- +- # Find Bzip2 libraries +- FIND_LIBRARY(Bzip2_DEBUG_LIBRARY NAMES bzip2d bzip2_d libbzip2d libbzip2_d libbzip2 +- PATH_SUFFIXES Debug ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Debug +- PATHS ${Bzip2_LIBRARY_DIRS} NO_DEFAULT_PATH) +- FIND_LIBRARY(Bzip2_RELEASE_LIBRARY NAMES bzip2 libbzip2 +- PATH_SUFFIXES Release ${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_ARCHITECTURE}/Release +- PATHS ${Bzip2_LIBRARY_DIRS} NO_DEFAULT_PATH) +- +- SET(Bzip2_LIBRARIES ) +- IF(Bzip2_DEBUG_LIBRARY AND Bzip2_RELEASE_LIBRARY) +- SET(Bzip2_LIBRARIES debug ${Bzip2_DEBUG_LIBRARY} optimized ${Bzip2_RELEASE_LIBRARY}) +- ELSEIF(Bzip2_DEBUG_LIBRARY) +- SET(Bzip2_LIBRARIES ${Bzip2_DEBUG_LIBRARY}) +- ELSEIF(Bzip2_RELEASE_LIBRARY) +- SET(Bzip2_LIBRARIES ${Bzip2_RELEASE_LIBRARY}) +- ENDIF(Bzip2_DEBUG_LIBRARY AND Bzip2_RELEASE_LIBRARY) +- +- IF(Bzip2_LIBRARIES) +- SET(Bzip2_FOUND TRUE) +- ENDIF(Bzip2_LIBRARIES) +-ENDIF(Bzip2_INCLUDE_DIRS) +- +-IF(Bzip2_FOUND) +-# IF(NOT Bzip2_FIND_QUIETLY) +- MESSAGE(STATUS "Found Bzip2: headers at ${Bzip2_INCLUDE_DIRS}, libraries at ${Bzip2_LIBRARY_DIRS}") +- MESSAGE(STATUS " library is ${Bzip2_LIBRARIES}") +-# ENDIF(NOT Bzip2_FIND_QUIETLY) +-ELSE(Bzip2_FOUND) +- IF(Bzip2_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "Bzip2 library not found") +- ENDIF(Bzip2_FIND_REQUIRED) +-ENDIF(Bzip2_FOUND) +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ce2bd85a..d1cdbb5e 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -91,8 +91,8 @@ ENDIF() + IF(Zstd_FOUND) + SET(TLL_LIBS ${TLL_LIBS} ${Zstd_LIBRARIES}) + ENDIF() +-IF(Bz2_FOUND) +-SET(TLL_LIBS ${TLL_LIBS} ${Bz2_LIBRARIES}) ++IF(BZIP2_FOUND) ++SET(TLL_LIBS ${TLL_LIBS} ${BZIP2_LIBRARIES}) + ENDIF() + IF(SZIP_FOUND) + SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARIES}) +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index 65891d82..61c336b8 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -94,12 +94,12 @@ IF(HAVE_SZ) + buildplugin(h5szip "h5szip" ${Szip_LIBRARIES}) + ENDIF() + +-IF(HAVE_LOCAL_BZ2) ++IF(HAVE_LOCAL_BZIP2) + SET(h5bzip2_SOURCES H5Zbzip2.c blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c bzlib.h bzlib_private.h) + buildplugin(h5bzip2 "h5bzip2") + ELSE() + SET(h5bzip2_SOURCES H5Zbzip2.c) +-buildplugin(h5bzip2 "h5bzip2" ${Bzip2_LIBRARIES}) ++buildplugin(h5bzip2 "h5bzip2" ${BZIP2_LIBRARIES}) + ENDIF() + + +-- +2.39.1 + From 3ff40ec43811607bb5133e848371972d57bb3a65 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 11:09:46 +0200 Subject: [PATCH 19/23] Use correctly backported version of patch --- ...custom-Bzip2-cmake-module-to-standard.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch index a6a0b99a..1ff6f946 100644 --- a/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch +++ b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch @@ -1,4 +1,4 @@ -From 3669c38f81cb9cc56a9e38d4ad041002a579fd5a Mon Sep 17 00:00:00 2001 +From 53da64b8eea66c4f07e4a31c2aa044cc4e6b114a Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 10:45:08 +0200 Subject: [PATCH] Switch custom Bzip2 cmake module to standard @@ -14,10 +14,10 @@ Subject: [PATCH] Switch custom Bzip2 cmake module to standard delete mode 100644 cmake/modules/FindBzip2.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3721a8fb..eecd4afe 100644 +index de95010c..4a912713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1125,7 +1125,7 @@ endmacro(set_std_filter) +@@ -1132,7 +1132,7 @@ endmacro(set_std_filter) # Locate some compressors FIND_PACKAGE(Szip) @@ -26,7 +26,7 @@ index 3721a8fb..eecd4afe 100644 FIND_PACKAGE(Blosc) FIND_PACKAGE(Zstd) -@@ -1135,14 +1135,14 @@ set_std_filter(Szip) +@@ -1142,14 +1142,14 @@ set_std_filter(Szip) SET(HAVE_SZ ${Szip_FOUND}) set_std_filter(Blosc) set_std_filter(Zstd) @@ -46,16 +46,16 @@ index 3721a8fb..eecd4afe 100644 ENDIF() # If user wants, then install selected plugins (default on) -@@ -2562,7 +2562,8 @@ is_enabled(HAVE_SZ HAS_SZIP) +@@ -2565,7 +2565,8 @@ is_enabled(HAVE_SZ HAS_SZIP) is_enabled(HAVE_SZ HAS_SZLIB_WRITE) is_enabled(HAVE_ZSTD HAS_ZSTD) is_enabled(HAVE_BLOSC HAS_BLOSC) -is_enabled(HAVE_BZ2 HAS_BZ2) +is_enabled(HAVE_BZIP2 HAS_BZIP2) +is_enabled(HAVE_BZIP2 HAS_BZ2) - is_enabled(ENABLE_REMOTE_FUNCTIONALITY DO_REMOTE_FUNCTIONALITY) - if(ENABLE_S3_INTERNAL) + + # Generate file from template. diff --git a/cmake/modules/FindBz2.cmake b/cmake/modules/FindBz2.cmake deleted file mode 100644 index 89d66e18..00000000 @@ -197,10 +197,10 @@ index 9b6c9471..00000000 - ENDIF(Bzip2_FIND_REQUIRED) -ENDIF(Bzip2_FOUND) diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index ce2bd85a..d1cdbb5e 100644 +index e3eddc0f..f38a7ea9 100644 --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt -@@ -91,8 +91,8 @@ ENDIF() +@@ -87,8 +87,8 @@ ENDIF() IF(Zstd_FOUND) SET(TLL_LIBS ${TLL_LIBS} ${Zstd_LIBRARIES}) ENDIF() From ace7ce52d38e1a2ec191b4b30b13969c733d6842 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 11:37:18 +0200 Subject: [PATCH 20/23] Fix typo in patch --- ...-custom-Bzip2-cmake-module-to-standard.patch | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch index 1ff6f946..f2a0268e 100644 --- a/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch +++ b/recipe/patches/0001-Switch-custom-Bzip2-cmake-module-to-standard.patch @@ -1,4 +1,4 @@ -From 53da64b8eea66c4f07e4a31c2aa044cc4e6b114a Mon Sep 17 00:00:00 2001 +From b38811cf38f9e8a62f6675ef17280eb938e59c89 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 10:45:08 +0200 Subject: [PATCH] Switch custom Bzip2 cmake module to standard @@ -8,8 +8,8 @@ Subject: [PATCH] Switch custom Bzip2 cmake module to standard cmake/modules/FindBz2.cmake | 64 ----------------------------------- cmake/modules/FindBzip2.cmake | 64 ----------------------------------- liblib/CMakeLists.txt | 4 +-- - plugins/CMakeLists.txt | 4 +-- - 5 files changed, 12 insertions(+), 139 deletions(-) + plugins/CMakeLists.txt | 6 ++-- + 5 files changed, 13 insertions(+), 140 deletions(-) delete mode 100644 cmake/modules/FindBz2.cmake delete mode 100644 cmake/modules/FindBzip2.cmake @@ -212,7 +212,7 @@ index e3eddc0f..f38a7ea9 100644 IF(SZIP_FOUND) SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARIES}) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index 65891d82..61c336b8 100644 +index 65891d82..a8e1a212 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -94,12 +94,12 @@ IF(HAVE_SZ) @@ -230,6 +230,15 @@ index 65891d82..61c336b8 100644 ENDIF() +@@ -113,7 +113,7 @@ MACRO(installplugin PLUG) + ENDMACRO() + + install(DIRECTORY DESTINATION ${PLUGIN_INSTALL_DIR}) +-IF(Bzip2_FOUND) ++IF(BZIP2_FOUND) + installplugin(h5bzip2) + ENDIF() + IF(Zstd_FOUND) -- 2.39.1 From fba63f332938b0f6ae7d771f902c1b5e8fc1ae30 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 12:05:21 +0200 Subject: [PATCH 21/23] Remove libjpeg-turbo from reqs; it's only for hdf4 --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 53318d2f..f482de5a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,7 +76,6 @@ requirements: - hdf5 * {{ mpi_prefix }}_* - libaec - libcurl - - libjpeg-turbo - libxml2 - libzip - zlib From 4be17639538ae301a6a695530f5a71caf1a362e7 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 12:06:16 +0200 Subject: [PATCH 22/23] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.05.03.37.54 --- .ci_support/linux_64_mpimpich.yaml | 2 -- .ci_support/linux_64_mpinompi.yaml | 2 -- .ci_support/linux_64_mpiopenmpi.yaml | 2 -- .ci_support/linux_aarch64_mpimpich.yaml | 2 -- .ci_support/linux_aarch64_mpinompi.yaml | 2 -- .ci_support/linux_aarch64_mpiopenmpi.yaml | 2 -- .ci_support/linux_ppc64le_mpimpich.yaml | 2 -- .ci_support/linux_ppc64le_mpinompi.yaml | 2 -- .ci_support/linux_ppc64le_mpiopenmpi.yaml | 2 -- .ci_support/osx_64_mpimpich.yaml | 2 -- .ci_support/osx_64_mpinompi.yaml | 2 -- .ci_support/osx_64_mpiopenmpi.yaml | 2 -- .ci_support/osx_arm64_mpimpich.yaml | 2 -- .ci_support/osx_arm64_mpinompi.yaml | 2 -- .ci_support/osx_arm64_mpiopenmpi.yaml | 2 -- .ci_support/win_64_.yaml | 2 -- 16 files changed, 32 deletions(-) diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index ac78f7dc..d2f57caa 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -24,8 +24,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index 8821ba71..8bfc880d 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -24,8 +24,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index 4ab28495..00cfae9b 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -24,8 +24,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index 14b817f7..c7372b7b 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -28,8 +28,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index 67e07f9f..6ce9151b 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -28,8 +28,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index 3684e6d3..ee8c0cb1 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -28,8 +28,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index 91badb62..2fe2edd8 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -24,8 +24,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index 5c85e59a..fe402851 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -24,8 +24,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index 96697500..4a14752a 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -24,8 +24,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index 3481ba9c..cda526f1 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -22,8 +22,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index e84391e4..639522f0 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -22,8 +22,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index 2e53d788..4b5ddc3a 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -22,8 +22,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 7acbbb99..b669906f 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -22,8 +22,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index 3ef6f973..61818791 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -22,8 +22,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index 358f1f1c..eb788b99 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -22,8 +22,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 420c13e3..0b3691c1 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -16,8 +16,6 @@ libaec: - '1' libcurl: - '8' -libjpeg_turbo: -- 2.1.5 libxml2: - '2.11' libzip: From 43bbb75f711a084a3a869be9ca2a1f71e9f320b8 Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Wed, 5 Jul 2023 14:45:05 +0200 Subject: [PATCH 23/23] Add openssl dependency --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f482de5a..632a0cea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,6 +78,9 @@ requirements: - libcurl - libxml2 - libzip + # Openssl provides libcrypto which is needed via libcurl, but doesn't get + # to the run reqs through run_exports because it is twice removed + - openssl # [unix] - zlib - zstd