From 0697d04d80873a779a292dcb6b86494c9936f213 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:05:45 -0600 Subject: [PATCH 01/41] building openmpi --- .github/workflows/a3.yml | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/a3.yml diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml new file mode 100644 index 00000000000..db234113d9c --- /dev/null +++ b/.github/workflows/a3.yml @@ -0,0 +1,43 @@ +name: netcdf-4.7.4_pnetcdf-12.1_ncint + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + env: + CC: mpicc + FC: mpifort + CPPFLAGS: "-I/home/runner/hdf5/include -I/home/runner/netcdf-c/include -I/home/runner/netcdf-fortran/include -I/home/runner/pnetcdf/include" + LDFLAGS: "-L/home/runner/hdf5/lib -L/home/runner/netcdf-c/lib -L/home/runner/netcdf-fortran/lib -L/home/runner/pnetcdf/lib" + + steps: + - uses: actions/checkout@v2 + - name: Installs + run: | + sudo apt-get install doxygen graphviz wget gfortran libjpeg-dev libz-dev + - name: cache-openmpi + id: cache-openmpi + uses: actions/cache@v2 + with: + path: ~/openmpi + key: openmpi-${{ runner.os }}-4.0.4 + + - name: build-openmpi + if: steps.cache-openmpi.outputs.cache-hit != 'true' + run: | + wget https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.4.tar.gz &> /dev/null + tar -xzf openmpi-4.0.4.tar.gz + pushd openmpi-4.0.4 + ./configure --prefix=/home/runner/openmpi + make + sudo make install + popd + - name: autoreconf + run: autoreconf -i From 5d9b54b651303af6d51b4cc082d359825a7200b1 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:14:15 -0600 Subject: [PATCH 02/41] building openmpi --- .github/workflows/a3.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index db234113d9c..b83fc5a3f5f 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -12,8 +12,6 @@ jobs: runs-on: ubuntu-latest env: - CC: mpicc - FC: mpifort CPPFLAGS: "-I/home/runner/hdf5/include -I/home/runner/netcdf-c/include -I/home/runner/netcdf-fortran/include -I/home/runner/pnetcdf/include" LDFLAGS: "-L/home/runner/hdf5/lib -L/home/runner/netcdf-c/lib -L/home/runner/netcdf-fortran/lib -L/home/runner/pnetcdf/lib" From 2b766e2d2d8d107adcc443e6c517af11a73631af Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:19:18 -0600 Subject: [PATCH 03/41] fixing apt-get for curl --- .github/workflows/autotools.yml | 6 ++++++ .github/workflows/cmake.yml | 6 ++++++ .github/workflows/cmake_ncint.yml | 6 ++++++ .github/workflows/strict_autotools.yml | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index 249b1f60d90..052487e8b8d 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -21,6 +21,12 @@ jobs: - uses: actions/checkout@v2 - name: Installs run: | + set -x + sudo gem install apt-spy2 + sudo apt-spy2 check + 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 - name: cache-pnetcdf id: cache-pnetcdf diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index d129c69c97d..bf1671b94f9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -22,6 +22,12 @@ jobs: - uses: actions/checkout@v2 - name: Installs run: | + set -x + sudo gem install apt-spy2 + sudo apt-spy2 check + 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 - name: cache-pnetcdf diff --git a/.github/workflows/cmake_ncint.yml b/.github/workflows/cmake_ncint.yml index 4948619eb2b..53a67a59c26 100644 --- a/.github/workflows/cmake_ncint.yml +++ b/.github/workflows/cmake_ncint.yml @@ -22,6 +22,12 @@ jobs: - uses: actions/checkout@v2 - name: Installs run: | + set -x + sudo gem install apt-spy2 + sudo apt-spy2 check + 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 - name: cache-pnetcdf diff --git a/.github/workflows/strict_autotools.yml b/.github/workflows/strict_autotools.yml index 2d581aefd4d..b47c4b1ba5f 100644 --- a/.github/workflows/strict_autotools.yml +++ b/.github/workflows/strict_autotools.yml @@ -21,6 +21,12 @@ jobs: - uses: actions/checkout@v2 - name: Installs run: | + set -x + sudo gem install apt-spy2 + sudo apt-spy2 check + 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 - name: cache-pnetcdf From dc6eb09b964defdce68cc87cb75ef1d1df69a5cc Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:30:52 -0600 Subject: [PATCH 04/41] adding HDF5 --- .github/workflows/a3.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index b83fc5a3f5f..2a06ac1b938 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -12,8 +12,9 @@ jobs: runs-on: ubuntu-latest env: - CPPFLAGS: "-I/home/runner/hdf5/include -I/home/runner/netcdf-c/include -I/home/runner/netcdf-fortran/include -I/home/runner/pnetcdf/include" - LDFLAGS: "-L/home/runner/hdf5/lib -L/home/runner/netcdf-c/lib -L/home/runner/netcdf-fortran/lib -L/home/runner/pnetcdf/lib" + PATH: "/home/runner/openmpi/bin:$PATH" + CPPFLAGS: "-I/home/runner/openmpi/include -I/home/runner/hdf5/include -I/home/runner/netcdf-c/include -I/home/runner/netcdf-fortran/include -I/home/runner/pnetcdf/include" + LDFLAGS: "-L/home/runner/openmpi/lib -L/home/runner/hdf5/lib -L/home/runner/netcdf-c/lib -L/home/runner/netcdf-fortran/lib -L/home/runner/pnetcdf/lib" steps: - uses: actions/checkout@v2 @@ -37,5 +38,23 @@ jobs: make sudo make install popd + - name: cache-hdf5 + id: cache-hdf5 + uses: actions/cache@v2 + with: + path: ~/hdf5 + key: hdf5-${{ runner.os }}-1.10.6 + + - name: build-hdf5 + if: steps.cache-hdf5.outputs.cache-hit != 'true' + run: | + export CC=mpicc + wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null + tar -xzf hdf5-1.10.6.tar.gz + pushd hdf5-1.10.6 + ./configure --prefix=/home/runner/hdf5 --enable-parallel --disable-tools --disable-fortran --disable-cxx + make + sudo make install + popd - name: autoreconf run: autoreconf -i From ab77827904709d8a5aa14b8124b47d76c77924c8 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:32:04 -0600 Subject: [PATCH 05/41] adding HDF5 --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 2a06ac1b938..193aea1a932 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -12,7 +12,6 @@ jobs: runs-on: ubuntu-latest env: - PATH: "/home/runner/openmpi/bin:$PATH" CPPFLAGS: "-I/home/runner/openmpi/include -I/home/runner/hdf5/include -I/home/runner/netcdf-c/include -I/home/runner/netcdf-fortran/include -I/home/runner/pnetcdf/include" LDFLAGS: "-L/home/runner/openmpi/lib -L/home/runner/hdf5/lib -L/home/runner/netcdf-c/lib -L/home/runner/netcdf-fortran/lib -L/home/runner/pnetcdf/lib" @@ -49,6 +48,7 @@ jobs: if: steps.cache-hdf5.outputs.cache-hit != 'true' run: | export CC=mpicc + export PATH="/home/runner/openmpi/bin:$PATH" wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null tar -xzf hdf5-1.10.6.tar.gz pushd hdf5-1.10.6 From ae45f2bf99e43e4c75138fa5f39f7d41c28fd4d8 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:43:02 -0600 Subject: [PATCH 06/41] adding HDF5 --- .github/workflows/a3.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 193aea1a932..778ece9f508 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -47,8 +47,11 @@ jobs: - name: build-hdf5 if: steps.cache-hdf5.outputs.cache-hit != 'true' run: | - export CC=mpicc + set -x + ls -l /home/runner/openmpi/bin export PATH="/home/runner/openmpi/bin:$PATH" + echo $PATH + export CC=mpicc wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null tar -xzf hdf5-1.10.6.tar.gz pushd hdf5-1.10.6 From 1c5ab760315b899ccf67274c6d4daffb6f2a5a17 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 11:58:42 -0600 Subject: [PATCH 07/41] adding HDF5 --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 778ece9f508..6185e5b0945 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -51,7 +51,7 @@ jobs: ls -l /home/runner/openmpi/bin export PATH="/home/runner/openmpi/bin:$PATH" echo $PATH - export CC=mpicc + export CC=/home/runner/openmpi/mpicc wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null tar -xzf hdf5-1.10.6.tar.gz pushd hdf5-1.10.6 From 1199dd36c4d87c3855679561d9e882971d6f7a5f Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 12:08:14 -0600 Subject: [PATCH 08/41] adding HDF5 --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 6185e5b0945..2a957634552 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -51,7 +51,7 @@ jobs: ls -l /home/runner/openmpi/bin export PATH="/home/runner/openmpi/bin:$PATH" echo $PATH - export CC=/home/runner/openmpi/mpicc + export CC=/home/runner/openmpi/bin/mpicc wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null tar -xzf hdf5-1.10.6.tar.gz pushd hdf5-1.10.6 From 49ab2d77304039ea2858760315e1bed0ad7d3bd7 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 12:27:20 -0600 Subject: [PATCH 09/41] adding netcdf-c --- .github/workflows/a3.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 2a957634552..794a2a28703 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -48,9 +48,7 @@ jobs: if: steps.cache-hdf5.outputs.cache-hit != 'true' run: | set -x - ls -l /home/runner/openmpi/bin export PATH="/home/runner/openmpi/bin:$PATH" - echo $PATH export CC=/home/runner/openmpi/bin/mpicc wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null tar -xzf hdf5-1.10.6.tar.gz @@ -59,5 +57,25 @@ jobs: make sudo make install popd + - name: cache-netcdf-c + id: cache-netcdf-c + uses: actions/cache@v2 + with: + path: ~/netcdf-c + key: netcdf-c-${{ runner.os }}-4.7.4 + + - name: build-netcdf-c + if: steps.cache-netcdf-c.outputs.cache-hit != 'true' + run: | + set -x + export PATH="/home/runner/openmpi/bin:$PATH" + export CC=/home/runner/openmpi/bin/mpicc + wget https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-4.7.4.tar.gz &> /dev/null + tar -xzf netcdf-c-4.7.4.tar.gz + pushd netcdf-c-4.7.4 + ./configure --prefix=/home/runner/netcdf-c --disable-dap --disable-utilities + make -j + sudo make install + popd - name: autoreconf run: autoreconf -i From 35dda9d5bd12de0403b3c13ec7fd79acd7b40eea Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 12:32:05 -0600 Subject: [PATCH 10/41] adding netcdf-fortran and pnetcdf --- .github/workflows/a3.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 794a2a28703..6a61f972314 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -77,5 +77,45 @@ jobs: make -j sudo make install popd + - name: cache-netcdf-fortran + id: cache-netcdf-fortran + uses: actions/cache@v2 + with: + path: ~/netcdf-fortran + key: netcdf-fortran-${{ runner.os }}-4.5.3 + + - name: build-netcdf-fortran + if: steps.cache-netcdf-fortran.outputs.cache-hit != 'true' + run: | + set -x + export PATH="/home/runner/openmpi/bin:$PATH" + export CC=/home/runner/openmpi/bin/mpicc + wget https://github.com/Unidata/netcdf-fortran/archive/v4.5.3.tar.gz &> /dev/null + tar -xzf v4.5.3.tar.gz + pushd netcdf-fortran-4.5.3 + ./configure --prefix=/home/runner/netcdf-fortran + make -j + sudo make install + popd + - name: cache-pnetcdf + id: cache-pnetcdf + uses: actions/cache@v2 + with: + path: ~/pnetcdf + key: pnetcdf-${{ runner.os }}-1.12.1 + + - name: build-pnetcdf + if: steps.cache-pnetcdf.outputs.cache-hit != 'true' + run: | + set -x + export PATH="/home/runner/openmpi/bin:$PATH" + export CC=/home/runner/openmpi/bin/mpicc + wget https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz &> /dev/null + tar -xzf 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 - name: autoreconf run: autoreconf -i From 6d2b2a9aa171c2b76c1e0a20e568f9e725f25e73 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 12:35:52 -0600 Subject: [PATCH 11/41] adding netcdf-fortran and pnetcdf --- .github/workflows/a3.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 6a61f972314..ce50f3b3ace 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -42,7 +42,7 @@ jobs: uses: actions/cache@v2 with: path: ~/hdf5 - key: hdf5-${{ runner.os }}-1.10.6 + key: hdf5-${{ runner.os }}-1.10.6-openmpi-4.0.4 - name: build-hdf5 if: steps.cache-hdf5.outputs.cache-hit != 'true' @@ -53,16 +53,16 @@ jobs: wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.6/src/hdf5-1.10.6.tar.gz &> /dev/null tar -xzf hdf5-1.10.6.tar.gz pushd hdf5-1.10.6 - ./configure --prefix=/home/runner/hdf5 --enable-parallel --disable-tools --disable-fortran --disable-cxx + ./configure --prefix=/home/runner/hdf5 --enable-parallel --disable-tools --disable-fortran --disable-cxx --enable-parallel-tests make - sudo make install + sudo make check install popd - name: cache-netcdf-c id: cache-netcdf-c uses: actions/cache@v2 with: path: ~/netcdf-c - key: netcdf-c-${{ runner.os }}-4.7.4 + key: netcdf-c-${{ runner.os }}-4.7.4-openmpi-4.0.4 - name: build-netcdf-c if: steps.cache-netcdf-c.outputs.cache-hit != 'true' @@ -82,7 +82,7 @@ jobs: uses: actions/cache@v2 with: path: ~/netcdf-fortran - key: netcdf-fortran-${{ runner.os }}-4.5.3 + key: netcdf-fortran-${{ runner.os }}-4.5.3-openmpi-4.0.4 - name: build-netcdf-fortran if: steps.cache-netcdf-fortran.outputs.cache-hit != 'true' @@ -102,7 +102,7 @@ jobs: uses: actions/cache@v2 with: path: ~/pnetcdf - key: pnetcdf-${{ runner.os }}-1.12.1 + key: pnetcdf-${{ runner.os }}-1.12.1-openmpi-4.0.4 - name: build-pnetcdf if: steps.cache-pnetcdf.outputs.cache-hit != 'true' From 61ef8dedefd48ff4546c4bfbb7096f378d9ca0ce Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 13:24:10 -0600 Subject: [PATCH 12/41] adding netcdf-fortran and pnetcdf --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index ce50f3b3ace..86b0015213f 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -55,7 +55,7 @@ jobs: pushd hdf5-1.10.6 ./configure --prefix=/home/runner/hdf5 --enable-parallel --disable-tools --disable-fortran --disable-cxx --enable-parallel-tests make - sudo make check install + sudo make install popd - name: cache-netcdf-c id: cache-netcdf-c From 4d1a70939c1591420fa3ba02ee3fdc652f5f6fa4 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 13:39:15 -0600 Subject: [PATCH 13/41] adding PIO --- .github/workflows/a3.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 86b0015213f..bea6a8877c3 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -119,3 +119,10 @@ jobs: popd - name: autoreconf run: autoreconf -i + - name: pio build + run: | + set -x + export PATH="/home/runner/openmpi/bin:$PATH" + export CC=/home/runner/openmpi/bin/mpicc + ./configure + make From 8f865959eb4e48e6aeae3dd46105cb09b1a14164 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 13:40:33 -0600 Subject: [PATCH 14/41] adding PIO --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index bea6a8877c3..30097346b78 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -125,4 +125,4 @@ jobs: export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc ./configure - make + make check From 7a5c3f3064dc81dc0ed30e4614e788b17f3da0d6 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:21:46 -0600 Subject: [PATCH 15/41] adding PIO --- .github/workflows/a3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 30097346b78..67972c178af 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,6 +122,7 @@ jobs: - name: pio build run: | set -x + alias mpiexec='mpiexec --oversubscribe' export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc ./configure From 8984b2654237ac9c803f781f6fe7cf62fe94d984 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:26:27 -0600 Subject: [PATCH 16/41] adding PIO --- .github/workflows/a3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 67972c178af..251a7a3cd95 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,8 +122,8 @@ jobs: - name: pio build run: | set -x - alias mpiexec='mpiexec --oversubscribe' export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc ./configure - make check + make + From 11203423d3b58b2abc97353c59f66130bcba7dff Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:30:07 -0600 Subject: [PATCH 17/41] adding PIO --- .github/workflows/a3.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 251a7a3cd95..c9153ccbf83 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,6 +122,10 @@ jobs: - name: pio build run: | set -x + ls -l .bashrc + echo "alias mpiexec=\'mpiexec --oversubscribe\'" > .bashrc + ls -l .bashrc + source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc ./configure From 0c5dbbd379bf9a2dff6033ac10caeeb4528896b3 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:31:09 -0600 Subject: [PATCH 18/41] adding PIO --- .github/workflows/a3.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index c9153ccbf83..3d1b1fad6eb 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,7 +122,6 @@ jobs: - name: pio build run: | set -x - ls -l .bashrc echo "alias mpiexec=\'mpiexec --oversubscribe\'" > .bashrc ls -l .bashrc source .bashrc From 3681f56be7044c308d986c4ccd1c5b6118f16f82 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:33:34 -0600 Subject: [PATCH 19/41] adding PIO --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 3d1b1fad6eb..6a0986fcb35 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,7 +122,7 @@ jobs: - name: pio build run: | set -x - echo "alias mpiexec=\'mpiexec --oversubscribe\'" > .bashrc + echo 'alias mpiexec=\'mpiexec --oversubscribe\'' > .bashrc ls -l .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From 8b243ca4cb49c0da541bcab3b21c7bd2ae5ecc03 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:36:01 -0600 Subject: [PATCH 20/41] adding PIO --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 6a0986fcb35..7defea6a731 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,7 +122,7 @@ jobs: - name: pio build run: | set -x - echo 'alias mpiexec=\'mpiexec --oversubscribe\'' > .bashrc + echo $'alias mpiexec=\'mpiexec --oversubscribe\'' > .bashrc ls -l .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From cc1dc81ab5bf4d1a635fab75c7bfc97b690bbc4d Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 15:58:19 -0600 Subject: [PATCH 21/41] adding PIO --- .github/workflows/a3.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 7defea6a731..1ee6cae7015 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -128,5 +128,7 @@ jobs: export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc ./configure - make + which mpiexec + make check + From 2bf634f90f4369bca3180125bbfdd94ebe5bad28 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 16:03:09 -0600 Subject: [PATCH 22/41] adding PIO --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 1ee6cae7015..a0fa2bea5d4 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,7 +122,7 @@ jobs: - name: pio build run: | set -x - echo $'alias mpiexec=\'mpiexec --oversubscribe\'' > .bashrc + echo $'alias mpiexec=mpiexec --oversubscribe' > .bashrc ls -l .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From b35ee21107745835c24d72727fe42bfb197ade83 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 16:08:04 -0600 Subject: [PATCH 23/41] adding PIO --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index a0fa2bea5d4..1ee6cae7015 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,7 +122,7 @@ jobs: - name: pio build run: | set -x - echo $'alias mpiexec=mpiexec --oversubscribe' > .bashrc + echo $'alias mpiexec=\'mpiexec --oversubscribe\'' > .bashrc ls -l .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From 2d9bf6b69dc57449d47f4dbdb8106e92a9888cda Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Mon, 24 Aug 2020 16:19:21 -0600 Subject: [PATCH 24/41] adding PIO --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 1ee6cae7015..f7fb48aeffd 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,7 +122,7 @@ jobs: - name: pio build run: | set -x - echo $'alias mpiexec=\'mpiexec --oversubscribe\'' > .bashrc + echo 'alias mpiexec='\''mpiexec --oversubscribe'\' > .bashrc ls -l .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From 5a96af866e3d4cc622a93120abde861a8742741a Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 07:22:00 -0600 Subject: [PATCH 25/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index f7fb48aeffd..b990193fb1b 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -122,8 +122,8 @@ jobs: - name: pio build run: | set -x - echo 'alias mpiexec='\''mpiexec --oversubscribe'\' > .bashrc - ls -l .bashrc + echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc + echo "alias mpiexec='mpiexec --oversubscribe'" >> .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc From 0903e62234bb2e74cf5ea74b45e4d5b6126e0d83 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 07:29:51 -0600 Subject: [PATCH 26/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index b990193fb1b..a1118c78386 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo "alias mpiexec='mpiexec --oversubscribe'" >> .bashrc + echo "alias mpiexec=mpiexec --oversubscribe" >> .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc From f283a8030234ab2d72061864c429a8d75285c9ea Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 07:39:51 -0600 Subject: [PATCH 27/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index a1118c78386..39d7ac7f45a 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo "alias mpiexec=mpiexec --oversubscribe" >> .bashrc + echo "alias mpiexec=\"mpiexec --oversubscribe\"" >> .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc From a96671fd6449e206babf6cceb8b17fb6a40d2559 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 07:44:26 -0600 Subject: [PATCH 28/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 39d7ac7f45a..a57cc5a487b 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo "alias mpiexec=\"mpiexec --oversubscribe\"" >> .bashrc + echo 'alias mpiexec=\"mpiexec --oversubscribe\"' >> .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc From dcb5e0807a630a0f7ebe6d8b77346ca5c363b162 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 07:48:56 -0600 Subject: [PATCH 29/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index a57cc5a487b..391b63a48a3 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo 'alias mpiexec=\"mpiexec --oversubscribe\"' >> .bashrc + echo $'alias mpiexec=\"mpiexec --oversubscribe\"' >> .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc From 493353ae82535b5732ff079151d329b6e9381083 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 07:58:26 -0600 Subject: [PATCH 30/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 391b63a48a3..36f266592fb 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,8 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo $'alias mpiexec=\"mpiexec --oversubscribe\"' >> .bashrc + echo 'alias mpiexec=\"mpiexec --oversubscribe\"' >> .bashrc + cat .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc From ba2b719836b739060e29ec25c8c4f8a63ab7e0b6 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 08:10:14 -0600 Subject: [PATCH 31/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 36f266592fb..ca681c9b183 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo 'alias mpiexec=\"mpiexec --oversubscribe\"' >> .bashrc + echo 'alias mpiexec="mpiexec --oversubscribe"' >> .bashrc cat .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From 558a3b9c46bb932f28dc174b8cd093f04b2edcbb Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 08:15:10 -0600 Subject: [PATCH 32/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index ca681c9b183..bcc15ebb800 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo 'alias mpiexec="mpiexec --oversubscribe"' >> .bashrc + echo 'alias mpiexec=\'mpiexec --oversubscrib\'' >> .bashrc cat .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From 3822956e312cbcd9b8811cfd3e3a255aa2142200 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 08:24:58 -0600 Subject: [PATCH 33/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index bcc15ebb800..696c312e66b 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo 'alias mpiexec=\'mpiexec --oversubscrib\'' >> .bashrc + echo $'alias mpiexec=\'mpiexec --oversubscrib\'' >> .bashrc cat .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From d76dd49b61ed8e6cfe528aa46221fee2f4a46ce0 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 08:28:14 -0600 Subject: [PATCH 34/41] trying to get openmpi mpiexec working --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 696c312e66b..608144075c5 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -123,7 +123,7 @@ jobs: run: | set -x echo 'export PATH=/home/runner/openmpi/bin:$PATH' > .bashrc - echo $'alias mpiexec=\'mpiexec --oversubscrib\'' >> .bashrc + echo $'alias mpiexec=\'mpiexec --oversubscribe\'' >> .bashrc cat .bashrc source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" From 2d908a13a7d437c693156d334d6dc366380f5f54 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 10:36:38 -0600 Subject: [PATCH 35/41] adding --with-mpiexec option to configure --- configure.ac | 12 ++++++++++++ tests/cunit/Makefile.am | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9aa23ff0bf5..7e5e1711961 100644 --- a/configure.ac +++ b/configure.ac @@ -202,6 +202,15 @@ if test "x$enable_developer_docs" = xyes; then fi AM_CONDITIONAL(BUILD_DOCS, [test "x$enable_docs" = xyes]) +# Did the user specify an MPI launcher other than mpiexec? +AC_MSG_CHECKING([whether a user specified program to run mpi programs]) +AC_ARG_WITH([mpiexec], + [AS_HELP_STRING([--with-mpiexec=], + [Specify command to launch MPI parallel tests.])], + [MPIEXEC=$with_mpiexec], [MPIEXEC=mpiexec]) +AC_MSG_RESULT([$MPIEXEC]) +AC_SUBST([MPIEXEC], [$MPIEXEC]) + # Is doxygen installed? AC_CHECK_PROGS([DOXYGEN], [doxygen]) if test -z "$DOXYGEN" -a "x$enable_docs" = xyes; then @@ -390,6 +399,9 @@ AM_CONDITIONAL(NETCDF_INTEGRATION, [test "x$enable_netcdf_integration" = xyes]) AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90]) +# The user may have changed the MPIEXEC for these test scripts. +AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x h5_tests/cunit/run_tests.sh]) + # Args: # 1. netcdf_meta.h variable # 2. conditional variable that is yes or no. diff --git a/tests/cunit/Makefile.am b/tests/cunit/Makefile.am index 78bf18f24bb..7a8edd61941 100644 --- a/tests/cunit/Makefile.am +++ b/tests/cunit/Makefile.am @@ -69,7 +69,9 @@ test_async_1d_SOURCES = test_async_1d.c pio_tests.h test_simple_SOURCES = test_simple.c test_common.c pio_tests.h # Distribute the test script. -EXTRA_DIST = run_tests.sh CMakeLists.txt test_darray_frame.c +EXTRA_DIST = run_tests.sh.in CMakeLists.txt test_darray_frame.c # Clean up files produced during testing. CLEANFILES = *.nc *.log decomp*.txt *.clog2 *.slog2 + +DISTCLEANFILES = run_tests.sh From e4fb33c030e65e725c4b1389a087b084ba8ed42b Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 10:37:22 -0600 Subject: [PATCH 36/41] adding --with-mpiexec option to configure --- .github/workflows/a3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/a3.yml b/.github/workflows/a3.yml index 608144075c5..71e66ffd4d1 100644 --- a/.github/workflows/a3.yml +++ b/.github/workflows/a3.yml @@ -128,7 +128,7 @@ jobs: source .bashrc export PATH="/home/runner/openmpi/bin:$PATH" export CC=/home/runner/openmpi/bin/mpicc - ./configure + ./configure --with-mpiexec='mpiexec --oversubscribe' which mpiexec make check From db613c3e56cc3e156967c2a1a2a20562ee5cbc12 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 10:42:43 -0600 Subject: [PATCH 37/41] adding tests/cunit/run_tests.sh.in --- tests/cunit/{run_tests.sh => run_tests.sh.in} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename tests/cunit/{run_tests.sh => run_tests.sh.in} (93%) mode change 100755 => 100644 diff --git a/tests/cunit/run_tests.sh b/tests/cunit/run_tests.sh.in old mode 100755 new mode 100644 similarity index 93% rename from tests/cunit/run_tests.sh rename to tests/cunit/run_tests.sh.in index ee6c7b542c1..bd6e4f29215 --- a/tests/cunit/run_tests.sh +++ b/tests/cunit/run_tests.sh.in @@ -26,7 +26,7 @@ for TEST in $PIO_TESTS do success1=false echo "running ${TEST}" - mpiexec -n 4 ./${TEST} && success1=true + @MPIEXEC@ -n 4 ./${TEST} && success1=true if test $success1 = false; then break fi @@ -38,7 +38,7 @@ for TEST in $PIO_TESTS_8 do success2=false echo "running ${TEST}" - mpiexec -n 8 ./${TEST} && success2=true + @MPIEXEC@ -n 8 ./${TEST} && success2=true if test $success2 = false; then break fi From 2af2aeb4f903efa837806370a955691d5550a6d2 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 10:51:14 -0600 Subject: [PATCH 38/41] adding tests/cunit/run_tests.sh.in --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7e5e1711961..824a6a5041c 100644 --- a/configure.ac +++ b/configure.ac @@ -400,7 +400,7 @@ AM_CONDITIONAL(NETCDF_INTEGRATION, [test "x$enable_netcdf_integration" = xyes]) AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90]) # The user may have changed the MPIEXEC for these test scripts. -AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x h5_tests/cunit/run_tests.sh]) +AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x tests/cunit/run_tests.sh]) # Args: # 1. netcdf_meta.h variable From dc8275df57579e2d89a15de188cc8f2af137368d Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 10:56:03 -0600 Subject: [PATCH 39/41] converting more tests to use new --with-mpiexec option --- examples/c/Makefile.am | 4 +++- examples/c/{run_tests.sh => run_tests.sh.in} | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename examples/c/{run_tests.sh => run_tests.sh.in} (88%) diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am index 64398761f13..82d1889ed63 100644 --- a/examples/c/Makefile.am +++ b/examples/c/Makefile.am @@ -16,7 +16,9 @@ TESTS = run_tests.sh endif # RUN_TESTS # Distribute the test script. -EXTRA_DIST = run_tests.sh CMakeLists.txt example2.c +EXTRA_DIST = run_tests.sh.in CMakeLists.txt example2.c # Clean up files produced during testing. CLEANFILES = *.nc *.log *.clog2 *.slog2 + +DISTCLEANFILES = run_tests.sh diff --git a/examples/c/run_tests.sh b/examples/c/run_tests.sh.in similarity index 88% rename from examples/c/run_tests.sh rename to examples/c/run_tests.sh.in index 0d369bbb53d..1caefa7585d 100755 --- a/examples/c/run_tests.sh +++ b/examples/c/run_tests.sh.in @@ -19,7 +19,7 @@ for EXAMPLE in $PIO_EXAMPLES do success1=false echo "running ${EXAMPLE}" - mpiexec -n 4 ./${EXAMPLE} && success1=true + @MPIEXEC@ -n 4 ./${EXAMPLE} && success1=true if test $success1 = false; then break fi @@ -29,7 +29,7 @@ for EXAMPLE in $PIO_EXAMPLES_16 do success2=false echo "running ${EXAMPLE}" - mpiexec -n 16 ./${EXAMPLE} && success2=true + @MPIEXEC@ -n 16 ./${EXAMPLE} && success2=true if test $success2 = false; then break fi From c7fc47aac3eb90c9e6a37d019ff694b15eaab72a Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 10:58:29 -0600 Subject: [PATCH 40/41] converting more tests to use new --with-mpiexec option --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 824a6a5041c..63ed63e6309 100644 --- a/configure.ac +++ b/configure.ac @@ -401,6 +401,7 @@ AC_CONFIG_FILES([tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90]) # The user may have changed the MPIEXEC for these test scripts. AC_CONFIG_FILES([tests/cunit/run_tests.sh], [chmod ugo+x tests/cunit/run_tests.sh]) +AC_CONFIG_FILES([examples/c/run_tests.sh], [chmod ugo+x examples/c/run_tests.sh]) # Args: # 1. netcdf_meta.h variable From 0f2db9d11a632d83469439c089e6b52c31791739 Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Tue, 25 Aug 2020 11:00:57 -0600 Subject: [PATCH 41/41] converting more tests to use new --with-mpiexec option --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00816692f4e..6f1023cf9eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -442,3 +442,12 @@ configure_file ( "${PROJECT_SOURCE_DIR}/cmake_config.h.in" "${PROJECT_BINARY_DIR}/config.h" ) + +# Configure test scripts. +set(MPIEXEC mpiexec) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/tests/cunit/run_tests.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/tests/cunit/run_tests.sh @ONLY) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/examples/c/run_tests.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/examples/c/run_tests.sh @ONLY)