Moved all headers into the source tree, changed headers to .hpp extension

CMakeLists.txt

@@ -121,7 +121,7 @@ endif()
 # ==================================================================================================
 
 # Includes directories: CLBlast and OpenCL
-include_directories(${clblast_SOURCE_DIR}/include ${OPENCL_INCLUDE_DIRS})
+include_directories(${clblast_SOURCE_DIR}/include ${clblast_SOURCE_DIR}/src ${OPENCL_INCLUDE_DIRS})
 
 # ==================================================================================================
 
@@ -140,8 +140,15 @@ set(PRECISIONS 32 64 3232 6464)
 # ==================================================================================================
 
 # Gathers all source-files
-set(SOURCES src/clblast.cc src/database.cc src/routine.cc src/cache.cc
-            src/utilities.cc src/clblast_c.cc src/routines/common.cc)
+set(SOURCES
+  src/database/database.cc
+  src/routines/common.cc
+  src/cache.cc
+  src/clblast.cc
+  src/clblast_c.cc
+  src/routine.cc
+  src/utilities.cc
+)
 foreach(ROUTINE ${LEVEL1_ROUTINES})
   set(SOURCES ${SOURCES} src/routines/level1/${ROUTINE}.cc)
 endforeach()
@@ -211,7 +218,7 @@ if(TUNERS)
 
   # Adds tuning executables
   foreach(KERNEL ${KERNELS})
-    add_executable(clblast_tuner_${KERNEL} src/tuning/${KERNEL}.cc)
+    add_executable(clblast_tuner_${KERNEL} src/tuning/kernels/${KERNEL}.cc)
     target_link_libraries(clblast_tuner_${KERNEL} clblast ${CLTUNE_LIBRARIES} ${OPENCL_LIBRARIES})
     install(TARGETS clblast_tuner_${KERNEL} DESTINATION bin)
   endforeach()
@@ -257,7 +264,7 @@ if(CLIENTS OR TESTS)
   endif()
 
   # Sets the include directories
-  include_directories(${clblast_SOURCE_DIR}/test ${REF_INCLUDES})
+  include_directories(${clblast_SOURCE_DIR} ${REF_INCLUDES})
 
 endif()
 

scripts/database/database.py

@@ -310,7 +310,7 @@ defaults = CalculateDefaults(bests)
 bests = ConcatenateData(bests, defaults)
 
 # Outputs the data as a C++ database
-path_cpp_database = os.path.join(path_clblast, "include", "internal", "database")
+path_cpp_database = os.path.join(path_clblast, "src", "database", "kernels")
 print("## Producing a C++ database in '"+path_cpp_database+"'...")
 PrintData(bests, path_cpp_database)
 

scripts/generator/generator.py

@@ -382,8 +382,8 @@ files = [
   path_clblast+"/src/clblast.cc",
   path_clblast+"/include/clblast_c.h",
   path_clblast+"/src/clblast_c.cc",
-  path_clblast+"/test/wrapper_clblas.h",
-  path_clblast+"/test/wrapper_cblas.h",
+  path_clblast+"/test/wrapper_clblas.hpp",
+  path_clblast+"/test/wrapper_cblas.hpp",
 ]
 header_lines = [84, 74, 93, 22, 29, 41]
 footer_lines = [17, 75, 19, 14, 6, 6]
@@ -436,8 +436,8 @@ for level in [1,2,3,4]:
 			filename = path_clblast+"/test/correctness/routines/level"+levelnames[level-1]+"/x"+routine.name+".cc"
 			with open(filename, "w") as f:
 				body = ""
-				body += "#include \"correctness/testblas.h\"\n"
-				body += "#include \"routines/level"+levelnames[level-1]+"/x"+routine.name+".h\"\n\n"
+				body += "#include \"test/correctness/testblas.hpp\"\n"
+				body += "#include \"test/routines/level"+levelnames[level-1]+"/x"+routine.name+".hpp\"\n\n"
 				body += "// Shortcuts to the clblast namespace\n"
 				body += "using float2 = clblast::float2;\n"
 				body += "using double2 = clblast::double2;\n\n"
@@ -462,8 +462,8 @@ for level in [1,2,3,4]:
 			filename = path_clblast+"/test/performance/routines/level"+levelnames[level-1]+"/x"+routine.name+".cc"
 			with open(filename, "w") as f:
 				body = ""
-				body += "#include \"performance/client.h\"\n"
-				body += "#include \"routines/level"+levelnames[level-1]+"/x"+routine.name+".h\"\n\n"
+				body += "#include \"test/performance/client.hpp\"\n"
+				body += "#include \"test/routines/level"+levelnames[level-1]+"/x"+routine.name+".hpp\"\n\n"
 				body += "// Shortcuts to the clblast namespace\n"
 				body += "using float2 = clblast::float2;\n"
 				body += "using double2 = clblast::double2;\n\n"

src/cache.cc

@@ -15,7 +15,7 @@
 #include <vector>
 #include <mutex>
 
-#include "internal/cache.h"
+#include "cache.hpp"
 
 namespace clblast {
 // =================================================================================================

src/cache.hpp

@@ -18,7 +18,7 @@
 #include <vector>
 #include <mutex>
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================

src/clblast.cc

@@ -16,60 +16,60 @@
 #include <string>
 
 #include "clblast.h"
-#include "internal/public_api.h"
-#include "internal/cache.h"
+#include "public_api.hpp"
+#include "cache.hpp"
 
 // BLAS level-1 includes
-#include "internal/routines/level1/xswap.h"
-#include "internal/routines/level1/xscal.h"
-#include "internal/routines/level1/xcopy.h"
-#include "internal/routines/level1/xaxpy.h"
-#include "internal/routines/level1/xdot.h"
-#include "internal/routines/level1/xdotu.h"
-#include "internal/routines/level1/xdotc.h"
-#include "internal/routines/level1/xnrm2.h"
-#include "internal/routines/level1/xasum.h"
-#include "internal/routines/level1/xsum.h" // non-BLAS routine
-#include "internal/routines/level1/xamax.h"
-#include "internal/routines/level1/xmax.h" // non-BLAS routine
-#include "internal/routines/level1/xmin.h" // non-BLAS routine
+#include "routines/level1/xswap.hpp"
+#include "routines/level1/xscal.hpp"
+#include "routines/level1/xcopy.hpp"
+#include "routines/level1/xaxpy.hpp"
+#include "routines/level1/xdot.hpp"
+#include "routines/level1/xdotu.hpp"
+#include "routines/level1/xdotc.hpp"
+#include "routines/level1/xnrm2.hpp"
+#include "routines/level1/xasum.hpp"
+#include "routines/level1/xsum.hpp" // non-BLAS routine
+#include "routines/level1/xamax.hpp"
+#include "routines/level1/xmax.hpp" // non-BLAS routine
+#include "routines/level1/xmin.hpp" // non-BLAS routine
 
 // BLAS level-2 includes
-#include "internal/routines/level2/xgemv.h"
-#include "internal/routines/level2/xgbmv.h"
-#include "internal/routines/level2/xhemv.h"
-#include "internal/routines/level2/xhbmv.h"
-#include "internal/routines/level2/xhpmv.h"
-#include "internal/routines/level2/xsymv.h"
-#include "internal/routines/level2/xsbmv.h"
-#include "internal/routines/level2/xspmv.h"
-#include "internal/routines/level2/xtrmv.h"
-#include "internal/routines/level2/xtbmv.h"
-#include "internal/routines/level2/xtpmv.h"
-#include "internal/routines/level2/xger.h"
-#include "internal/routines/level2/xgeru.h"
-#include "internal/routines/level2/xgerc.h"
-#include "internal/routines/level2/xher.h"
-#include "internal/routines/level2/xhpr.h"
-#include "internal/routines/level2/xher2.h"
-#include "internal/routines/level2/xhpr2.h"
-#include "internal/routines/level2/xsyr.h"
-#include "internal/routines/level2/xspr.h"
-#include "internal/routines/level2/xsyr2.h"
-#include "internal/routines/level2/xspr2.h"
+#include "routines/level2/xgemv.hpp"
+#include "routines/level2/xgbmv.hpp"
+#include "routines/level2/xhemv.hpp"
+#include "routines/level2/xhbmv.hpp"
+#include "routines/level2/xhpmv.hpp"
+#include "routines/level2/xsymv.hpp"
+#include "routines/level2/xsbmv.hpp"
+#include "routines/level2/xspmv.hpp"
+#include "routines/level2/xtrmv.hpp"
+#include "routines/level2/xtbmv.hpp"
+#include "routines/level2/xtpmv.hpp"
+#include "routines/level2/xger.hpp"
+#include "routines/level2/xgeru.hpp"
+#include "routines/level2/xgerc.hpp"
+#include "routines/level2/xher.hpp"
+#include "routines/level2/xhpr.hpp"
+#include "routines/level2/xher2.hpp"
+#include "routines/level2/xhpr2.hpp"
+#include "routines/level2/xsyr.hpp"
+#include "routines/level2/xspr.hpp"
+#include "routines/level2/xsyr2.hpp"
+#include "routines/level2/xspr2.hpp"
 
 // BLAS level-3 includes
-#include "internal/routines/level3/xgemm.h"
-#include "internal/routines/level3/xsymm.h"
-#include "internal/routines/level3/xhemm.h"
-#include "internal/routines/level3/xsyrk.h"
-#include "internal/routines/level3/xherk.h"
-#include "internal/routines/level3/xsyr2k.h"
-#include "internal/routines/level3/xher2k.h"
-#include "internal/routines/level3/xtrmm.h"
+#include "routines/level3/xgemm.hpp"
+#include "routines/level3/xsymm.hpp"
+#include "routines/level3/xhemm.hpp"
+#include "routines/level3/xsyrk.hpp"
+#include "routines/level3/xherk.hpp"
+#include "routines/level3/xsyr2k.hpp"
+#include "routines/level3/xher2k.hpp"
+#include "routines/level3/xtrmm.hpp"
 
 // Level-x includes (non-BLAS)
-#include "internal/routines/levelx/xomatcopy.h"
+#include "routines/levelx/xomatcopy.hpp"
 
 namespace clblast {
 

src/clblast_c.cc

@@ -15,7 +15,7 @@
 
 #include "clblast_c.h"
 #include "clblast.h"
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 // Shortcuts to the clblast namespace
 using float2 = clblast::float2;

src/database/database.cc

@@ -11,18 +11,18 @@
 //
 // =================================================================================================
 
-#include "internal/database.h"
-#include "internal/database/xaxpy.h"
-#include "internal/database/xdot.h"
-#include "internal/database/xgemv.h"
-#include "internal/database/xger.h"
-#include "internal/database/xgemm.h"
-#include "internal/database/copy.h"
-#include "internal/database/pad.h"
-#include "internal/database/transpose.h"
-#include "internal/database/padtranspose.h"
+#include "utilities.hpp"
 
-#include "internal/utilities.h"
+#include "database/database.hpp"
+#include "database/kernels/xaxpy.hpp"
+#include "database/kernels/xdot.hpp"
+#include "database/kernels/xgemv.hpp"
+#include "database/kernels/xger.hpp"
+#include "database/kernels/xgemm.hpp"
+#include "database/kernels/copy.hpp"
+#include "database/kernels/pad.hpp"
+#include "database/kernels/transpose.hpp"
+#include "database/kernels/padtranspose.hpp"
 
 namespace clblast {
 // =================================================================================================

src/database/database.hpp

@@ -21,7 +21,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include "internal/utilities.h"
+#include "utilities.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routine.cc

@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routine.hpp

@@ -19,11 +19,11 @@
 #include <string>
 #include <vector>
 
-#include "internal/cache.h"
-#include "internal/utilities.h"
-#include "internal/database.h"
-#include "internal/buffer_test.h"
-#include "internal/routines/common.h"
+#include "utilities.hpp"
+#include "cache.hpp"
+#include "buffer_test.hpp"
+#include "database/database.hpp"
+#include "routines/common.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/common.cc

@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "internal/routines/common.h"
+#include "routines/common.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/common.hpp

@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "clblast.h"
-#include "internal/clpp11.h"
-#include "internal/database.h"
+#include "clpp11.hpp"
+#include "database/database.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xamax.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xamax.h"
+#include "routines/level1/xamax.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xamax.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XAMAX_H_
 #define CLBLAST_ROUTINES_XAMAX_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xasum.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xasum.h"
+#include "routines/level1/xasum.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xasum.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XASUM_H_
 #define CLBLAST_ROUTINES_XASUM_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xaxpy.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xaxpy.h"
+#include "routines/level1/xaxpy.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xaxpy.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XAXPY_H_
 #define CLBLAST_ROUTINES_XAXPY_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xcopy.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xcopy.h"
+#include "routines/level1/xcopy.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xcopy.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XCOPY_H_
 #define CLBLAST_ROUTINES_XCOPY_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xdot.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xdot.h"
+#include "routines/level1/xdot.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xdot.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XDOT_H_
 #define CLBLAST_ROUTINES_XDOT_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xdotc.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xdotc.h"
+#include "routines/level1/xdotc.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xdotc.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XDOTC_H_
 #define CLBLAST_ROUTINES_XDOTC_H_
 
-#include "internal/routines/level1/xdot.h"
+#include "routines/level1/xdot.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xdotu.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xdotu.h"
+#include "routines/level1/xdotu.hpp"
 
 #include <string>
 

src/routines/level1/xdotu.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XDOTU_H_
 #define CLBLAST_ROUTINES_XDOTU_H_
 
-#include "internal/routines/level1/xdot.h"
+#include "routines/level1/xdot.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xmax.hpp

@@ -14,8 +14,8 @@
 #ifndef CLBLAST_ROUTINES_XMAX_H_
 #define CLBLAST_ROUTINES_XMAX_H_
 
-#include "internal/routine.h"
-#include "internal/routines/level1/xamax.h"
+#include "routine.hpp"
+#include "routines/level1/xamax.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xmin.hpp

@@ -14,8 +14,8 @@
 #ifndef CLBLAST_ROUTINES_XMIN_H_
 #define CLBLAST_ROUTINES_XMIN_H_
 
-#include "internal/routine.h"
-#include "internal/routines/level1/xamax.h"
+#include "routine.hpp"
+#include "routines/level1/xamax.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xnrm2.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xnrm2.h"
+#include "routines/level1/xnrm2.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xnrm2.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XNRM2_H_
 #define CLBLAST_ROUTINES_XNRM2_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xscal.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xscal.h"
+#include "routines/level1/xscal.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xscal.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSCAL_H_
 #define CLBLAST_ROUTINES_XSCAL_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xsum.hpp

@@ -14,8 +14,8 @@
 #ifndef CLBLAST_ROUTINES_XSUM_H_
 #define CLBLAST_ROUTINES_XSUM_H_
 
-#include "internal/routine.h"
-#include "internal/routines/level1/xasum.h"
+#include "routine.hpp"
+#include "routines/level1/xasum.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level1/xswap.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level1/xswap.h"
+#include "routines/level1/xswap.hpp"
 
 #include <string>
 #include <vector>

src/routines/level1/xswap.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSWAP_H_
 #define CLBLAST_ROUTINES_XSWAP_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xgbmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgbmv.h"
+#include "routines/level2/xgbmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xgbmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XGBMV_H_
 #define CLBLAST_ROUTINES_XGBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xgemv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xgemv.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGEMV_H_
 #define CLBLAST_ROUTINES_XGEMV_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xger.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xger.h"
+#include "routines/level2/xger.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xger.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGER_H_
 #define CLBLAST_ROUTINES_XGER_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xgerc.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgerc.h"
+#include "routines/level2/xgerc.hpp"
 
 #include <string>
 

src/routines/level2/xgerc.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGERC_H_
 #define CLBLAST_ROUTINES_XGERC_H_
 
-#include "internal/routines/level2/xger.h"
+#include "routines/level2/xger.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xgeru.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xgeru.h"
+#include "routines/level2/xgeru.hpp"
 
 #include <string>
 

src/routines/level2/xgeru.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGERU_H_
 #define CLBLAST_ROUTINES_XGERU_H_
 
-#include "internal/routines/level2/xger.h"
+#include "routines/level2/xger.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xhbmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhbmv.h"
+#include "routines/level2/xhbmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xhbmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHBMV_H_
 #define CLBLAST_ROUTINES_XHBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xhemv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhemv.h"
+#include "routines/level2/xhemv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xhemv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHEMV_H_
 #define CLBLAST_ROUTINES_XHEMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xher.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 #include <string>
 

src/routines/level2/xher.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHER_H_
 #define CLBLAST_ROUTINES_XHER_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xher2.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 #include <string>
 

src/routines/level2/xher2.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHER2_H_
 #define CLBLAST_ROUTINES_XHER2_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xhpmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhpmv.h"
+#include "routines/level2/xhpmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xhpmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHPMV_H_
 #define CLBLAST_ROUTINES_XHPMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xhpr.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhpr.h"
+#include "routines/level2/xhpr.hpp"
 
 #include <string>
 

src/routines/level2/xhpr.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHPR_H_
 #define CLBLAST_ROUTINES_XHPR_H_
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xhpr2.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xhpr2.h"
+#include "routines/level2/xhpr2.hpp"
 
 #include <string>
 

src/routines/level2/xhpr2.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XHPR2_H_
 #define CLBLAST_ROUTINES_XHPR2_H_
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xsbmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsbmv.h"
+#include "routines/level2/xsbmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xsbmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSBMV_H_
 #define CLBLAST_ROUTINES_XSBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xspmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xspmv.h"
+#include "routines/level2/xspmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xspmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSPMV_H_
 #define CLBLAST_ROUTINES_XSPMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xspr.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xspr.h"
+#include "routines/level2/xspr.hpp"
 
 #include <string>
 

src/routines/level2/xspr.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSPR_H_
 #define CLBLAST_ROUTINES_XSPR_H_
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xspr2.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xspr2.h"
+#include "routines/level2/xspr2.hpp"
 
 #include <string>
 

src/routines/level2/xspr2.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSPR2_H_
 #define CLBLAST_ROUTINES_XSPR2_H_
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xsymv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsymv.h"
+#include "routines/level2/xsymv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xsymv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XSYMV_H_
 #define CLBLAST_ROUTINES_XSYMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xsyr.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsyr.h"
+#include "routines/level2/xsyr.hpp"
 
 #include <string>
 

src/routines/level2/xsyr.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSYR_H_
 #define CLBLAST_ROUTINES_XSYR_H_
 
-#include "internal/routines/level2/xher.h"
+#include "routines/level2/xher.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xsyr2.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xsyr2.h"
+#include "routines/level2/xsyr2.hpp"
 
 #include <string>
 

src/routines/level2/xsyr2.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XSYR2_H_
 #define CLBLAST_ROUTINES_XSYR2_H_
 
-#include "internal/routines/level2/xher2.h"
+#include "routines/level2/xher2.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xtbmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xtbmv.h"
+#include "routines/level2/xtbmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xtbmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTBMV_H_
 #define CLBLAST_ROUTINES_XTBMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xtpmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xtpmv.h"
+#include "routines/level2/xtpmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xtpmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTPMV_H_
 #define CLBLAST_ROUTINES_XTPMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level2/xtrmv.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level2/xtrmv.h"
+#include "routines/level2/xtrmv.hpp"
 
 #include <string>
 #include <vector>

src/routines/level2/xtrmv.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XTRMV_H_
 #define CLBLAST_ROUTINES_XTRMV_H_
 
-#include "internal/routines/level2/xgemv.h"
+#include "routines/level2/xgemv.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level3/xgemm.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xgemm.h"
+#include "routines/level3/xgemm.hpp"
 
 #include <string>
 #include <vector>

src/routines/level3/xgemm.hpp

@@ -14,7 +14,7 @@
 #ifndef CLBLAST_ROUTINES_XGEMM_H_
 #define CLBLAST_ROUTINES_XGEMM_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level3/xhemm.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xhemm.h"
+#include "routines/level3/xhemm.hpp"
 
 #include <string>
 #include <vector>

src/routines/level3/xhemm.hpp

@@ -15,7 +15,7 @@
 #ifndef CLBLAST_ROUTINES_XHEMM_H_
 #define CLBLAST_ROUTINES_XHEMM_H_
 
-#include "internal/routines/level3/xgemm.h"
+#include "routines/level3/xgemm.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level3/xher2k.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xher2k.h"
+#include "routines/level3/xher2k.hpp"
 
 #include <string>
 #include <vector>

src/routines/level3/xher2k.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHER2K_H_
 #define CLBLAST_ROUTINES_XHER2K_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================

src/routines/level3/xherk.cc

@@ -11,7 +11,7 @@
 //
 // =================================================================================================
 
-#include "internal/routines/level3/xherk.h"
+#include "routines/level3/xherk.hpp"
 
 #include <string>
 #include <vector>

src/routines/level3/xherk.hpp

@@ -16,7 +16,7 @@
 #ifndef CLBLAST_ROUTINES_XHERK_H_
 #define CLBLAST_ROUTINES_XHERK_H_
 
-#include "internal/routine.h"
+#include "routine.hpp"
 
 namespace clblast {
 // =================================================================================================