Skip to content

Commit

Permalink
Merge pull request #89 from zklaus/update-m2w64-compilers
Browse files Browse the repository at this point in the history 
Update m2w64 compilers
  • Loading branch information
@zklaus
zklaus authored Aug 29, 2024
2 parents 98cd3b3 + b861e1b commit 203bcc9
Show file tree
Hide file tree
Showing 24 changed files with 93 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml
View file

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

8 changes: 4 additions & 4 deletions .ci_support/linux_64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
8 changes: 4 additions & 4 deletions .ci_support/linux_64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
8 changes: 4 additions & 4 deletions .ci_support/linux_64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,7 +17,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -21,7 +21,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -21,7 +21,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -21,7 +21,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '13'
c_stdlib:
- sysroot
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ docker_image:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_mpimpich.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_mpinompi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_mpiopenmpi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
- '16'
- '17'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
Expand All @@ -17,7 +17,7 @@ channel_targets:
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
libnetcdf:
Expand Down
12 changes: 9 additions & 3 deletions .ci_support/win_64_.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,17 @@ hdf5:
libnetcdf:
- 4.9.2
m2w64_c_compiler:
- m2w64-toolchain
- gcc
m2w64_c_compiler_version:
- '13'
m2w64_c_stdlib:
- m2w64-toolchain
- m2w64-sysroot
m2w64_c_stdlib_version:
- '12'
m2w64_fortran_compiler:
- m2w64-toolchain
- gfortran
m2w64_fortran_compiler_version:
- '13'
mpi:
- nompi
mpich:
Expand Down
6 changes: 6 additions & 0 deletions .scripts/build_steps.sh
View file

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

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh
View file

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

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat
View file

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

4 changes: 2 additions & 2 deletions build-locally.py
View file

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

Loading

0 comments on commit 203bcc9

Please sign in to comment.