From b731b6c2e288e751e8d0a8748563df9a318588f6 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Thu, 21 Apr 2022 08:59:05 -0700 Subject: [PATCH 1/4] [CI] Install HDF5 in GH Actions --- .github/workflows/cmake.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index fb70f56d..6d84c91b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -65,6 +65,9 @@ jobs: - name: Install MPICH run: sudo apt-get install mpich + + - name: Install HDF5 + run: sudo apt-get install libhdf5-dev hdf5-tools hdf5-helpers - name: Install NumPy run: sudo pip3 install numpy From ef389d559354cc9fb0e4f814a4b337b7d87e9390 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Thu, 21 Apr 2022 09:11:33 -0700 Subject: [PATCH 2/4] [CI] Point Subproject FetchContent to pulled revision --- tests/cmake/subproject/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cmake/subproject/CMakeLists.txt b/tests/cmake/subproject/CMakeLists.txt index 0a91afe2..e96db325 100644 --- a/tests/cmake/subproject/CMakeLists.txt +++ b/tests/cmake/subproject/CMakeLists.txt @@ -29,6 +29,7 @@ message( STATUS "Pulling GIT_REVISION = ${GIT_REVISION}" ) include( FetchContent ) +set( FETCHCONTENT_GAUXC_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ) FetchContent_Declare( gauxc GIT_REPOSITORY "${GITHUB_URL}/${GITHUB_REPOSITORY}" GIT_TAG ${GIT_REVISION} From e86b5781d147e781d8208558d447d0f6c4b805d9 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Thu, 21 Apr 2022 09:19:11 -0700 Subject: [PATCH 3/4] [CI] Fixup --- tests/cmake/subproject/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmake/subproject/CMakeLists.txt b/tests/cmake/subproject/CMakeLists.txt index e96db325..f39c607e 100644 --- a/tests/cmake/subproject/CMakeLists.txt +++ b/tests/cmake/subproject/CMakeLists.txt @@ -29,7 +29,7 @@ message( STATUS "Pulling GIT_REVISION = ${GIT_REVISION}" ) include( FetchContent ) -set( FETCHCONTENT_GAUXC_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ) +set( FETCHCONTENT_SOURCE_DIR_GAUXC ${CMAKE_CURRENT_LIST_DIR}/../../.. ) FetchContent_Declare( gauxc GIT_REPOSITORY "${GITHUB_URL}/${GITHUB_REPOSITORY}" GIT_TAG ${GIT_REVISION} From 56788aec03df701dc266a94bfe9b6239892a8c68 Mon Sep 17 00:00:00 2001 From: David Williams-Young Date: Thu, 21 Apr 2022 09:34:23 -0700 Subject: [PATCH 4/4] [CI] Only check subproject / discovery for Release builds --- .github/workflows/cmake.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 6d84c91b..4fdd8323 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -94,6 +94,7 @@ jobs: run: cmake --build ${{runner.workspace}}/build --target install - name: CMake Subproject Configure + if: ${{ matrix.build_type == 'Release' }} shell: bash run: cmake -H$GITHUB_WORKSPACE/tests/cmake/subproject -B${{runner.workspace}}/cmake_subproject_build @@ -102,11 +103,13 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/${GH_ACTIONS_TOOLCHAIN} - name: CMake Subproject Build + if: ${{ matrix.build_type == 'Release' }} shell: bash run: cmake --build ${{runner.workspace}}/cmake_subproject_build -j2 - name: CMake Discovery Configure + if: ${{ matrix.build_type == 'Release' }} shell: bash run: cmake -H$GITHUB_WORKSPACE/tests/cmake/discovery -B${{runner.workspace}}/cmake_discovery_build @@ -114,5 +117,6 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=${GITHUB_WORKSPACE}/${GH_ACTIONS_TOOLCHAIN} - name: CMake Discovery Build + if: ${{ matrix.build_type == 'Release' }} shell: bash run: cmake --build ${{runner.workspace}}/cmake_discovery_build -j2