From b25c930d244e6e2594717d0e2c690fde2873b802 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 2 Sep 2020 09:11:49 -0600 Subject: [PATCH 1/2] added check for MPI --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 93c7445aff7..2958b354fc4 100644 --- a/configure.ac +++ b/configure.ac @@ -236,6 +236,12 @@ fi AC_MSG_NOTICE([finding libraries]) +# Ensure we have MPI. +AC_CHECK_FUNCS([MPI_Init]) +if test "x$ac_cv_func_MPI_Init" != "xyes"; then + AC_MSG_ERROR([Can't link to MPI library. MPI is required.]) +fi + # Check for netCDF library. AC_CHECK_LIB([netcdf], [nc_create], [], [AC_MSG_ERROR([Can't find or link to the netcdf library.])]) AC_CHECK_HEADERS([netcdf.h netcdf_meta.h]) @@ -333,9 +339,6 @@ else AC_MSG_ERROR([Unable to find type MPI_Offset in mpi.h]) fi -#AC_CHECK_SIZEOF([MPI_Offset], [], [[#include ]]) -#AC_DEFINE([SIZEOF_MPI_OFFSET], [8], [netCDF classic library available]) - # If we want the timing library, we must find it. if test "x$enable_timing" = xyes; then AC_CHECK_HEADERS([gptl.h]) From 286f52932fd8396ae33f6149f3806c6ae6370e75 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 2 Sep 2020 10:34:43 -0600 Subject: [PATCH 2/2] removed cmake build from github testing --- .github/workflows/a4.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/a4.yml b/.github/workflows/a4.yml index 6066fb33623..a0e7ad96415 100644 --- a/.github/workflows/a4.yml +++ b/.github/workflows/a4.yml @@ -128,18 +128,4 @@ jobs: autoreconf -i ./configure --enable-fortran make -j check - - name: cmake build - run: | - set -x - echo 'export PATH=/home/runner/mpich/bin:$PATH' > .bashrc - source .bashrc - export CC=mpicc - mkdir build - cd build - export LD_LIBRARY_PATH="/home/runner/netcdf-c/lib:/home/runner/pnetcdf/lib:/home/runner/hdf5/lib:/home/runner/mpich/lib:$LD_LIBRARY_PATH" - cmake -Wno-dev -DNetCDF_C_LIBRARY=/home/runner/netcdf-c/lib/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/home/runner/netcdf-c/include -DPnetCDF_PATH='/home/runner/pnetcdf' -DPIO_ENABLE_FORTRAN=Off -DPIO_HDF5_LOGGING=On -DPIO_USE_MALLOC=On -DPIO_ENABLE_LOGGING=On -DPIO_ENABLE_TIMING=Off .. || (cat CMakeFiles/CMakeOutput.log && cat CMakeFiles/CMakeError.log) - cat config.h - make VERBOSE=1 - make tests VERBOSE=1 - ctest -VV