From 66583b3cdac143bd43da1ee6f0f5af012b8ca39a Mon Sep 17 00:00:00 2001
From: Cedric Nugteren <web@cedricnugteren.nl>
Date: Sat, 19 May 2018 12:48:59 +0200
Subject: The GEMM routine tuner now loads kernel JSON tuning results from disk
 if available; now run part of alltuners target

---
 CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0715b866..7f3d258a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,6 +388,7 @@ if(TUNERS)
       src/utilities/clblast_exceptions.cpp
       src/utilities/timing.cpp
       src/utilities/utilities.cpp
+      test/test_utilities.cpp
       src/tuning/configurations.cpp
       src/tuning/tuning.cpp
       src/kernel_preprocessor.cpp)
@@ -396,6 +397,7 @@ if(TUNERS)
       src/utilities/clblast_exceptions.hpp
       src/utilities/timing.hpp
       src/utilities/utilities.hpp
+      test/test_utilities.hpp
       src/tuning/configurations.hpp
       src/tuning/tuning.hpp
       src/tuning/routines/routine_tuner.hpp
@@ -439,6 +441,12 @@ if(TUNERS)
     endforeach()
     set(ALLTUNERSDEPENDS clblast_tuner_${KERNEL})
   endforeach()
+  foreach(ROUTINE_TUNER ${ROUTINE_TUNERS})
+    foreach(PRECISION ${PRECISIONS})
+      set(ALLTUNERS ${ALLTUNERS} COMMAND clblast_tuner_routine_${ROUTINE_TUNER} -precision ${PRECISION})
+    endforeach()
+    set(ALLTUNERSDEPENDS clblast_tuner_routine_${ROUTINE_TUNER})
+  endforeach()
   add_custom_target(alltuners ${ALLTUNERS} DEPENDS ${ALLTUNERSDEPENDS})
 
 endif()
-- 
cgit v1.2.3


From 76e0079a90d02cd0f371d4f25d37f6817cdada8a Mon Sep 17 00:00:00 2001
From: Cedric Nugteren <web@cedricnugteren.nl>
Date: Sat, 19 May 2018 14:18:23 +0200
Subject: Fixed compilation issues

---
 CMakeLists.txt                | 6 ++----
 src/tuning/routines/xgemm.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f3d258a..ea306bc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,7 +388,6 @@ if(TUNERS)
       src/utilities/clblast_exceptions.cpp
       src/utilities/timing.cpp
       src/utilities/utilities.cpp
-      test/test_utilities.cpp
       src/tuning/configurations.cpp
       src/tuning/tuning.cpp
       src/kernel_preprocessor.cpp)
@@ -397,7 +396,6 @@ if(TUNERS)
       src/utilities/clblast_exceptions.hpp
       src/utilities/timing.hpp
       src/utilities/utilities.hpp
-      test/test_utilities.hpp
       src/tuning/configurations.hpp
       src/tuning/tuning.hpp
       src/tuning/routines/routine_tuner.hpp
@@ -426,9 +424,9 @@ if(TUNERS)
     install(TARGETS clblast_tuner_${KERNEL} DESTINATION bin)
   endforeach()
   foreach(ROUTINE_TUNER ${ROUTINE_TUNERS})
-    add_executable(clblast_tuner_routine_${ROUTINE_TUNER} ${TUNERS_COMMON} src/tuning/routines/${ROUTINE_TUNER}.cpp)
+    add_executable(clblast_tuner_routine_${ROUTINE_TUNER} ${TUNERS_COMMON} src/tuning/routines/${ROUTINE_TUNER}.cpp test/test_utilities.cpp)
     target_link_libraries(clblast_tuner_routine_${ROUTINE_TUNER} clblast)
-    target_include_directories(clblast_tuner_routine_${ROUTINE_TUNER} PUBLIC $<TARGET_PROPERTY:clblast,INTERFACE_INCLUDE_DIRECTORIES> ${API_INCLUDE_DIRS})
+    target_include_directories(clblast_tuner_routine_${ROUTINE_TUNER} PUBLIC $<TARGET_PROPERTY:clblast,INTERFACE_INCLUDE_DIRECTORIES> ${API_INCLUDE_DIRS} ${clblast_SOURCE_DIR})
     install(TARGETS clblast_tuner_routine_${ROUTINE_TUNER} DESTINATION bin)
   endforeach()
 
diff --git a/src/tuning/routines/xgemm.cpp b/src/tuning/routines/xgemm.cpp
index ceb91f4d..92aab611 100644
--- a/src/tuning/routines/xgemm.cpp
+++ b/src/tuning/routines/xgemm.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 
 #include "utilities/utilities.hpp"
-#include "../test/test_utilities.hpp"
+#include "test/test_utilities.hpp"
 #include "tuning/routines/routine_tuner.hpp"
 
 namespace clblast {
-- 
cgit v1.2.3