Skip to content

Commit

Permalink
Merge pull request #172 from regro-cf-autotick-bot/5.0.5_h23feee
Browse files Browse the repository at this point in the history
openmpi v5.0.5
  • Loading branch information
minrk authored Jul 31, 2024
2 parents 89f6315 + 2a3ef75 commit 954a284
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 35 deletions.
8 changes: 0 additions & 8 deletions .ci_support/migrations/libhwloc2111.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ macos_machine:
- x86_64-apple-darwin13.4.0
mpi_type:
- conda
perl:
- 5.32.1
target_platform:
- osx-64
zip_keys:
Expand Down
2 changes: 2 additions & 0 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ macos_machine:
- arm64-apple-darwin20.0.0
mpi_type:
- conda
perl:
- 5.32.1
target_platform:
- osx-arm64
zip_keys:
Expand Down
3 changes: 3 additions & 0 deletions recipe/build-mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@ if [[ $CONDA_BUILD_CROSS_COMPILATION == "1" ]]; then
source $RECIPE_DIR/cross-gfortran.$target_platform.sh
fi

# disable wrapper-runpath for consistency with conda-forge wrt dtags
# openmpi's runpath adds new dtags to compiler wrappers
./configure --prefix=$PREFIX \
--disable-dependency-tracking \
--disable-wrapper-runpath \
--enable-mpi-fortran \
--with-mpi-moduledir='${includedir}' \
--with-wrapper-ldflags="${wrapper_ldflags}" \
Expand Down
5 changes: 2 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "5.0.4" %}
{% set version = "5.0.5" %}
{% set major = version.rpartition('.')[0] %}
{% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %}
{% set build = 0 %}
Expand All @@ -16,9 +16,8 @@ package:
source:
fn: openmpi-{{ version }}.tar.bz2
url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2
sha256: 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d
sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776
patches:
- pr12694.patch # remove after 5.0.5
- ldflags-mac.patch # [osx]

build:
Expand Down
24 changes: 0 additions & 24 deletions recipe/pr12694.patch

This file was deleted.

0 comments on commit 954a284

Please sign in to comment.