Code quality: renamed "backend/" folder to "kernels". More explicit and no longer conflicts with "driver/"

include/isaac/kernels/mapped_object.h

@@ -4,7 +4,7 @@
 #include <map>
 #include <string>
 #include "isaac/types.h"
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/stream.h"
 #include "isaac/symbolic/expression.h"
 
 namespace isaac

include/isaac/kernels/parse.h

@@ -2,8 +2,8 @@
 #define ISAAC_BACKEND_PARSE_H
 
 #include <set>
-#include "isaac/backend/mapped_object.h"
-#include "isaac/backend/binder.h"
+#include "isaac/kernels/mapped_object.h"
+#include "isaac/kernels/binder.h"
 #include "isaac/symbolic/expression.h"
 
 namespace isaac

include/isaac/kernels/templates/axpy.h

@@ -1,7 +1,7 @@
 #ifndef ISAAC_BACKEND_TEMPLATES_VAXPY_H
 #define ISAAC_BACKEND_TEMPLATES_VAXPY_H
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {

include/isaac/kernels/templates/base.h

@@ -7,8 +7,8 @@
 #include <cmath>
 
 #include "isaac/types.h"
-#include "isaac/backend/parse.h"
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/parse.h"
+#include "isaac/kernels/stream.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/tools/to_string.hpp"
 namespace isaac

include/isaac/kernels/templates/dot.h

@@ -1,7 +1,7 @@
 #ifndef ISAAC_BACKEND_TEMPLATES_DOT_H
 #define ISAAC_BACKEND_TEMPLATES_DOT_H
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {

include/isaac/kernels/templates/gemm.h

@@ -1,7 +1,7 @@
 #ifndef ISAAC_BACKEND_TEMPLATES_MPRODUCT_H
 #define ISAAC_BACKEND_TEMPLATES_MPRODUCT_H
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/symbolic/preset.h"
 

include/isaac/kernels/templates/gemv.h

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "isaac/symbolic/expression.h"
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {

include/isaac/kernels/templates/ger.h

@@ -2,7 +2,7 @@
 #define ISAAC_BACKEND_TEMPLATES_MAXPY_H
 
 #include <vector>
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 
 namespace isaac
 {

include/isaac/model/model.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <map>
 
-#include "isaac/backend/templates/base.h"
+#include "isaac/kernels/templates/base.h"
 #include "isaac/model/predictors/random_forest.h"
 #include "isaac/symbolic/expression.h"
 

lib/kernels/binder.cpp

@@ -1,4 +1,4 @@
-#include "isaac/backend/binder.h"
+#include "isaac/kernels/binder.h"
 
 namespace isaac
 {

lib/kernels/keywords.cpp

@@ -1,4 +1,4 @@
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/keywords.h"
 
 namespace isaac
 {

lib/kernels/mapped_object.cpp

@@ -3,9 +3,9 @@
 
 #include <iostream>
 
-#include "isaac/backend/mapped_object.h"
-#include "isaac/backend/parse.h"
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/mapped_object.h"
+#include "isaac/kernels/parse.h"
+#include "isaac/kernels/stream.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/tools/to_string.hpp"
 #include "isaac/tools/find_and_replace.hpp"

lib/kernels/parse.cpp

@@ -1,7 +1,7 @@
 #include <cstring>
 
 #include "isaac/array.h"
-#include "isaac/backend/parse.h"
+#include "isaac/kernels/parse.h"
 #include "isaac/exception/operation_not_supported.h"
 
 namespace isaac

lib/kernels/stream.cpp

@@ -1,4 +1,4 @@
-#include "isaac/backend/stream.h"
+#include "isaac/kernels/stream.h"
 
 namespace isaac
 {

lib/kernels/templates/axpy.cpp

@@ -1,7 +1,7 @@
 #include <cstring>
 #include <algorithm>
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/keywords.h"
 #include "isaac/driver/backend.h"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"

lib/kernels/templates/base.cpp

@@ -2,14 +2,14 @@
 #include <algorithm>
 
 #include "isaac/array.h"
-#include "isaac/backend/keywords.h"
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/templates/dot.h"
-#include "isaac/backend/templates/ger.h"
-#include "isaac/backend/templates/gemv.h"
-#include "isaac/backend/templates/gemm.h"
-#include "isaac/backend/templates/base.h"
-#include "isaac/backend/parse.h"
+#include "isaac/kernels/keywords.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/templates/dot.h"
+#include "isaac/kernels/templates/ger.h"
+#include "isaac/kernels/templates/gemv.h"
+#include "isaac/kernels/templates/gemm.h"
+#include "isaac/kernels/templates/base.h"
+#include "isaac/kernels/parse.h"
 #include "isaac/exception/operation_not_supported.h"
 #include "isaac/exception/unknown_datatype.h"
 #include "isaac/tools/to_string.hpp"

lib/kernels/templates/dot.cpp

@@ -1,10 +1,10 @@
 #include <cstring>
 #include <iostream>
-#include "isaac/backend/templates/dot.h"
+#include "isaac/kernels/templates/dot.h"
 #include "isaac/tools/to_string.hpp"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/keywords.h"
 namespace isaac
 {
 namespace templates

lib/kernels/templates/gemm.cpp

@@ -1,6 +1,6 @@
 #include "isaac/array.h"
-#include "isaac/backend/templates/gemm.h"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/templates/gemm.h"
+#include "isaac/kernels/keywords.h"
 #include "isaac/model/model.h"
 #include "isaac/symbolic/preset.h"
 #include "isaac/exception/operation_not_supported.h"

lib/kernels/templates/gemv.cpp

@@ -1,8 +1,8 @@
 #include <cstring>
 #include <iostream>
-#include "isaac/backend/stream.h"
-#include "isaac/backend/keywords.h"
-#include "isaac/backend/templates/gemv.h"
+#include "isaac/kernels/stream.h"
+#include "isaac/kernels/keywords.h"
+#include "isaac/kernels/templates/gemv.h"
 #include "isaac/tools/to_string.hpp"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"

lib/kernels/templates/ger.cpp

@@ -1,10 +1,10 @@
 #include <cstring>
 #include <iostream>
-#include "isaac/backend/templates/ger.h"
+#include "isaac/kernels/templates/ger.h"
 #include "isaac/tools/make_map.hpp"
 #include "isaac/tools/make_vector.hpp"
 #include "isaac/symbolic/io.h"
-#include "isaac/backend/keywords.h"
+#include "isaac/kernels/keywords.h"
 
 namespace isaac
 {

lib/model/model.cpp

@@ -6,12 +6,12 @@
 #include <memory>
 
 #include "rapidjson/document.h"
-#include "isaac/backend/parse.h"
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/templates/dot.h"
-#include "isaac/backend/templates/ger.h"
-#include "isaac/backend/templates/gemv.h"
-#include "isaac/backend/templates/gemm.h"
+#include "isaac/kernels/parse.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/templates/dot.h"
+#include "isaac/kernels/templates/ger.h"
+#include "isaac/kernels/templates/gemv.h"
+#include "isaac/kernels/templates/gemm.h"
 #include "isaac/driver/program_cache.h"
 #include "isaac/exception/unknown_datatype.h"
 #include "isaac/exception/operation_not_supported.h"

python/setup.py

@@ -115,7 +115,7 @@ def main():
     include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
 
     #Source files
-    src =  'src/lib/array.cpp src/lib/value_scalar.cpp src/lib/wrap/clBLAS.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/io.cpp src/lib/symbolic/execute.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program.cpp src/lib/driver/context.cpp src/lib/driver/platform.cpp src/lib/driver/device.cpp src/lib/driver/program_cache.cpp src/lib/driver/kernel.cpp src/lib/driver/event.cpp src/lib/driver/check.cpp src/lib/driver/backend.cpp src/lib/driver/ndrange.cpp src/lib/driver/command_queue.cpp src/lib/driver/buffer.cpp src/lib/driver/handle.cpp src/lib/backend/parse.cpp src/lib/backend/stream.cpp src/lib/backend/mapped_object.cpp src/lib/backend/keywords.cpp src/lib/backend/binder.cpp src/lib/backend/templates/gemm.cpp src/lib/backend/templates/gemv.cpp src/lib/backend/templates/dot.cpp src/lib/backend/templates/ger.cpp src/lib/backend/templates/axpy.cpp src/lib/backend/templates/base.cpp '.split() + [os.path.join('src', 'wrap', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
+    src =  'src/lib/symbolic/preset.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/array.cpp src/lib/value_scalar.cpp src/lib/driver/backend.cpp src/lib/driver/device.cpp src/lib/driver/kernel.cpp src/lib/driver/buffer.cpp src/lib/driver/platform.cpp src/lib/driver/check.cpp src/lib/driver/program.cpp src/lib/driver/command_queue.cpp src/lib/driver/program_cache.cpp src/lib/driver/context.cpp src/lib/driver/event.cpp src/lib/driver/ndrange.cpp src/lib/driver/handle.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/stream.cpp src/lib/kernels/parse.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/wrap/clBLAS.cpp '.split() + [os.path.join('src', 'wrap', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
     boostsrc = 'external/boost/libs/'
     for s in ['numpy','python','smart_ptr','system','thread']:
         src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]

python/src/wrap/model.cpp

@@ -1,8 +1,8 @@
-#include "isaac/backend/templates/axpy.h"
-#include "isaac/backend/templates/ger.h"
-#include "isaac/backend/templates/dot.h"
-#include "isaac/backend/templates/gemv.h"
-#include "isaac/backend/templates/gemm.h"
+#include "isaac/kernels/templates/axpy.h"
+#include "isaac/kernels/templates/ger.h"
+#include "isaac/kernels/templates/dot.h"
+#include "isaac/kernels/templates/gemv.h"
+#include "isaac/kernels/templates/gemm.h"
 #include "isaac/model/model.h"
 
 #include "common.hpp"