diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 70ae05a..60fd811 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_mpimpich: diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index c8928f9..a6809ff 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -5,7 +5,7 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: - cos6 channel_sources: @@ -33,7 +33,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index c6e02c7..ea7767e 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -5,7 +5,7 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: - cos6 channel_sources: @@ -33,7 +33,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index 6087745..6574f5d 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -5,7 +5,7 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: - cos6 channel_sources: @@ -33,7 +33,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index 183aaaf..6acc9b3 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -37,7 +37,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index 3654bdd..7df8803 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -37,7 +37,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index 2784eb1..df1026a 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -37,7 +37,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index 3659864..2b2f882 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -33,7 +33,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index de2023f..381a4e9 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -33,7 +33,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index d9d3faf..267e9ae 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -33,7 +33,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/migrations/openmpi5.yaml b/.ci_support/migrations/openmpi5.yaml new file mode 100644 index 0000000..74cdfc6 --- /dev/null +++ b/.ci_support/migrations/openmpi5.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for openmpi 5 + kind: version + migration_number: 1 +migrator_ts: 1703196161.1453235 +openmpi: +- '5' diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index 66ac4c7..6a24c27 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: @@ -7,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -33,7 +35,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index e04805b..96daf48 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: @@ -7,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -33,7 +35,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index 2893d03..7b33a1b 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: @@ -7,7 +9,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -33,7 +35,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 90d2e3c..879d3be 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -33,7 +35,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index b07be73..703b834 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -33,7 +35,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index 2b47f6c..8fd2f71 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: @@ -33,7 +35,7 @@ mpich: netcdf_fortran: - '4.6' openmpi: -- '4' +- '5' perl: - 5.32.1 target_platform: diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 6f98d4c..8041ff5 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,8 @@ mpi: - nompi - mpich # [not win] - - openmpi # [not win] \ No newline at end of file + - openmpi # [not win] + +# needed to avoid issue in https://github.com/conda-forge/openmpi-feedstock/issues/143 +c_stdlib_version: + - 2.17 # [linux] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 01cd6a1..0227cfa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "8.6.1" %} -{% set build = 0 %} +{% set build = 1 %} # ensure mpi is defined (needed for conda-smithy recipe-lint) {% set mpi = mpi or 'nompi' %} @@ -60,12 +60,14 @@ requirements: - libnetcdf * {{ mpi_prefix }}_* # [build_platform != target_platform and mpi == 'openmpi'] # Unix - {{ compiler('c') }} # [unix] + - {{ stdlib("c") }} # [unix] - {{ compiler('cxx') }} # [unix] - {{ compiler('fortran') }} # [unix] - make # [unix] - pkg-config # [unix] # Win - {{ compiler('m2w64_c') }} # [win] + - {{ stdlib("m2w64_c") }} # [win] - {{ compiler('m2w64_cxx') }} # [win] - {{ compiler('m2w64_fortran') }} # [win] - m2-autoconf # [win]