From d16d78518b88f5fc06a77c360f430de21ceb7600 Mon Sep 17 00:00:00 2001 From: Bouncner Date: Thu, 27 Feb 2025 21:08:53 +0100 Subject: [PATCH 1/4] Update haupt.yml --- .github/workflows/haupt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haupt.yml b/.github/workflows/haupt.yml index 86e8c31..a77acec 100644 --- a/.github/workflows/haupt.yml +++ b/.github/workflows/haupt.yml @@ -56,7 +56,7 @@ jobs: id: core_client_counts run: | core_count=`grep -Pc '^processor\t' /proc/cpuinfo` - client_count=$(python -c "import math; print(int(math.ceil(${core_count}*0.75)))") + client_count=1 comparison_runtime=$(python -c "print(min(1800, max(300, int(${{ env.SCALE_FACTOR }}*3500))))") echo "Using ${core_count} cores and ${client_count} clients, comparison benchmarks running for ${comparison_runtime} seconds." @@ -203,7 +203,7 @@ jobs: id: core_client_counts run: | core_count=`grep -Pc '^processor\t' /proc/cpuinfo` - client_count=$(python -c "import math; print(int(math.ceil(${core_count}*0.75)))") + client_count=1 comparison_runtime=$(python -c "print(min(1800, max(300, int(${{ env.SCALE_FACTOR }}*3500))))") echo "Using ${core_count} cores and ${client_count} clients, comparison benchmarks running for ${comparison_runtime} seconds." From 5916aeff5a625e4282c8b43ac1b01b6dce709bb9 Mon Sep 17 00:00:00 2001 From: Bouncner Date: Fri, 28 Feb 2025 21:37:32 +0100 Subject: [PATCH 2/4] Change runtime to 60s (single client uses ordered mode) --- .github/workflows/haupt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haupt.yml b/.github/workflows/haupt.yml index a77acec..003e6c6 100644 --- a/.github/workflows/haupt.yml +++ b/.github/workflows/haupt.yml @@ -57,7 +57,7 @@ jobs: run: | core_count=`grep -Pc '^processor\t' /proc/cpuinfo` client_count=1 - comparison_runtime=$(python -c "print(min(1800, max(300, int(${{ env.SCALE_FACTOR }}*3500))))") + comparison_runtime=60 echo "Using ${core_count} cores and ${client_count} clients, comparison benchmarks running for ${comparison_runtime} seconds." echo "CORE_COUNT=${core_count}" >> $GITHUB_ENV @@ -204,7 +204,7 @@ jobs: run: | core_count=`grep -Pc '^processor\t' /proc/cpuinfo` client_count=1 - comparison_runtime=$(python -c "print(min(1800, max(300, int(${{ env.SCALE_FACTOR }}*3500))))") + comparison_runtime=60 echo "Using ${core_count} cores and ${client_count} clients, comparison benchmarks running for ${comparison_runtime} seconds." echo "CORE_COUNT=${core_count}" >> $GITHUB_ENV From 812115de1443154f0dbf23c9c2ae565cb8663c1b Mon Sep 17 00:00:00 2001 From: Bouncner Date: Sat, 1 Mar 2025 10:29:17 +0100 Subject: [PATCH 3/4] Test scale factor of two --- .github/workflows/haupt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/haupt.yml b/.github/workflows/haupt.yml index 003e6c6..544c3ff 100644 --- a/.github/workflows/haupt.yml +++ b/.github/workflows/haupt.yml @@ -16,7 +16,7 @@ env: SKIP_HYRISE_MASTER: false SKIP_MONETDB: false SKIP_DUCKDB: false - SCALE_FACTOR: 1 + SCALE_FACTOR: 2 CMAKE_GENERATOR: Ninja jobs: From c327bf6c81e382bf5812c4f91b2b42ff24ad5c90 Mon Sep 17 00:00:00 2001 From: Bouncner Date: Sun, 2 Mar 2025 17:13:48 +0100 Subject: [PATCH 4/4] Use single-threaded mode for all databases --- .github/workflows/haupt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haupt.yml b/.github/workflows/haupt.yml index 544c3ff..9a33d77 100644 --- a/.github/workflows/haupt.yml +++ b/.github/workflows/haupt.yml @@ -55,7 +55,7 @@ jobs: - name: Determine core and client counts for database comparison id: core_client_counts run: | - core_count=`grep -Pc '^processor\t' /proc/cpuinfo` + core_count=1 client_count=1 comparison_runtime=60 echo "Using ${core_count} cores and ${client_count} clients, comparison benchmarks running for ${comparison_runtime} seconds." @@ -202,7 +202,7 @@ jobs: - name: Determine client and core counts for database comparison id: core_client_counts run: | - core_count=`grep -Pc '^processor\t' /proc/cpuinfo` + core_count=1 client_count=1 comparison_runtime=60 echo "Using ${core_count} cores and ${client_count} clients, comparison benchmarks running for ${comparison_runtime} seconds."