Skip to content

Commit

Permalink
Merge pull request #43 from akrherz/rerender
Browse files Browse the repository at this point in the history 
migrate HDF5 1.14.3 + libnetcdf 4.9.2
  • Loading branch information
@xylar
xylar authored Jan 4, 2024
2 parents 81e72c1 + a360754 commit 32d7c85
Show file tree
Hide file tree
Showing 20 changed files with 126 additions and 86 deletions.
8 changes: 3 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml
View file

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

5 changes: 4 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file

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

10 changes: 6 additions & 4 deletions .ci_support/linux_64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,13 +11,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
mpi:
- mpich
mpich:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/linux_64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,13 +11,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
mpi:
- nompi
mpich:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/linux_64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,13 +11,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
mpi:
- openmpi
mpich:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
7 changes: 0 additions & 7 deletions .ci_support/migrations/hdf51122.yaml
View file

This file was deleted.

10 changes: 6 additions & 4 deletions .ci_support/osx_64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '16'
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
macos_machine:
- x86_64-apple-darwin13.4.0
mpi:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/osx_64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '16'
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
macos_machine:
- x86_64-apple-darwin13.4.0
mpi:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/osx_64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '16'
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
macos_machine:
- x86_64-apple-darwin13.4.0
mpi:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/osx_arm64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '16'
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
macos_machine:
- arm64-apple-darwin20.0.0
mpi:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/osx_arm64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '16'
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
macos_machine:
- arm64-apple-darwin20.0.0
mpi:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
10 changes: 6 additions & 4 deletions .ci_support/osx_arm64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '13'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '13'
- '16'
hdf5:
- 1.12.2
- 1.14.3
libnetcdf:
- 4.8.1
- 4.9.2
macos_machine:
- arm64-apple-darwin20.0.0
mpi:
Expand All @@ -29,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file

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

14 changes: 12 additions & 2 deletions .gitignore
View file

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

20 changes: 14 additions & 6 deletions .scripts/build_steps.sh
View file

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

Loading

0 comments on commit 32d7c85

Please sign in to comment.