recipe: Update build and test scripts

Author: dalcinl

recipe/build-mpi.sh

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-# unset unused old fortran compiler vars
-unset F90 F77
-
 set -ex
 
-export FCFLAGS="$FFLAGS"
-
 # avoid absolute-paths in compilers
 export CC=$(basename "$CC")
 export CXX=$(basename "$CXX")
 export FC=$(basename "$FC")
 
-./autogen.pl --force
+# unset unused old Fortran compiler vars
+unset FFLAGS F77 F90 F95
 
 if [[ "$target_platform" == osx-* ]]; then
     if [[ ! -z "$CONDA_BUILD_SYSROOT" ]]; then
@@ -134,13 +130,6 @@ fi
 
 export LIBRARY_PATH="$PREFIX/lib"
 
-## Replaced by the patch from open-mpi/ompi#8361
-# if [[ "$target_platform" == *-64 ]]; then
-#     # -march=skylake-avx512 -march=nocona invalidates AVX512 flag. Remove -march flags and -mtune flags
-#     export CFLAGS=$(echo $CFLAGS | sed 's/-march=[a-z0-9\-]*//g')
-#     export CFLAGS=$(echo $CFLAGS | sed 's/-mtune=[a-z0-9\-]*//g')
-# fi
-
 ./configure --prefix=$PREFIX \
             --disable-dependency-tracking \
             --enable-mpi-fortran \

recipe/meta.yaml

@@ -41,12 +41,19 @@ outputs:
         - automake  # [unix]
         - libtool   # [unix]
         - make  # [unix]
-        - perl 5.26.2
       host:
+        #- hwloc
+        #- openpmix
+        #- prrte
+        - libevent
         - zlib
         - ucx                 # [enable_cuda]
         - ucx-proc =*=gpu     # [enable_cuda]
       run:
+        #- hwloc
+        #- openpmix
+        #- prrte
+        - libevent
         - zlib
         - mpi 1.0 openmpi
       run_constrained:
@@ -55,7 +62,6 @@ outputs:
     test:
       script: run_test.sh
       files:
-        - mpiexec.sh
         - tests/helloworld.sh
 
   - name: openmpi-mpicc
@@ -73,7 +79,6 @@ outputs:
     test:
       script: run_test.sh
       files:
-        - mpiexec.sh
         - tests/helloworld.c
 
   - name: openmpi-mpicxx
@@ -91,7 +96,6 @@ outputs:
     test:
       script: run_test.sh
       files:
-        - mpiexec.sh
         - tests/helloworld.cxx
 
   - name: openmpi-mpifort
@@ -108,7 +112,6 @@ outputs:
     test:
       script: run_test.sh
       files:
-        - mpiexec.sh
         - tests/helloworld.f
         - tests/helloworld.f90
   {% else %}

recipe/run_test.sh

@@ -1,17 +1,22 @@
 #!/bin/bash
 set -ex
 
-export OMPI_MCA_plm=isolated
-export OMPI_MCA_btl_vader_single_copy_mechanism=none
-export OMPI_MCA_rmaps_base_oversubscribe=yes
-MPIEXEC="${PWD}/mpiexec.sh"
+export OMPI_MCA_pml=ob1
+export OMPI_MCA_btl=sm,self
+export OMPI_MCA_rmaps_default_mapping_policy=:oversubscribe
+export OMPI_ALLOW_RUN_AS_ROOT=1
+export OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
+MPIEXEC="mpiexec"
 
 pushd "tests"
 
 if [[ $PKG_NAME == "openmpi" ]]; then
   command -v ompi_info
   ompi_info
 
+  command -v prte_info
+  prte_info
+
   if [[ ! -z "$(conda list | grep ucx)" ]]; then
     echo "Improper UCX dependency!"
     exit 1