Moved files around a bit; created a utilities subfolder

23 files changed, 21 insertions, 32 deletions

diff --git a/src/cache.hpp b/src/cache.hpp
index f2b44edf..9ecb0f1e 100644
--- a/src/cache.hpp
+++ b/src/cache.hpp
@@ -18,7 +18,7 @@
 #include <vector>
 #include <mutex>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/clblast.pc.in b/src/clblast.pc.in
deleted file mode 100644
index 2538add8..00000000
--- a/src/clblast.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-includedir=${prefix}/include
-libdir=${exec_prefix}/lib
-
-Name: CLBlast
-Description: CLBlast is a modern, lightweight, performant and tunable OpenCL BLAS library written in C++11
-Version: @clblast_VERSION_MAJOR@.@clblast_VERSION_MINOR@.@clblast_VERSION_PATCH@
-Libs: -L${libdir} -lclblast
-Cflags: -I${includedir}
diff --git a/src/clblast_c.cpp b/src/clblast_c.cpp
index 0174fd19..a12f737c 100644
--- a/src/clblast_c.cpp
+++ b/src/clblast_c.cpp
@@ -15,7 +15,7 @@
 
 #include "clblast_c.h"
 #include "clblast.h"
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 9b8537c2..cf548d46 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 
 #include "database/database.hpp"
 #include "database/kernels/xaxpy.hpp"
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 8a3e7040..7c05a20b 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -21,7 +21,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/routine.hpp b/src/routine.hpp
index f4ad435e..2d8b2415 100644
--- a/src/routine.hpp
+++ b/src/routine.hpp
@@ -19,9 +19,9 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "cache.hpp"
-#include "buffer_test.hpp"
+#include "utilities/buffer_test.hpp"
 #include "database/database.hpp"
 #include "routines/common.hpp"
 
diff --git a/src/tuning/kernels/copy_fast.cpp b/src/tuning/kernels/copy_fast.cpp
index c57aab39..1651d299 100644
--- a/src/tuning/kernels/copy_fast.cpp
+++ b/src/tuning/kernels/copy_fast.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/copy_pad.cpp b/src/tuning/kernels/copy_pad.cpp
index 9486ee8d..5be58369 100644
--- a/src/tuning/kernels/copy_pad.cpp
+++ b/src/tuning/kernels/copy_pad.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/transpose_fast.cpp b/src/tuning/kernels/transpose_fast.cpp
index 2d9d5e49..01d9b46a 100644
--- a/src/tuning/kernels/transpose_fast.cpp
+++ b/src/tuning/kernels/transpose_fast.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/transpose_pad.cpp b/src/tuning/kernels/transpose_pad.cpp
index d364dabe..4e830faa 100644
--- a/src/tuning/kernels/transpose_pad.cpp
+++ b/src/tuning/kernels/transpose_pad.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/xaxpy.cpp b/src/tuning/kernels/xaxpy.cpp
index 403ee9e4..44538b4b 100644
--- a/src/tuning/kernels/xaxpy.cpp
+++ b/src/tuning/kernels/xaxpy.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/xdot.cpp b/src/tuning/kernels/xdot.cpp
index f8416761..2ba7d91d 100644
--- a/src/tuning/kernels/xdot.cpp
+++ b/src/tuning/kernels/xdot.cpp
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/xgemm.cpp b/src/tuning/kernels/xgemm.cpp
index 0eb1875b..dc9040b0 100644
--- a/src/tuning/kernels/xgemm.cpp
+++ b/src/tuning/kernels/xgemm.cpp
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/xgemm_direct.cpp b/src/tuning/kernels/xgemm_direct.cpp
index 204e0be4..b1d5fbc4 100644
--- a/src/tuning/kernels/xgemm_direct.cpp
+++ b/src/tuning/kernels/xgemm_direct.cpp
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/xgemv.cpp b/src/tuning/kernels/xgemv.cpp
index f332f52a..1ae641a7 100644
--- a/src/tuning/kernels/xgemv.cpp
+++ b/src/tuning/kernels/xgemv.cpp
@@ -17,7 +17,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/kernels/xger.cpp b/src/tuning/kernels/xger.cpp
index c3d0c7dd..8a3ede98 100644
--- a/src/tuning/kernels/xger.cpp
+++ b/src/tuning/kernels/xger.cpp
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 #include "tuning/tuning.hpp"
 
 namespace clblast {
diff --git a/src/tuning/tuning.hpp b/src/tuning/tuning.hpp
index afb092bc..c4ee0da0 100644
--- a/src/tuning/tuning.hpp
+++ b/src/tuning/tuning.hpp
@@ -20,7 +20,7 @@
 
 #include <cltune.h>
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 
 namespace clblast {
 // =================================================================================================
diff --git a/src/buffer_test.hpp b/src/utilities/buffer_test.hpp
index 9a23e0b7..9a23e0b7 100644
--- a/src/buffer_test.hpp
+++ b/src/utilities/buffer_test.hpp
diff --git a/src/clblast_exceptions.cpp b/src/utilities/clblast_exceptions.cpp
index 68d31e46..96f10860 100644
--- a/src/clblast_exceptions.cpp
+++ b/src/utilities/clblast_exceptions.cpp
@@ -13,7 +13,7 @@
 //
 // =================================================================================================
 
-#include "clblast_exceptions.hpp"
+#include "utilities/clblast_exceptions.hpp"
 
 namespace {
 // =================================================================================================
diff --git a/src/clblast_exceptions.hpp b/src/utilities/clblast_exceptions.hpp
index 89f5e761..89f5e761 100644
--- a/src/clblast_exceptions.hpp
+++ b/src/utilities/clblast_exceptions.hpp
diff --git a/src/msvc.hpp b/src/utilities/msvc.hpp
index a45105df..a45105df 100644
--- a/src/msvc.hpp
+++ b/src/utilities/msvc.hpp
diff --git a/src/utilities.cpp b/src/utilities/utilities.cpp
index 86cc2d13..b4a18311 100644
--- a/src/utilities.cpp
+++ b/src/utilities/utilities.cpp
@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "utilities.hpp"
+#include "utilities/utilities.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/utilities.hpp b/src/utilities/utilities.hpp
index a7fcbd25..9bc7401a 100644
--- a/src/utilities.hpp
+++ b/src/utilities/utilities.hpp
@@ -24,9 +24,8 @@
 #include "clblast.h"
 #include "clblast_half.h"
 #include "clpp11.hpp"
-#include "clblast_exceptions.hpp"
-
-#include "msvc.hpp"
+#include "utilities/clblast_exceptions.hpp"
+#include "utilities/msvc.hpp"
 
 namespace clblast {
 // =================================================================================================