From 920674eb872846f0a35e9fffeb311473845de2af Mon Sep 17 00:00:00 2001
From: Ingo Wald <ingowald@gmail.com>
Date: Tue, 7 Jan 2025 09:18:47 -0700
Subject: [PATCH] CI setting cuda arch to all-major, because there migth be no
 'native' on ci machine

---
 .github/workflows/Ubuntu.yml |  2 +-
 measure.sh                   | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
index c039948..b26dc11 100644
--- a/.github/workflows/Ubuntu.yml
+++ b/.github/workflows/Ubuntu.yml
@@ -82,7 +82,7 @@ jobs:
 
     - name: Configure cmake
       id: configure
-      run: cmake . -B ${{ env.build_dir }} -DCMAKE_BUILD_TYPE=${{ env.config }}
+      run: cmake . -B ${{ env.build_dir }} -DCMAKE_BUILD_TYPE=${{ env.config }} -DCMAKE_CUDA_ARCHITECTURES=all-native
 
     - name: Configure Error Processing
       if: ${{ failure() && steps.configure.outcome == 'failure' }}
diff --git a/measure.sh b/measure.sh
index 5130619..931283a 100644
--- a/measure.sh
+++ b/measure.sh
@@ -1,15 +1,20 @@
 #!/bin/bash
 # script that measures fcp and knn perf for paper
 
-echo "results:" > fcp-and-knn-results.txt
+for method in cct cct-xd spatial-cct spatial-stackBased stackBased stackBased-xd stackFree stackFree-xd ; do
+    echo "results for method ${method}" | tee fcp-and-knn-results-${method}.txt
+done
+
 for f in 1000 10000 100000 1000000 10000000 100000000 1000000000; do
-    echo "##############" >> fcp-and-knn-results.txt
-    echo "### running for num data points = $f" >> fcp-and-knn-results.txt
-    echo "*** fcp, unlimited query" >> fcp-and-knn-results.txt
-    ./cukd_test_float4-fcp -nr 100 $f | grep queries >> fcp-and-knn-results.txt
-    echo "*** knn, unlimited query" >> fcp-and-knn-results.txt
-    ./cukd_test_float4-knn -nr 100 $f | grep queries >> fcp-and-knn-results.txt
-    echo "*** knn, max-range 0.01 query" >> fcp-and-knn-results.txt
-    ./cukd_test_float4-knn -nr 100 $f -r 0.01 | grep queries >> fcp-and-knn-results.txt
+    for method in cct cct-xd spatial-cct spatial-stackBased stackBased stackBased-xd stackFree stackFree-xd ; do
+	echo "##############" | tee -a fcp-and-knn-results-${method}.txt
+	echo "### running for num data points = $f"  | tee -a  fcp-and-knn-results-${method}.txt
+	echo "*** fcp, unlimited query"  | tee -a  fcp-and-knn-results.txt
+	./cukd_float4-fcp-${method} -nr 100 $f | grep queries  | tee -a  fcp-and-knn-results-${method}.txt
+	echo "*** knn, unlimited query"  | tee -a  fcp-and-knn-results.txt
+	./cukd_float4-knn-${method} -nr 100 $f | grep queries  | tee -a  fcp-and-knn-results-${method}.txt 
+	echo "*** knn, max-range 0.01 query"  | tee -a  fcp-and-knn-results.txt
+	./cukd_float4-knn-${method} -nr 100 $f -r 0.01 | grep queries  | tee -a  fcp-and-knn-results-${method}.txt
+    done
 done