add wrapper compiler flags in CONDA_BUILD, install .mod in include

recipe/build-mpi.sh

@@ -73,6 +73,10 @@ fi
 make -j"${CPU_COUNT:-1}"
 make install
 
+# openmpi installs .mod files in the wrong prefix (/lib instead of /include)
+ls -l $PREFIX/lib/*.mod
+mv -v $PREFIX/lib/*.mod $PREFIX/include/
+
 POST_LINK=$PREFIX/bin/.openmpi-post-link.sh
 if [ -n "$build_with_ucx" ]; then
     echo "setting MCA pml to ^ucx..."

recipe/meta.yaml

@@ -1,7 +1,7 @@
 {% set version = "5.0.3" %}
 {% set major = version.rpartition('.')[0] %}
 {% set cuda_major = (cuda_compiler_version|default("11.8")).rpartition('.')[0] %}
-{% set build = 4 %}
+{% set build = 5 %}
 
 # give conda package a higher build number
 {% if mpi_type == 'conda' %}

recipe/openmpi_activate.sh

@@ -1,5 +1,13 @@
 if [[ "${CONDA_BUILD:-}" = "1" ]]; then
   echo "setting openmpi environment variables for conda-build"
+  # build-time variables
+  for _var in CC CXX FC CPPFLAGS CFLAGS CXXFLAGS FCFLAGS LDFLAGS; do
+    if [[ ! -z "${!_var:-}" ]]; then
+      declare -x OMPI_${_var}=${!_var}
+    fi
+  done
+
+  # runtime variables
   export OMPI_MCA_plm_ssh_agent=false
   export OMPI_MCA_pml=ob1
   export OMPI_MCA_mpi_yield_when_idle=true

recipe/run_test.sh

@@ -26,44 +26,58 @@ if [[ $PKG_NAME == "openmpi" ]]; then
   command -v mpiexec
   $MPIEXEC --help
   $MPIEXEC -n 4 ./helloworld.sh
+
+  test -f $PREFIX/include/mpi.mod
+  test ! -f $PREFIX/lib/mpi.mod
 fi
 
 if [[ $PKG_NAME == "openmpi-mpicc" ]]; then
   command -v mpicc
   mpicc -show
 
-  mpicc $CFLAGS $LDFLAGS helloworld.c -o helloworld_c
+  test ! -z "${OMPI_CC:-}"
+  test ! -z "${OMPI_CFLAGS:-}"
+  test ! -z "${OMPI_CPPFLAGS:-}"
+  test ! -z "${OMPI_LDFLAGS:-}"
+
+  mpicc helloworld.c -o helloworld_c
   $MPIEXEC -n 4 ./helloworld_c
 fi
 
 if [[ $PKG_NAME == "openmpi-mpicxx" ]]; then
   command -v mpicxx
   mpicxx -show
 
-  mpicxx $CXXFLAGS $LDFLAGS helloworld.cxx -o helloworld_cxx
+  test ! -z "${OMPI_CXX:-}"
+  test ! -z "${OMPI_CXXFLAGS:-}"
+
+  mpicxx helloworld.cxx -o helloworld_cxx
   $MPIEXEC -n 4 ./helloworld_cxx
 fi
 
 if [[ $PKG_NAME == "openmpi-mpifort" ]]; then
   command -v mpifort
   mpifort -show
+
+  test ! -z "${OMPI_FC:-}"
+  test ! -z "${OMPI_FCFLAGS:-}"
 
-  mpifort $FFLAGS $LDFLAGS helloworld.f -o helloworld1_f
+  mpifort helloworld.f -o helloworld1_f
   $MPIEXEC -n 4 ./helloworld1_f
 
-  mpifort $FFLAGS $LDFLAGS helloworld.f90 -o helloworld1_f90
+  mpifort helloworld.f90 -o helloworld1_f90
   $MPIEXEC -n 4 ./helloworld1_f90
 
   command -v mpif77
   mpif77 -show
 
-  mpif77 $FFLAGS $LDFLAGS helloworld.f -o helloworld2_f
+  mpif77 helloworld.f -o helloworld2_f
   $MPIEXEC -n 4 ./helloworld2_f
 
   command -v mpif90
   mpif90 -show
 
-  mpif90 $FFLAGS $LDFLAGS helloworld.f90 -o helloworld2_f90
+  mpif90 helloworld.f90 -o helloworld2_f90
   $MPIEXEC -n 4 ./helloworld2_f90
 
 fi