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

remove workaround for unused jinja vars #101

Merged
merged 3 commits into from
Sep 27, 2024
Merged

remove workaround for unused jinja vars #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4236802
remove workaround for unused jinja vars
minrk Sep 27, 2024
d14295f
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and co…
Sep 27, 2024
4ff24f2
bump build due to compiler update
minrk Sep 27, 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
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpi_typeconda.yaml
View file
Open in desktop
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 @@ -15,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
mpi_type:
- conda
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_mpi_typeexternal.yaml
View file
Open in desktop
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 @@ -15,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
mpi_type:
- external
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_aarch64_mpi_typeconda.yaml
View file
Open in desktop
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 @@ -19,13 +19,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
mpi_type:
- conda
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_aarch64_mpi_typeexternal.yaml
View file
Open in desktop
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 @@ -19,13 +19,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
mpi_type:
- external
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_ppc64le_mpi_typeconda.yaml
View file
Open in desktop
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 @@ -15,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
mpi_type:
- conda
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_ppc64le_mpi_typeexternal.yaml
View file
Open in desktop
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 @@ -15,13 +15,13 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
mpi_type:
- external
target_platform:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_mpi_typeconda.yaml
View file
Open in desktop
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,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
macos_machine:
- x86_64-apple-darwin13.4.0
mpi_type:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_64_mpi_typeexternal.yaml
View file
Open in desktop
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,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
macos_machine:
- x86_64-apple-darwin13.4.0
mpi_type:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_mpi_typeconda.yaml
View file
Open in desktop
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,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
macos_machine:
- arm64-apple-darwin20.0.0
mpi_type:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_mpi_typeexternal.yaml
View file
Open in desktop
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,11 +17,11 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '17'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
macos_machine:
- arm64-apple-darwin20.0.0
mpi_type:
Expand Down
3 changes: 2 additions & 1 deletion .scripts/build_steps.sh
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 .scripts/run_osx_build.sh
View file
Open in desktop

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

9 changes: 6 additions & 3 deletions build-locally.py
View file
Open in desktop

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

17 changes: 4 additions & 13 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "4.2.2" %}
{% set build = 0 %}
{% set build = 1 %}

# give conda package a higher build number
{% if mpi_type == 'conda' %}
Expand Down Expand Up @@ -66,10 +66,7 @@ outputs:
- name: mpich-mpicc
build:
script:
- echo 'ok' # [not osx]
# make CONDA_BUILD_SYSROOT a 'used variable'
# so that conda-build knows to pass it to the test env
- echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
- echo 'ok'
requirements:
run:
- {{ pin_subpackage('mpich', exact=True) }}
Expand All @@ -84,10 +81,7 @@ outputs:
- name: mpich-mpicxx
build:
script:
- echo 'ok' # [not osx]
# make CONDA_BUILD_SYSROOT a 'used variable'
# so that conda-build knows to pass it to the test env
- echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
- echo 'ok'
requirements:
run:
- {{ pin_subpackage('mpich', exact=True) }}
Expand All @@ -102,10 +96,7 @@ outputs:
- name: mpich-mpifort
build:
script:
- echo 'ok' # [not osx]
# make CONDA_BUILD_SYSROOT a 'used variable'
# so that conda-build knows to pass it to the test env
- echo "{{ CONDA_BUILD_SYSROOT }}" # [osx]
- echo 'ok'
requirements:
run:
- {{ pin_subpackage('mpich', exact=True) }}
Expand Down