Some major revisions on the constructors, now using templates to reduce written code. Also now global device, and added some tensor manipulation functions. Need to be debugged

Author: RobBa

src/CMakeLists.txt

@@ -3,20 +3,22 @@ include_directories(
         "${CMAKE_CURRENT_SOURCE_DIR}/data_modeling"
         "${CMAKE_CURRENT_SOURCE_DIR}/utility"
         "${CMAKE_CURRENT_SOURCE_DIR}/layers"
-        "${CMAKE_CURRENT_SOURCE_DIR}/python"
+        "${CMAKE_CURRENT_SOURCE_DIR}/system"
         )
 
 # compiling the libraries
 add_subdirectory(utility)
 add_subdirectory(data_modeling)
 add_subdirectory(layers)
 add_subdirectory(networks)
+add_subdirectory(system)
+
 add_subdirectory(python)
 
-target_link_libraries(py_data_modeling ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} DataModeling Utility)
+target_link_libraries(py_data_modeling ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} DataModeling Utility System)
 target_include_directories(py_data_modeling PRIVATE ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
-target_link_libraries(py_layers ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} Layers DataModeling Utility)
+target_link_libraries(py_layers ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} Layers DataModeling Utility System)
 target_include_directories(py_layers PRIVATE ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
 
 # for compiled boost lib

src/data_modeling/CMakeLists.txt

@@ -1,4 +1,5 @@
 add_library(DataModeling STATIC
     dim_type.cpp
     tensor.cpp
+    tensor_functions.cpp
     )

src/data_modeling/dim_type.cpp

@@ -11,10 +11,6 @@
 
 #include "dim_type.h"
 
-#ifndef NDEBUG
-  #include <limits>
-#endif // NDEBUG
-
 using namespace std;
 
 ostream& operator<<(ostream& os, const Dimension& d) noexcept {
@@ -27,25 +23,4 @@ ostream& operator<<(ostream& os, const Dimension& d) noexcept {
   }
   os << ")\n";
   return os;
-}
-
-/**
- * @brief Get the total size of the dimension as a product of all dimension sizes.
- */
-tensorSize_t Dimension::getTotalSize() const noexcept {
-  tensorSize_t res = 1;
-  for(const tensorSize_t x : dims){
-    if(x==0){
-      return res;
-    }
-
-#ifndef NDEBUG
-  if(res > std::numeric_limits<tensorSize_t>::max() / x){
-    throw std::overflow_error("Multiplication overflow when getting size of tensor.");
-  }
-#endif // NDEBUG
-
-    res *= x;
-  }
-  return res;
 }

src/data_modeling/dim_type.h

@@ -44,7 +44,5 @@ class Dimension final {
       return this->dims == other.dims;
     }
 
-    tensorSize_t getTotalSize() const noexcept;
-
     friend std::ostream& operator<<(std::ostream& os, const Dimension& d) noexcept;
 };

src/data_modeling/tensor.cpp

@@ -23,6 +23,10 @@ using namespace std;
 *************************** tensorValues_t *********************************
 ********************************************************************/
 
+Tensor::tensorValues_t::tensorValues_t() {
+  device = defaultDevice;
+}
+
 Tensor::tensorValues_t::tensorValues_t(Device d) : device(d) {}
 
 Tensor::tensorValues_t::tensorValues_t(tensorValues_t&& other) noexcept {
@@ -78,6 +82,14 @@ Device Tensor::tensorValues_t::getDevice() const noexcept {
   return this->device;
 }
 
+void Tensor::tensorValues_t::setDefaultDevice(const Device d) noexcept {
+  defaultDevice = d;
+}
+            
+Device Tensor::tensorValues_t::getDefaultDevice() noexcept {
+  return defaultDevice;
+}
+
 tensorSize_t Tensor::tensorValues_t::getSize() const noexcept {
   return this->size;
 }
@@ -96,6 +108,9 @@ ftype& Tensor::tensorValues_t::operator[](int idx) {
     case Device::CUDA:
       __throw_invalid_argument("Cuda operator[] not implemented");
   }
+
+  __throw_invalid_argument("Unexpected device encountered");
+  return values[0]; // never reached, suppress warning
 }
 
 ftype Tensor::tensorValues_t::get(const int idx) const {
@@ -108,6 +123,9 @@ ftype Tensor::tensorValues_t::get(const int idx) const {
     case Device::CUDA:
       __throw_invalid_argument("Cuda getter not implemented");
   }
+
+  __throw_invalid_argument("Unexpected device encountered");
+  return 0; // never reached, suppress warning
 }
 
 /******************************************************************** 
@@ -152,7 +170,7 @@ Tensor& Tensor::operator=(Tensor&& other) noexcept {
  */
 Tensor Tensor::multiplyScalar(const Tensor& scalar, const Tensor& right) const {
   Tensor res(right);
-  for(int i=0; i<right.dims.getTotalSize(); ++i){
+  for(int i=0; i<right.getSize(); ++i){
     (*res.values)[i] = (*this->values)[0] * (*right.values)[i];
   }
   return res;
@@ -167,7 +185,7 @@ Tensor Tensor::multiplyScalar(const Tensor& scalar, const Tensor& right) const {
  * network class object instance upon construction. 
  */
 Tensor Tensor::multiply2D(const Tensor& left, const Tensor& right) const {
-  Tensor res(left.dims.get(0), right.dims.get(1), this->values->getDevice());
+  Tensor res(this->values->getDevice(), left.dims.get(0), right.dims.get(1));
 
   for(uint16_t row=0; row<left.dims.get(0); row++){
     const uint32_t leftRowOffset = row * left.dims.get(1);
@@ -228,10 +246,20 @@ Tensor Tensor::multiply(const Tensor& left, const Tensor& right) {
   return left * right;
 }
 
+/**
+ * @brief Populates the tensor with value.
+ */
+void Tensor::reset(const ftype x) {
+  for(tensorSize_t i=0; i<values->getSize(); i++){
+    (*values)[i] = x;
+  }
+}
+
 /**
  * @brief Populates the tensor with values drawn according to initializer.
  */
-void Tensor::initialize(const unique_ptr<utility::InitializerBase>& init) {
+void Tensor::reset(const utility::InitClass ic) {
+  const auto init = utility::InitializerFactory::getInitializer(ic);
   for(tensorSize_t i=0; i<values->getSize(); i++){
     (*values)[i] = init->drawNumber();
   }
@@ -241,10 +269,34 @@ const Dimension& Tensor::getDims() const noexcept {
   return dims;
 }
 
+tensorSize_t Tensor::getSize() const noexcept {
+  return values->getSize();
+}
+
+void Tensor::setDefaultDevice(const Device d) noexcept {
+  tensorValues_t::setDefaultDevice(d);
+}
+            
+Device Tensor::getDefaultDevice() noexcept {
+  return tensorValues_t::getDefaultDevice();
+}
+
+void Tensor::setDevice(const Device d) noexcept {
+  values->setDevice(d);
+}
+
+Device Tensor::getDevice() const noexcept {
+  return values->getDevice();
+}
+
 void printValuesCpu(std::ostream& os, const Tensor& t) {
   const auto& dims = t.getDims();
   const auto MAX_IDX = static_cast<tensorDim_t>(5);
 
+  for(int i=0; i<4; i++){
+    cout << "Dim " << i << ": " << dims.get(i) << endl;
+  }
+
   if(dims.get(3)>0){
     std::__throw_invalid_argument("Printing 4D tensor not implemented");
   }