Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebuild for openmpi 5 #116

Merged
merged 8 commits into from
Jun 8, 2024
Merged

Rebuild for openmpi 5 #116

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a942cab
Rebuild for openmpi 5
regro-cf-autotick-bot Jun 5, 2024
6859da1
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and co…
regro-cf-autotick-bot Jun 5, 2024
74a035b
Add openmpi-mpifort
xylar Jun 7, 2024
46c33e4
Remove openmpi-mpifort
xylar Jun 7, 2024
81a3250
Update c_stdlib_version for linux to 2.17
xylar Jun 7, 2024
6f552ac
Fix white space
xylar Jun 7, 2024
0b984c7
Add comment
xylar Jun 7, 2024
ba451b7
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.1, and co…
Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpimpich.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpinompi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_mpiopenmpi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_mpimpich.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_mpinompi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_mpiopenmpi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_mpimpich.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_mpinompi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_mpiopenmpi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/openmpi5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
8 changes: 5 additions & 3 deletions .ci_support/osx_64_mpimpich.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -33,7 +35,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/osx_64_mpinompi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -33,7 +35,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/osx_64_mpiopenmpi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -33,7 +35,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_mpimpich.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -33,7 +35,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_mpinompi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -33,7 +35,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_mpiopenmpi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_compiler:
- clang
c_compiler_version:
Expand Down Expand Up @@ -33,7 +35,7 @@ mpich:
netcdf_fortran:
- '4.6'
openmpi:
- '4'
- '5'
perl:
- 5.32.1
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
mpi:
- nompi
- mpich # [not win]
- openmpi # [not win]
- openmpi # [not win]

c_stdlib_version:
xylar marked this conversation as resolved.
Show resolved Hide resolved
Comment on lines +7 to +8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we have much choice, but anyone see any harm in migrating to 2.17?

- 2.17 # [linux]
4 changes: 3 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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' %}
Expand Down Expand Up @@ -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]
Expand Down
Loading