From fac7ee7dd325634ee61a7192f262edb529e73d53 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 8 Mar 2021 08:08:01 -0700 Subject: [PATCH 01/10] fix error in check_netcdf call and in detecting dap --- cmake/TryNetCDF_DAP.c | 6 +-- src/clib/pio_getput_int.c | 81 ++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/cmake/TryNetCDF_DAP.c b/cmake/TryNetCDF_DAP.c index 9a895e8acb..4d2f77fd98 100644 --- a/cmake/TryNetCDF_DAP.c +++ b/cmake/TryNetCDF_DAP.c @@ -5,9 +5,9 @@ int main() { -#if NC_HAS_DAP==1 - return 0; +#if NC_HAS_DAP==1 || NC_HAS_DAP2==1 || NC_HAS_DAP4==1 + return 0; #else - XXX; + XXX; #endif } diff --git a/src/clib/pio_getput_int.c b/src/clib/pio_getput_int.c index ff9212435f..6dfae5907e 100644 --- a/src/clib/pio_getput_int.c +++ b/src/clib/pio_getput_int.c @@ -1140,6 +1140,8 @@ PIOc_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Offset int *request; PLOG((2, "PIOc_put_vars_tc calling pnetcdf function")); + flush_output_buffer(file, false, num_elem*typelen); + /*vdesc = &file->varlist[varid];*/ if ((ierr = get_var_desc(varid, &file->varlist, &vdesc))) return pio_err(ios, file, ierr, __FILE__, __LINE__); @@ -1148,47 +1150,42 @@ PIOc_put_vars_tc(int ncid, int varid, const PIO_Offset *start, const PIO_Offset sizeof(int) * (vdesc->nreqs + PIO_REQUEST_ALLOC_CHUNK)))) return pio_err(ios, file, PIO_ENOMEM, __FILE__, __LINE__); request = vdesc->request + vdesc->nreqs; - PLOG((2, "PIOc_put_vars_tc request = %d", vdesc->request)); + PLOG((2, "PIOc_put_vars_tc request = %d size = %d", vdesc->request, num_elem*typelen)); - /* Only the IO master actually does the call. */ -// if (ios->iomaster == MPI_ROOT) -// { - switch(xtype) - { - case NC_BYTE: - ierr = ncmpi_bput_vars_schar(file->fh, varid, start, count, fake_stride, buf, request); - break; - case NC_CHAR: - ierr = ncmpi_bput_vars_text(file->fh, varid, start, count, fake_stride, buf, request); - break; - case NC_SHORT: - ierr = ncmpi_bput_vars_short(file->fh, varid, start, count, fake_stride, buf, request); - break; - case NC_INT: - ierr = ncmpi_bput_vars_int(file->fh, varid, start, count, fake_stride, buf, request); - break; - case PIO_LONG_INTERNAL: - ierr = ncmpi_bput_vars_long(file->fh, varid, start, count, fake_stride, buf, request); - break; - case NC_FLOAT: - ierr = ncmpi_bput_vars_float(file->fh, varid, start, count, fake_stride, buf, request); - break; - case NC_DOUBLE: - ierr = ncmpi_bput_vars_double(file->fh, varid, start, count, fake_stride, buf, request); - break; - default: - return pio_err(ios, file, PIO_EBADTYPE, __FILE__, __LINE__); - } - PLOG((2, "PIOc_put_vars_tc io_rank 0 done with pnetcdf call, ierr=%d", ierr)); + switch(xtype) + { + case NC_BYTE: + ierr = ncmpi_bput_vars_schar(file->fh, varid, start, count, fake_stride, buf, request); + break; + case NC_CHAR: + ierr = ncmpi_bput_vars_text(file->fh, varid, start, count, fake_stride, buf, request); + break; + case NC_SHORT: + ierr = ncmpi_bput_vars_short(file->fh, varid, start, count, fake_stride, buf, request); + break; + case NC_INT: + ierr = ncmpi_bput_vars_int(file->fh, varid, start, count, fake_stride, buf, request); + break; + case PIO_LONG_INTERNAL: + ierr = ncmpi_bput_vars_long(file->fh, varid, start, count, fake_stride, buf, request); + break; + case NC_FLOAT: + ierr = ncmpi_bput_vars_float(file->fh, varid, start, count, fake_stride, buf, request); + break; + case NC_DOUBLE: + ierr = ncmpi_bput_vars_double(file->fh, varid, start, count, fake_stride, buf, request); + break; + default: + return pio_err(ios, file, PIO_EBADTYPE, __FILE__, __LINE__); + } + PLOG((2, "PIOc_put_vars_tc io_rank 0 done with pnetcdf call, ierr=%d", ierr)); -// } -// else -// *request = PIO_REQ_NULL; vdesc->nreqs++; - flush_output_buffer(file, false, 0); - PLOG((2, "PIOc_put_vars_tc flushed output buffer")); - if(ierr == -40) +// flush_output_buffer(file, ierr == PIO_EINSUFFBUF, 0); +// PLOG((2, "PIOc_put_vars_tc flushed output buffer")); + + if(ierr == PIO_EINVALCOORDS) for(int i=0; iioroot, ios->my_comm))) */ - /* return check_mpi(NULL, file, mpierr, __FILE__, __LINE__); */ - /* if (ierr) */ - /* return check_netcdf(file, ierr, __FILE__, __LINE__); */ + if ((mpierr = MPI_Bcast(&ierr, 1, MPI_INT, ios->ioroot, ios->my_comm))) + return check_mpi(NULL, file, mpierr, __FILE__, __LINE__); + if (ierr) + return check_netcdf(file, ierr, __FILE__, __LINE__); PLOG((2, "PIOc_put_vars_tc bcast netcdf return code %d complete", ierr)); return PIO_NOERR; From 8d44884f3dda8c23c7573a2bc00794ac77868a47 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 8 Mar 2021 08:19:40 -0700 Subject: [PATCH 02/10] try fix for pnetcdf --- .../workflows/strict_autotools_ubuntu_latest.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/strict_autotools_ubuntu_latest.yml b/.github/workflows/strict_autotools_ubuntu_latest.yml index b47c4b1ba5..caeb280055 100644 --- a/.github/workflows/strict_autotools_ubuntu_latest.yml +++ b/.github/workflows/strict_autotools_ubuntu_latest.yml @@ -15,7 +15,7 @@ jobs: CC: mpicc FC: mpifort CPPFLAGS: "-I/usr/include -I/usr/local/include -I/home/runner/pnetcdf/include" - LDFLAGS: "-L/home/runner/pnetcdf/lib" + LDFLAGS: "-L/home/runner/pnetcdf/lib -lpnetcdf" steps: - uses: actions/checkout@v2 @@ -27,22 +27,22 @@ jobs: sudo apt-spy2 fix --commit # after selecting a specific mirror, we need to run 'apt-get update' sudo apt-get update - sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev + sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev - name: cache-pnetcdf id: cache-pnetcdf uses: actions/cache@v2 with: path: ~/pnetcdf - key: pnetcdf-${{ runner.os }}-1.12.1 + key: pnetcdf-${{ runner.os }}-1.12.2 - name: build-pnetcdf if: steps.cache-pnetcdf.outputs.cache-hit != 'true' run: | set -x - wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz &> /dev/null - tar -xzvf pnetcdf-1.12.1.tar.gz - pushd pnetcdf-1.12.1 + wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.2.tar.gz &> /dev/null + tar -xzvf pnetcdf-1.12.2.tar.gz + pushd pnetcdf-1.12.2 ./configure --prefix=/home/runner/pnetcdf --enable-shared --disable-cxx make sudo make install @@ -59,4 +59,3 @@ jobs: export DISTCHECK_CONFIGURE_FLAGS="--enable-fortran" ./configure make -j distcheck - From 03ff8f5458d6afeb648eab04821c949950f8e54c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 8 Mar 2021 08:43:54 -0700 Subject: [PATCH 03/10] remove enabled-shared pnetcdf option --- .github/workflows/strict_autotools_ubuntu_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/strict_autotools_ubuntu_latest.yml b/.github/workflows/strict_autotools_ubuntu_latest.yml index caeb280055..c16ea13fed 100644 --- a/.github/workflows/strict_autotools_ubuntu_latest.yml +++ b/.github/workflows/strict_autotools_ubuntu_latest.yml @@ -43,7 +43,7 @@ jobs: wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.2.tar.gz &> /dev/null tar -xzvf pnetcdf-1.12.2.tar.gz pushd pnetcdf-1.12.2 - ./configure --prefix=/home/runner/pnetcdf --enable-shared --disable-cxx + ./configure --prefix=/home/runner/pnetcdf --disable-cxx make sudo make install popd From d44762937bfda64897e007521ef9ce71dfc719d1 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 12:56:53 -0600 Subject: [PATCH 04/10] revert change to strict autotools workflow --- .../workflows/strict_autotools_ubuntu_latest.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/strict_autotools_ubuntu_latest.yml b/.github/workflows/strict_autotools_ubuntu_latest.yml index c16ea13fed..bcd626a807 100644 --- a/.github/workflows/strict_autotools_ubuntu_latest.yml +++ b/.github/workflows/strict_autotools_ubuntu_latest.yml @@ -15,7 +15,7 @@ jobs: CC: mpicc FC: mpifort CPPFLAGS: "-I/usr/include -I/usr/local/include -I/home/runner/pnetcdf/include" - LDFLAGS: "-L/home/runner/pnetcdf/lib -lpnetcdf" + LDFLAGS: "-L/home/runner/pnetcdf/lib" steps: - uses: actions/checkout@v2 @@ -27,23 +27,23 @@ jobs: sudo apt-spy2 fix --commit # after selecting a specific mirror, we need to run 'apt-get update' sudo apt-get update - sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev + sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev - name: cache-pnetcdf id: cache-pnetcdf uses: actions/cache@v2 with: path: ~/pnetcdf - key: pnetcdf-${{ runner.os }}-1.12.2 + key: pnetcdf-${{ runner.os }}-1.12.1-1 - name: build-pnetcdf if: steps.cache-pnetcdf.outputs.cache-hit != 'true' run: | set -x - wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.2.tar.gz &> /dev/null - tar -xzvf pnetcdf-1.12.2.tar.gz - pushd pnetcdf-1.12.2 - ./configure --prefix=/home/runner/pnetcdf --disable-cxx + wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz &> /dev/null + tar -xzvf pnetcdf-1.12.1.tar.gz + pushd pnetcdf-1.12.1 + ./configure --prefix=/home/runner/pnetcdf --enable-shared --disable-cxx make sudo make install popd @@ -59,3 +59,4 @@ jobs: export DISTCHECK_CONFIGURE_FLAGS="--enable-fortran" ./configure make -j distcheck + From 73716f7e4c29d3f975031329d69f1d207dfacbfa Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 13:17:07 -0600 Subject: [PATCH 05/10] try --oversubscribe --- .github/workflows/cmake.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 3b3ae902d9..52c9077d8b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -52,6 +52,7 @@ jobs: - name: cmake build run: | set -x + alias mpiexec="mpiexec --oversubscribe" mkdir build cd build cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 .. From a06dfa2de55781119e2574e2415cb4a18598038a Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 13:31:48 -0600 Subject: [PATCH 06/10] add oversubscribe option --- .github/workflows/autotools.yml | 4 ++-- .github/workflows/strict_autotools_ubuntu_latest.yml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 32440b0c3f..429616dfc3 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -27,7 +27,7 @@ jobs: sudo apt-spy2 fix --commit # after selecting a specific mirror, we need to run 'apt-get update' sudo apt-get update - sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev + sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev - name: cache-pnetcdf id: cache-pnetcdf uses: actions/cache@v2 @@ -50,6 +50,6 @@ jobs: - name: autoreconf run: autoreconf -i - name: configure - run: ./configure --enable-fortran --enable-docs + run: ./configure --enable-fortran --enable-docs --with-mpiexec='mpiexec --oversubscribe' - name: make check run: make -j check diff --git a/.github/workflows/strict_autotools_ubuntu_latest.yml b/.github/workflows/strict_autotools_ubuntu_latest.yml index bcd626a807..b8e46ec223 100644 --- a/.github/workflows/strict_autotools_ubuntu_latest.yml +++ b/.github/workflows/strict_autotools_ubuntu_latest.yml @@ -27,7 +27,7 @@ jobs: sudo apt-spy2 fix --commit # after selecting a specific mirror, we need to run 'apt-get update' sudo apt-get update - sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev + sudo apt-get install netcdf-bin libnetcdf-dev doxygen graphviz wget gfortran libjpeg-dev libz-dev openmpi-bin libopenmpi-dev - name: cache-pnetcdf id: cache-pnetcdf @@ -57,6 +57,5 @@ jobs: export FFLAGS="-Wall" export FCFLAGS="-Wall" export DISTCHECK_CONFIGURE_FLAGS="--enable-fortran" - ./configure + ./configure --with-mpiexec='mpiexec --oversubscribe' make -j distcheck - From 35c04b6faf354fbf661b0a3c68688a6abd40f283 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 13:38:58 -0600 Subject: [PATCH 07/10] set WITH_MPIEXEC --oversubscribe --- .github/workflows/cmake.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 52c9077d8b..94f165fc9e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -52,10 +52,9 @@ jobs: - name: cmake build run: | set -x - alias mpiexec="mpiexec --oversubscribe" mkdir build cd build - cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 .. + cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 -DWITH_MPIEXEC="mpiexec --oversubscribe" .. make VERBOSE=1 make tests VERBOSE=1 ctest -VV From 0638adedf82150cfc9c442a8c30aaa4bec2c74ab Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 13:52:09 -0600 Subject: [PATCH 08/10] set WITH_MPIEXEC --oversubscribe --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 94f165fc9e..bb120ff7d8 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -54,7 +54,7 @@ jobs: set -x mkdir build cd build - cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 -DWITH_MPIEXEC="mpiexec --oversubscribe" .. + cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 -DWITH_MPIEXEC="/usr/bin/mpiexec --oversubscribe" .. make VERBOSE=1 make tests VERBOSE=1 ctest -VV From 59ad3368c9e48bcecd529722d29524e9a49a0e3f Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 14:12:39 -0600 Subject: [PATCH 09/10] cmake still failing add debug code --- .github/workflows/cmake.yml | 2 +- .github/workflows/strict_autotools_ubuntu_latest.yml | 4 ++-- cmake/LibMPI.cmake | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index bb120ff7d8..f725af3ee3 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -54,7 +54,7 @@ jobs: set -x mkdir build cd build - cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 -DWITH_MPIEXEC="/usr/bin/mpiexec --oversubscribe" .. + cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 .. make VERBOSE=1 make tests VERBOSE=1 ctest -VV diff --git a/.github/workflows/strict_autotools_ubuntu_latest.yml b/.github/workflows/strict_autotools_ubuntu_latest.yml index b8e46ec223..058f194128 100644 --- a/.github/workflows/strict_autotools_ubuntu_latest.yml +++ b/.github/workflows/strict_autotools_ubuntu_latest.yml @@ -56,6 +56,6 @@ jobs: export CFLAGS="-std=c99 -Wall" export FFLAGS="-Wall" export FCFLAGS="-Wall" - export DISTCHECK_CONFIGURE_FLAGS="--enable-fortran" - ./configure --with-mpiexec='mpiexec --oversubscribe' + export DISTCHECK_CONFIGURE_FLAGS="--enable-fortran --with-mpiexec='/usr/bin/mpiexec --oversubscribe'" + ./configure make -j distcheck diff --git a/cmake/LibMPI.cmake b/cmake/LibMPI.cmake index 2fa9f52af5..4d96d6eab6 100644 --- a/cmake/LibMPI.cmake +++ b/cmake/LibMPI.cmake @@ -33,9 +33,9 @@ function (platform_name RETURN_VARIABLE) if (SITENAME MATCHES "^laramie" OR SITENAME MATCHES "^cheyenne" OR - SITENAME MATCHES "^chadmin") + SITENAME MATCHES "^chadmin") - set (${RETURN_VARIABLE} "nwscla" PARENT_SCOPE) + set (${RETURN_VARIABLE} "nwscla" PARENT_SCOPE) # ALCF/Argonne Machines elseif (SITENAME MATCHES "^mira" OR @@ -67,7 +67,7 @@ function (platform_name RETURN_VARIABLE) set (${RETURN_VARIABLE} "unknown" PARENT_SCOPE) endif () - + message("Found platform ${RETURN_VARIABLE} from sitename ${SITENAME}") endfunction () #============================================================================== From 9a4e836cacd4856be72114da07729717268b21c1 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 15 Mar 2021 17:36:44 -0600 Subject: [PATCH 10/10] try this --- .github/workflows/cmake.yml | 2 +- CTestScript.cmake | 8 +++++--- cmake/LibMPI.cmake | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f725af3ee3..6260afa485 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -54,7 +54,7 @@ jobs: set -x mkdir build cd build - cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 .. + cmake -Wno-dev -DNetCDF_C_LIBRARY=/usr/lib/x86_64-linux-gnu/libnetcdf.so -DNetCDF_C_INCLUDE_DIR=/usr/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 -DMPIEXEC_PREFLAGS="--oversubscribe" .. make VERBOSE=1 make tests VERBOSE=1 ctest -VV diff --git a/CTestScript.cmake b/CTestScript.cmake index 23d2a25a41..a8cd24d76c 100644 --- a/CTestScript.cmake +++ b/CTestScript.cmake @@ -42,6 +42,8 @@ execute_process (COMMAND ${HOSTNAME_CMD} ## -- Set hostname ID (e.g., alcf, nwsc, nersc, ...) message ("hostname is ${HOSTNAME}") +if (DEFINED HOSTNAME_ID) +else() # UCAR/NWSC Machines if (HOSTNAME MATCHES "^yslogin" OR HOSTNAME MATCHES "^geyser" OR @@ -51,7 +53,7 @@ if (HOSTNAME MATCHES "^yslogin" OR # New UCAR/NWSC SGI Machines elseif (HOSTNAME MATCHES "^laramie" OR HOSTNAME MATCHES "^chadmin" OR - HOSTNAME MATCHES "^cheyenne") + HOSTNAME MATCHES "^cheyenne") set (HOSTNAME_ID "nwscla") # ALCF/Argonne Machines elseif (HOSTNAME MATCHES "^mira" OR @@ -87,10 +89,10 @@ else () if (CMAKE_SYSTEM_NAME MATCHES "Catamount") set (HOSTNAME_ID "ncsa") else () - set (HOSTNAME_ID "unknown") + set (HOSTNAME_ID "unknown") endif () endif () - +endif() ## -- Get system info find_program (UNAME NAMES uname) diff --git a/cmake/LibMPI.cmake b/cmake/LibMPI.cmake index 4d96d6eab6..48efe976a9 100644 --- a/cmake/LibMPI.cmake +++ b/cmake/LibMPI.cmake @@ -67,7 +67,6 @@ function (platform_name RETURN_VARIABLE) set (${RETURN_VARIABLE} "unknown" PARENT_SCOPE) endif () - message("Found platform ${RETURN_VARIABLE} from sitename ${SITENAME}") endfunction () #==============================================================================