From 34a15d06ab6791cb2648f37e582fc7b8ac0dcf19 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Fri, 12 Jan 2024 09:05:51 +0100 Subject: [PATCH] Don't explicitly enable unity builds in CI configurations since it's already the default --- .github/workflows/linux_coverage.yml | 1 - .github/workflows/linux_debug.yml | 1 - .github/workflows/linux_hip.yml | 1 - .github/workflows/linux_leaksanitizer.yml | 1 - .github/workflows/linux_release_fetchcontent.yml | 1 - .github/workflows/linux_sanitizers.yml | 1 - .github/workflows/linux_tracy.yml | 1 - .github/workflows/linux_valgrind.yml | 1 - .github/workflows/macos_debug.yml | 1 - .gitlab/includes/clang12_pipeline.yml | 2 +- .jenkins/cscs/env-clang-12.sh | 1 - 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/linux_coverage.yml b/.github/workflows/linux_coverage.yml index 6efc51ffcd..939ae64651 100644 --- a/.github/workflows/linux_coverage.yml +++ b/.github/workflows/linux_coverage.yml @@ -36,7 +36,6 @@ jobs: -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_CXX_FLAGS="--coverage" \ -DCMAKE_EXE_LINKER_FLAGS="--coverage" \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=ON \ diff --git a/.github/workflows/linux_debug.yml b/.github/workflows/linux_debug.yml index 77953ad5e7..5e440c479b 100644 --- a/.github/workflows/linux_debug.yml +++ b/.github/workflows/linux_debug.yml @@ -41,7 +41,6 @@ jobs: -GNinja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=ON \ diff --git a/.github/workflows/linux_hip.yml b/.github/workflows/linux_hip.yml index 2696488576..806000b58b 100644 --- a/.github/workflows/linux_hip.yml +++ b/.github/workflows/linux_hip.yml @@ -41,7 +41,6 @@ jobs: -GNinja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_HIP=ON \ -DPIKA_WITH_EXAMPLES=ON \ diff --git a/.github/workflows/linux_leaksanitizer.yml b/.github/workflows/linux_leaksanitizer.yml index e295760f73..59ddaca95b 100644 --- a/.github/workflows/linux_leaksanitizer.yml +++ b/.github/workflows/linux_leaksanitizer.yml @@ -41,7 +41,6 @@ jobs: -GNinja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=ON \ diff --git a/.github/workflows/linux_release_fetchcontent.yml b/.github/workflows/linux_release_fetchcontent.yml index c98bf1e090..00a5cc22eb 100644 --- a/.github/workflows/linux_release_fetchcontent.yml +++ b/.github/workflows/linux_release_fetchcontent.yml @@ -44,7 +44,6 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DPIKA_REPOSITORY="file:////$(pwd)" \ -DPIKA_TAG="$GITHUB_SHA" \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=OFF \ diff --git a/.github/workflows/linux_sanitizers.yml b/.github/workflows/linux_sanitizers.yml index bf2ce00d94..70a631455d 100644 --- a/.github/workflows/linux_sanitizers.yml +++ b/.github/workflows/linux_sanitizers.yml @@ -42,7 +42,6 @@ jobs: -GNinja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=ON \ diff --git a/.github/workflows/linux_tracy.yml b/.github/workflows/linux_tracy.yml index a5eecfa2b3..0ee07bb0de 100644 --- a/.github/workflows/linux_tracy.yml +++ b/.github/workflows/linux_tracy.yml @@ -71,7 +71,6 @@ jobs: -GNinja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_TRACY=ON \ -DPIKA_WITH_EXAMPLES=ON \ diff --git a/.github/workflows/linux_valgrind.yml b/.github/workflows/linux_valgrind.yml index c03f45be00..4ed802d491 100644 --- a/.github/workflows/linux_valgrind.yml +++ b/.github/workflows/linux_valgrind.yml @@ -47,7 +47,6 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \ -DCMAKE_CXX_FLAGS="-gdwarf-4" \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_MALLOC=system \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=ON \ diff --git a/.github/workflows/macos_debug.yml b/.github/workflows/macos_debug.yml index b8264bedba..6fc9d252ec 100644 --- a/.github/workflows/macos_debug.yml +++ b/.github/workflows/macos_debug.yml @@ -51,7 +51,6 @@ jobs: -GNinja \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_BUILD_TYPE=Debug \ - -DPIKA_WITH_UNITY_BUILD=ON \ -DPIKA_WITH_EXAMPLES=ON \ -DPIKA_WITH_TESTS=ON \ -DPIKA_WITH_TESTS_HEADERS=OFF \ diff --git a/.gitlab/includes/clang12_pipeline.yml b/.gitlab/includes/clang12_pipeline.yml index 02e0bd79c9..c81e52b954 100644 --- a/.gitlab/includes/clang12_pipeline.yml +++ b/.gitlab/includes/clang12_pipeline.yml @@ -18,7 +18,7 @@ include: ^hwloc@2.2.0" CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPIKA_WITH_CXX_STANDARD=$CXXSTD \ -DPIKA_WITH_MALLOC=system -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \ - -DPIKA_WITH_UNITY_BUILD=ON -DPIKA_WITH_COROUTINE_COUNTERS=ON \ + -DPIKA_WITH_COROUTINE_COUNTERS=ON \ -DPIKA_WITH_THREAD_IDLE_RATES=ON \ -DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON \ -DPIKA_WITH_THREAD_CUMULATIVE_COUNTS=ON -DPIKA_WITH_THREAD_QUEUE_WAITTIME=ON \ diff --git a/.jenkins/cscs/env-clang-12.sh b/.jenkins/cscs/env-clang-12.sh index 3fa2e1fb07..da40080594 100644 --- a/.jenkins/cscs/env-clang-12.sh +++ b/.jenkins/cscs/env-clang-12.sh @@ -16,7 +16,6 @@ spack_spec="pika@main arch=${spack_arch} %${spack_compiler} malloc=system cxxstd configure_extra_options+=" -DPIKA_WITH_CXX_STANDARD=${cxx_std}" configure_extra_options+=" -DPIKA_WITH_MALLOC=system" configure_extra_options+=" -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON" -configure_extra_options+=" -DPIKA_WITH_UNITY_BUILD=ON" configure_extra_options+=" -DPIKA_WITH_COROUTINE_COUNTERS=ON" configure_extra_options+=" -DPIKA_WITH_THREAD_IDLE_RATES=ON" configure_extra_options+=" -DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON"