From 47954c61f65279b3fdd4a0b58525f144ae08552f Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Tue, 11 Jun 2024 15:10:37 -0400 Subject: [PATCH 1/2] Disable tests by default --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cfc3435..56e636f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 3.12) project(KokkosComm VERSION 0.0.2) -option(KokkosComm_ENABLE_PERFTESTS "Build KokkosComm perf tests" ON) -option(KokkosComm_ENABLE_TESTS "Build KokkosComm perf tests" ON) +option(KokkosComm_ENABLE_PERFTESTS "Build KokkosComm perf tests" OFF) +option(KokkosComm_ENABLE_TESTS "Build KokkosComm perf tests" OFF) ## resolve options From 453503a4f9adb54ac8238e046191769d9ea1175e Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Tue, 11 Jun 2024 15:15:44 -0400 Subject: [PATCH 2/2] Update GitHub workflows --- .github/workflows/linux-install.yaml | 6 +++--- .github/workflows/linux.yaml | 8 ++++---- .github/workflows/osx.yaml | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/linux-install.yaml b/.github/workflows/linux-install.yaml index a2e63cb1..05e85cb2 100644 --- a/.github/workflows/linux-install.yaml +++ b/.github/workflows/linux-install.yaml @@ -6,7 +6,7 @@ on: - README.md - 'docs/**' types: [ opened, reopened, synchronize ] - + jobs: Kokkos-master-OpenMPI: env: @@ -39,7 +39,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Configure KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DKokkosComm_ENABLE_TESTS=OFF -DKokkosComm_ENABLE_PERFTESTS=OFF -DCMAKE_INSTALL_PREFIX="$COMM_INSTALL" + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="$COMM_INSTALL" - name: Build and Install KokkosComm run: | VERBOSE=1 cmake --build "$COMM_BUILD" --target install @@ -63,4 +63,4 @@ jobs: VERBOSE=1 cmake --build "$COMM_PERF_TESTS_BUILD" - name: Run KokkosComm Perf Tests against Install run: | - ctest -V --test-dir "$COMM_PERF_TESTS_BUILD" \ No newline at end of file + ctest -V --test-dir "$COMM_PERF_TESTS_BUILD" diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 1f52189a..2b2a1f99 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -6,7 +6,7 @@ on: - README.md - 'docs/**' types: [ opened, reopened, synchronize ] - + jobs: Kokkos-040200-OpenMPI-OpenMP-Release: env: @@ -44,7 +44,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release -DKokkosComm_ENABLE_TESTS=ON -DKokkosComm_ENABLE_PERFTESTS=ON VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | @@ -76,8 +76,8 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug -DKokkosComm_ENABLE_TESTS=ON -DKokkosComm_ENABLE_PERFTESTS=ON VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | - ctest -V --test-dir "$COMM_BUILD" + ctest -V --test-dir "$COMM_BUILD" diff --git a/.github/workflows/osx.yaml b/.github/workflows/osx.yaml index 65cdd94e..61927985 100644 --- a/.github/workflows/osx.yaml +++ b/.github/workflows/osx.yaml @@ -6,7 +6,7 @@ on: - README.md - 'docs/**' types: [ opened, reopened, synchronize ] - + jobs: Kokkos-040200-OpenMPI-Threads-Debug: env: @@ -38,7 +38,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug -DKokkosComm_ENABLE_TESTS=ON -DKokkosComm_ENABLE_PERFTESTS=ON VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | @@ -70,8 +70,8 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release -DKokkosComm_ENABLE_TESTS=ON -DKokkosComm_ENABLE_PERFTESTS=ON VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | - ctest -V --test-dir "$COMM_BUILD" + ctest -V --test-dir "$COMM_BUILD"