From 8afe3d6a22efedc152d0eeb0d22ff4c0f8d7e250 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Sun, 9 Jun 2024 17:10:40 -0400 Subject: [PATCH] run devsamp examples with 2 ranks each --- .github/workflows/cmake.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5ddd91ead..8a1d151e6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -45,7 +45,9 @@ jobs: - name: Install prerequisite MacOS packages if: ${{ matrix.os == 'macos-latest' }} - run: brew install ninja boost eigen open-mpi bison ccache + run: | + brew install ninja boost eigen open-mpi bison ccache + echo "MPIEXEC=/opt/homebrew/bin/mpiexec" >> $GITHUB_ENV - name: Install prerequisites Ubuntu packages if: ${{ matrix.os == 'ubuntu-22.04' }} @@ -54,6 +56,7 @@ jobs: sudo apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" sudo apt-get update sudo apt-get -y install ninja-build g++-12 liblapack-dev libboost-dev libboost-serialization-dev libboost-random-dev libeigen3-dev openmpi-bin libopenmpi-dev libtbb-dev ccache flex bison cmake doxygen + echo "MPIEXEC=/usr/bin/mpiexec" >> $GITHUB_ENV - name: Create Build Environment # Some projects don't allow in-source building, so create a separate build directory @@ -112,11 +115,11 @@ jobs: run: | cmake -S $GITHUB_WORKSPACE/doc/dox/dev/devsamp/helloworld -B test_install_devsamp_helloworld -DCMAKE_PREFIX_PATH=${{github.workspace}}/install || (cat test_install_devsamp_helloworld/CMakeFiles/CMakeOutput.log && cat test_install_devsamp_helloworld/CMakeFiles/CMakeError.log) cmake --build test_install_devsamp_helloworld - test_install_devsamp_helloworld/helloworld-parsec - test_install_devsamp_helloworld/helloworld-mad + $MPIEXEC -n 2 test_install_devsamp_helloworld/helloworld-parsec + $MPIEXEC -n 2 test_install_devsamp_helloworld/helloworld-mad cmake -S $GITHUB_WORKSPACE/doc/dox/dev/devsamp/fibonacci -B test_install_devsamp_fibonacci -DCMAKE_PREFIX_PATH=${{github.workspace}}/install || (cat test_install_devsamp_fibonacci/CMakeFiles/CMakeOutput.log && cat test_install_devsamp_fibonacci/CMakeFiles/CMakeError.log) cmake --build test_install_devsamp_fibonacci - test_install_devsamp_fibonacci/fibonacci-parsec + $MPIEXEC -n 2 test_install_devsamp_fibonacci/fibonacci-parsec cmake -E make_directory test_install_userexamples cat > test_install_userexamples/CMakeLists.txt <