Skip to content

Commit

Permalink
Merge pull request #147 from jakirkham-feedstocks/req_glibc_217_mpi_c…
Browse files Browse the repository at this point in the history
…ompilers

Require GLIBC 2.17+ in MPI compilers
  • Loading branch information
leofang authored Apr 9, 2024
2 parents afd41ef + ddc4ca4 commit eaeade0
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 3 deletions.
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

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

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '11'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand Down Expand Up @@ -36,6 +40,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '11'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand Down Expand Up @@ -36,6 +40,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '11'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand Down Expand Up @@ -40,6 +44,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- gcc
c_compiler_version:
- '11'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand Down Expand Up @@ -40,6 +44,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '11'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand Down Expand Up @@ -36,6 +40,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '11'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand Down Expand Up @@ -36,6 +40,7 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- c_stdlib_version
- cdt_name
- cuda_compiler
- cuda_compiler_version
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

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

8 changes: 7 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set version = "5.0.2" %}
{% set major = version.rpartition('.')[0] %}
{% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %}
{% set build = 0 %}
{% set build = 1 %}

# give conda package a higher build number
{% if mpi_type == 'conda' %}
Expand Down Expand Up @@ -77,6 +77,8 @@ outputs:
# so that conda-build knows to pass it to the test env
- echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
requirements:
build:
- sysroot_{{ target_platform }} 2.17 # [linux]
run:
- {{ pin_subpackage('openmpi', exact=True) }}
# host C compilers work fine (better) on mac
Expand All @@ -94,6 +96,8 @@ outputs:
# so that conda-build knows to pass it to the test env
- echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
requirements:
build:
- sysroot_{{ target_platform }} 2.17 # [linux]
run:
- {{ pin_subpackage('openmpi', exact=True) }}
# host C compilers work fine (better) on mac
Expand All @@ -111,6 +115,8 @@ outputs:
# so that conda-build knows to pass it to the test env
- echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
requirements:
build:
- sysroot_{{ target_platform }} 2.17 # [linux]
run:
- {{ pin_subpackage('openmpi', exact=True) }}
- {{ compiler('fortran') }}
Expand Down

0 comments on commit eaeade0

Please sign in to comment.