Replace CI scripts for serial configurations with Cray and PGI 20.1.1 with MPI-enabled ones.

.ci/bb/daint-cscs/test.all.cray-11.0.0

+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+script_dir=$(cd "$(dirname "$0")"; pwd)
+top_srcdir=$(cd "${script_dir}/../../.."; pwd)
+
+. "${script_dir}/utils.sh"
+init_cray1100
+
+# The configure script does not check the 'lib64' subdirectory, therefore we
+# run it with '--with-eccodes' and the following flags. Note that fixing this
+# in the configure script might be tricky: the 'lib64' subdirectory should be
+# checked first but if it does not exist or does not contain the library, we
+# might end up linking to a library from the linker's default search path
+# (e.g. /usr/lib) instead of the one from "$with_eccodes/lib" because
+# "-L${with_eccodes}/lib64" would be ignored in that case:
+CPPFLAGS="-I${ECCODES_ROOT}/include"
+LDFLAGS="-L${ECCODES_ROOT}/lib64"
+
+"${top_srcdir}/configure" \
+--enable-cf-interface \
+--enable-iso-c-interface \
+--enable-mpi \
+--enable-option-checking=fatal \
+--with-eccodes \
+--with-netcdf \
+CC="${CC}" \
+CPPFLAGS="${CPPFLAGS}" \
+FC="${FC}" \
+LDFLAGS="${LDFLAGS}" \
+MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+
+make -j8
+
+make -j8 check | tee check.log
+
+check_all_tests_passed check.log

.ci/bb/daint-cscs/test.all.pgi-20.1.1

+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+script_dir=$(cd "$(dirname "$0")"; pwd)
+top_srcdir=$(cd "${script_dir}/../../.."; pwd)
+
+. "${script_dir}/utils.sh"
+init_pgi2011
+
+# The configure script does not check the 'lib64' subdirectory, therefore we
+# run it with '--with-eccodes' and the following flags. Note that fixing this
+# in the configure script might be tricky: the 'lib64' subdirectory should be
+# checked first but if it does not exist or does not contain the library, we
+# might end up linking to a library from the linker's default search path
+# (e.g. /usr/lib) instead of the one from "$with_eccodes/lib" because
+# "-L${with_eccodes}/lib64" would be ignored in that case:
+CPPFLAGS="-I${ECCODES_ROOT}/include"
+LDFLAGS="-L${ECCODES_ROOT}/lib64"
+
+"${top_srcdir}/configure" \
+--enable-cf-interface \
+--enable-iso-c-interface \
+--enable-mpi \
+--enable-option-checking=fatal \
+--with-eccodes \
+--with-netcdf \
+CC="${CC}" \
+CPPFLAGS="${CPPFLAGS}" \
+FC="${FC}" \
+LDFLAGS="${LDFLAGS}" \
+MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }" \
+PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig:${PKG_CONFIG_PATH}"
+
+make -j8
+
+make -j8 check | tee check.log
+
+check_all_tests_passed check.log

.ci/bb/daint-cscs/test.serial.cray-11.0.0

-#!/bin/bash
-
-set -eu
-
-script_dir=$(cd "$(dirname "$0")"; pwd)
-top_srcdir=$(cd "${script_dir}/../../.."; pwd)
-
-. "${script_dir}/utils.sh"
-init_cray1100
-
-"${top_srcdir}/configure" \
---enable-cf-interface \
---enable-iso-c-interface \
---enable-option-checking=fatal \
---with-netcdf \
-CC="${CC}" \
-FC="${FC}" \
-
-make -j8
-
-make -j8 check
-
-# TODO: install YAXT and PPM and enable building with MPI:
-# set -o pipefail
-# --enable-mpi
-# MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }"
-# PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
-# make -j8 check | tee check.log
-# check_all_tests_passed check.log

.ci/bb/daint-cscs/test.serial.pgi-20.1.1

-#!/bin/bash
-
-set -eu
-
-script_dir=$(cd "$(dirname "$0")"; pwd)
-top_srcdir=$(cd "${script_dir}/../../.."; pwd)
-
-. "${script_dir}/utils.sh"
-init_pgi2011
-
-"${top_srcdir}/configure" \
---enable-cf-interface \
---enable-iso-c-interface \
---enable-option-checking=fatal \
---with-netcdf \
-CC="${CC}" \
-FC="${FC}" \
-
-make -j8
-
-make -j8 check
-
-# TODO: install YAXT and PPM and enable building with MPI:
-# set -o pipefail
-# --enable-mpi
-# MPI_LAUNCH="$(which "${MPI_LAUNCH%% *}") ${MPI_LAUNCH#* }"
-# PKG_CONFIG_PATH="${YAXT_ROOT}/lib/pkgconfig:${PPM_ROOT}/lib/pkgconfig"
-# make -j8 check | tee check.log
-# check_all_tests_passed check.log

.ci/bb/daint-cscs/utils.sh

@@ -110,10 +110,13 @@ init_cray1100()
   FC=ftn
   MPI_LAUNCH='srun -p debug -C gpu -A d56'
 
-#  GRIBAPI_ROOT='N/A'
-#  NETCDF_ROOT='none needed'
-#  PPM_ROOT='N/A'
-#  YAXT_ROOT='N/A'
+  ECCODES_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/eccodes-20.20.0-cray11'
+  PPM_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/ppm-1.0.6-cray11'
+  YAXT_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/yaxt-0.9.0-cray11'
+
+  # Here we fix a never-ending story with Libtool overlinkning, absence of
+  # '*.la' files when they could help, and '-Wl,--disable/enable-new-dtags':
+  export LD_LIBRARY_PATH="${ECCODES_ROOT}/lib64:${LD_LIBRARY_PATH-}"
 }
 
 #
@@ -129,10 +132,14 @@ init_pgi2011()
   FC=ftn
   MPI_LAUNCH='srun -p debug -C gpu -A d56'
 
-#  GRIBAPI_ROOT='N/A'
-#  NETCDF_ROOT='none needed'
-#  PPM_ROOT='N/A'
-#  YAXT_ROOT='N/A'
+  ECCODES_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/eccodes-20.20.0-pgi20'
+  PPM_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/ppm-1.0.6-pgi20'
+  # YAXT 0.9.0 cannot be built with PGI 20.1.1:
+  YAXT_ROOT='/scratch/snx3000/skosukhi/cdi-pio-sw/yaxt-0.7.0-p1-pgi20'
+
+  # Here we fix a never-ending story with Libtool overlinkning, absence of
+  # '*.la' files when they could help, and '-Wl,--disable/enable-new-dtags':
+  export LD_LIBRARY_PATH="${ECCODES_ROOT}/lib64:${LD_LIBRARY_PATH-}"
 }
 
 #