Code quality: renamed model/ to database/

include/isaac/database/database.h

@@ -8,7 +8,7 @@
 #include "isaac/driver/device.h"
 #include "isaac/common/expression_type.h"
 #include "isaac/common/numeric_type.h"
-#include "isaac/model/model.h"
+#include "isaac/database/model.h"
 
 namespace isaac
 {

include/isaac/database/model.h

@@ -6,7 +6,7 @@
 #include <map>
 
 #include "isaac/kernels/templates/base.h"
-#include "isaac/model/predictors/random_forest.h"
+#include "isaac/database/predictors/random_forest.h"
 #include "isaac/symbolic/expression.h"
 
 namespace isaac

include/isaac/symbolic/execute.h

@@ -1,7 +1,7 @@
 #ifndef _ISAAC_SCHEDULER_EXECUTE_H
 #define _ISAAC_SCHEDULER_EXECUTE_H
 
-#include "isaac/model/database.h"
+#include "isaac/database/database.h"
 #include "isaac/symbolic/expression.h"
 
 namespace isaac

lib/array.cpp

@@ -4,7 +4,7 @@
 
 #include "isaac/array.h"
 #include "isaac/exception/unknown_datatype.h"
-#include "isaac/model/database.h"
+#include "isaac/database/database.h"
 #include "isaac/symbolic/execute.h"
 
 

lib/database/database.cpp

@@ -3,7 +3,7 @@
 #include "rapidjson/document.h"
 #include "rapidjson/to_array.hpp"
 
-#include "isaac/model/database.h"
+#include "isaac/database/database.h"
 #include "isaac/kernels/parse.h"
 #include "isaac/kernels/templates/axpy.h"
 #include "isaac/kernels/templates/dot.h"

lib/database/model.cpp

@@ -15,7 +15,7 @@
 #include "isaac/driver/program_cache.h"
 #include "isaac/exception/unknown_datatype.h"
 #include "isaac/exception/operation_not_supported.h"
-#include "isaac/model/model.h"
+#include "isaac/database/model.h"
 
 #include "getenv.hpp"
 #include "to_string.hpp"

lib/database/predictors/random_forest.cpp

@@ -1,4 +1,4 @@
-#include "isaac/model/predictors/random_forest.h"
+#include "isaac/database/predictors/random_forest.h"
 #include "rapidjson/to_array.hpp"
 
 namespace isaac

lib/database/presets.cpp

@@ -1,5 +1,5 @@
 #include "isaac/driver/device.h"
-#include "isaac/model/database.h"
+#include "isaac/database/database.h"
 
 #include "presets/broadwell.hpp"
 

lib/kernels/templates/gemm.cpp

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

lib/symbolic/execute.cpp

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include "isaac/types.h"
 #include "isaac/array.h"
-#include "isaac/model/database.h"
+#include "isaac/database/database.h"
 #include "isaac/symbolic/expression.h"
 #include "isaac/symbolic/preset.h"
 

python/setup.py

@@ -115,7 +115,7 @@ def main():
     include =' src/include src/lib/external'.split() + ['external/boost/', 'external/boost/boost/', os.path.join(find_module("numpy")[1], "core", "include")]
 
     #Source files
-    src =  'src/lib/wrap/clBLAS.cpp src/lib/value_scalar.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/execute.cpp src/lib/model/presets.cpp src/lib/model/predictors/random_forest.cpp src/lib/model/model.cpp src/lib/model/database.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/stream.cpp src/lib/kernels/parse.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program_cache.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/ndrange.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/event.cpp src/lib/driver/device.cpp src/lib/driver/context.cpp src/lib/driver/command_queue.cpp src/lib/driver/check.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.cpp src/lib/array.cpp '.split() + [os.path.join('src', 'bind', 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/database/model.cpp src/lib/database/presets.cpp src/lib/database/database.cpp src/lib/database/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', 'bind', 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/bind/_isaac.cpp

@@ -1,7 +1,7 @@
 #include "core.h"
 #include "driver.h"
 #include "exceptions.h"
-#include "model.h"
+#include "database.h"
 
 #include <boost/python.hpp>
 #include <boost/numpy.hpp>

python/src/bind/core.cpp

@@ -1,4 +1,4 @@
-#include "isaac/model/model.h"
+#include "isaac/database/model.h"
 #include "common.hpp"
 #include "core.h"
 
@@ -188,7 +188,7 @@ namespace detail
 void export_core()
 {
 
-    bp::class_<isaac::model>("model", bp::no_init)
+    bp::class_<isaac::model>("database", bp::no_init)
                     .def("__init__", bp::make_constructor(detail::construct_model))
                     .def("execute", &isc::model::execute);
 

python/src/bind/driver.cpp

@@ -2,7 +2,7 @@
 
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
-#include "isaac/model/model.h"
+#include "isaac/database/model.h"
 #include "isaac/symbolic/execute.h"
 
 #include "common.hpp"
@@ -118,7 +118,7 @@ void export_driver()
       .def("append", &bp::vector_indexing_suite<queues_t>::append)
       ;
 
-  bp::class_<isc::database::map_type>("models")
+  bp::class_<isc::database::map_type>("databases")
       .def("__getitem__", &detail::model_map_indexing::get_item, bp::return_internal_reference<>())
       .def("__setitem__", &detail::model_map_indexing::set_item, bp::with_custodian_and_ward<1,2>())
       ;
@@ -168,7 +168,7 @@ void export_driver()
 
   bp::class_<isc::driver::CommandQueue>("command_queue", bp::init<isc::driver::Context const &, isc::driver::Device const &>())
       .def("synchronize", &isc::driver::CommandQueue::synchronize)
-      .add_property("models", bp::make_function(&isc::database::get, bp::return_internal_reference<>()))
+      .add_property("databases", bp::make_function(&isc::database::get, bp::return_internal_reference<>()))
       .add_property("device", bp::make_function(&isc::driver::CommandQueue::device, bp::return_internal_reference<>()))
       ;
 

python/src/bind/model.cpp

@@ -3,10 +3,10 @@
 #include "isaac/kernels/templates/dot.h"
 #include "isaac/kernels/templates/gemv.h"
 #include "isaac/kernels/templates/gemm.h"
-#include "isaac/model/model.h"
+#include "isaac/database/model.h"
 
 #include "common.hpp"
-#include "model.h"
+#include "database.h"
 
 
 namespace tpt = isaac::templates;

tests/linalg/gemm.cpp

@@ -1,7 +1,7 @@
 #include <cmath>
 #include "common.hpp"
 #include "isaac/array.h"
-#include "isaac/model/model.h"
+#include "isaac/database/model.h"
 #include "isaac/wrap/clBLAS.h"
 
 namespace isc = isaac;