From b8e6d5024c09b4663ff7078b0e2e6d3fcd21cbb7 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 23 Jul 2024 03:01:14 +0000 Subject: [PATCH 1/5] updated v5.0.5 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4578cdd7..5eab3f52 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ -{% set version = "5.0.3" %} +{% set version = "5.0.5" %} {% set major = version.rpartition('.')[0] %} {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %} -{% set build = 10 %} +{% set build = 0 %} # give conda package a higher build number {% if mpi_type == 'conda' %} @@ -16,7 +16,7 @@ package: source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 - sha256: 990582f206b3ab32e938aa31bbf07c639368e4405dca196fabe7f0f76eeda90b + sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776 build: number: {{ build }} From dda97166408127b1df13f6fba7d3e6d9bc0bc5d1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 23 Jul 2024 03:02:56 +0000 Subject: [PATCH 2/5] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.22.16.24.15 --- .scripts/build_steps.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8d..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 From 0705f1ca69cb25f0e24e3a884997fdee64660a14 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 29 Jul 2024 12:52:42 +0200 Subject: [PATCH 3/5] patch for LDFLAGS typo on mac --- recipe/build-mpi.sh | 2 ++ recipe/ldflags-mac.patch | 31 +++++++++++++++++++++++++++++++ recipe/meta.yaml | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 recipe/ldflags-mac.patch diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 5ebf122a..078c8c20 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -14,6 +14,8 @@ unset FFLAGS F77 F90 F95 wrapper_ldflags="-L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" export LIBRARY_PATH="$PREFIX/lib" if [[ "$target_platform" == osx-* ]]; then + # FIXME: remove autogen when autotools patch no longer required + perl autogen.pl --force if [[ -n "$CONDA_BUILD_SYSROOT" ]]; then export CFLAGS="$CFLAGS -isysroot $CONDA_BUILD_SYSROOT" export CXXFLAGS="$CXXFLAGS -isysroot $CONDA_BUILD_SYSROOT" diff --git a/recipe/ldflags-mac.patch b/recipe/ldflags-mac.patch new file mode 100644 index 00000000..dcedc7b5 --- /dev/null +++ b/recipe/ldflags-mac.patch @@ -0,0 +1,31 @@ +From e70f0a4afb1277e52389267777d260229b468ec0 Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Mon, 29 Jul 2024 12:50:59 +0200 +Subject: [PATCH] typo in LDFLAGS_save_xcode variable name + +resulted in effectively overriding LDFLAGS='' on mac +--- + config/ompi_setup_fc.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/ompi_setup_fc.m4 b/config/ompi_setup_fc.m4 +index 53c3cd96da..c147bf2b60 100644 +--- a/config/ompi_setup_fc.m4 ++++ b/config/ompi_setup_fc.m4 +@@ -212,11 +212,11 @@ end program + AS_IF([test $xcode_happy -eq 1], + [ # Restore LDFLAFGS + the new flags (i.e., get rid of the + # "-L." we added for this test) +- LDFLAGS="$LDFLAGS_xcode_save $1" ++ LDFLAGS="$LDFLAGS_save_xcode $1" + $2], + [ # If we failed the test, reset LDFLAGS back to its + # original value. +- LDFLAGS=$LDFLAGS_xcode_save ++ LDFLAGS=$LDFLAGS_save_xcode + $3]) + + OPAL_VAR_SCOPE_POP +-- +2.45.0 + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5eab3f52..23c47c27 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,6 +17,8 @@ source: fn: openmpi-{{ version }}.tar.bz2 url: https://www.open-mpi.org/software/ompi/v{{ major }}/downloads/openmpi-{{ version }}.tar.bz2 sha256: 6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776 + patches: + - ldflags-mac.patch # [osx] build: number: {{ build }} From 1afc9430866a9839bce274564cdf539f4a36aba6 Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 29 Jul 2024 13:26:18 +0200 Subject: [PATCH 4/5] use --with-mpi-moduledir to put mods in include official, no longer need symlinks --- recipe/build-mpi.sh | 8 +------- recipe/run_test.sh | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index 078c8c20..7d8979e9 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -63,6 +63,7 @@ fi --enable-mpi-fortran \ --disable-wrapper-rpath \ --disable-wrapper-runpath \ + --with-mpi-moduledir="$PREFIX/include" \ --with-wrapper-cflags="-I$PREFIX/include" \ --with-wrapper-cxxflags="-I$PREFIX/include" \ --with-wrapper-fcflags="-I$PREFIX/include" \ @@ -80,13 +81,6 @@ fi make -j"${CPU_COUNT:-1}" make install -# openmpi installs .mod files in the wrong prefix (/lib instead of /include) -# symlink instead of copy to avoid breaking anything (unlikely) -for f in $PREFIX/lib/*.mod; do - modname=$(basename "$f") - ln -sv "../lib/${modname}" "$PREFIX/include/${modname}" -done - POST_LINK=$PREFIX/bin/.openmpi-post-link.sh if [ -n "$build_with_ucx" ]; then echo "setting MCA pml to ^ucx..." diff --git a/recipe/run_test.sh b/recipe/run_test.sh index 38c4a0c1..e03f4f6c 100755 --- a/recipe/run_test.sh +++ b/recipe/run_test.sh @@ -28,8 +28,6 @@ if [[ $PKG_NAME == "openmpi" ]]; then $MPIEXEC -n 4 ./helloworld.sh test -f $PREFIX/include/mpi.mod - # keep duplicates in original location for now - test -f $PREFIX/lib/mpi.mod fi if [[ $PKG_NAME == "openmpi-mpicc" ]]; then From 40b3303e124ef0c57b18472f1147c52d912d3d7c Mon Sep 17 00:00:00 2001 From: Min RK Date: Mon, 29 Jul 2024 14:35:31 +0200 Subject: [PATCH 5/5] need autotools for autogen.pl --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 23c47c27..f20d95f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,8 +50,9 @@ outputs: - {{ compiler('cuda') }} # [cuda_compiler != "None"] - {{ compiler('fortran') }} - {{ stdlib('c') }} - #- autoconf # [unix] - #- automake # [unix] + # FIXME: autotools required for ldflags-mac.patch + - autoconf # [osx] + - automake # [osx] - libtool # [unix] - make # [unix] host: