Make the library header only (#18)

* Rename `include` as `headers` * Rename `serial` folder as `nnhep` * Fix relative paths in headers and small typo * Add main header file * Update include paths in main files * Update include paths of test files
sbaldu · Nov 23, 2023 · ad2662c · ad2662c
1 parent 5749959
commit ad2662c
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 20 deletions.
diff --git a/src/main.cc b/src/main.cc
@@ -4,9 +4,7 @@
 #include <string>
 #include <sstream>
 
-#include "serial/include/Activators.hpp"
-#include "serial/include/ErrorFunction.hpp"
-#include "serial/include/Network.hpp"
+#include "nnhep.hpp"
 
 int main(int argc, char** argv) {
   double eta{0.975};

diff --git a/src/nnhep.hpp b/src/nnhep.hpp
@@ -0,0 +1,12 @@
+
+#ifndef nnhep_hpp
+#define nnhep_hpp
+
+#include "nnhep/DataFormats/Matrix.hpp"
+#include "nnhep/DataFormats/VectorOperations.hpp"
+#include "nnhep/headers/Activators.hpp"
+#include "nnhep/headers/ErrorFunction.hpp"
+#include "nnhep/headers/Layer.hpp"
+#include "nnhep/headers/Network.hpp"
+
+#endif
diff --git a/src/serial/DataFormats/Matrix.hpp → src/nnhep/DataFormats/Matrix.hpp b/src/serial/DataFormats/Matrix.hpp → src/nnhep/DataFormats/Matrix.hpp
diff --git a/src/serial/DataFormats/VectorOperations.hpp → src/nnhep/DataFormats/VectorOperations.hpp b/src/serial/DataFormats/VectorOperations.hpp → src/nnhep/DataFormats/VectorOperations.hpp
diff --git a/src/serial/include/Activators.hpp → src/nnhep/headers/Activators.hpp b/src/serial/include/Activators.hpp → src/nnhep/headers/Activators.hpp
diff --git a/src/serial/include/ErrorFunction.hpp → src/nnhep/headers/ErrorFunction.hpp b/src/serial/include/ErrorFunction.hpp → src/nnhep/headers/ErrorFunction.hpp
@@ -14,7 +14,7 @@
 #include <memory>
 #include <vector>
 
-#include "DataFormats/Matrix.hpp"
+#include "../DataFormats/Matrix.hpp"
 #include "Layer.hpp"
 
 template <typename T>

diff --git a/src/serial/include/Layer.hpp → src/nnhep/headers/Layer.hpp b/src/serial/include/Layer.hpp → src/nnhep/headers/Layer.hpp
@@ -15,7 +15,7 @@
 #include <sstream>
 #include <vector>
 
-#include "DataFormats/Matrix.hpp"
+#include "../DataFormats/Matrix.hpp"
 
 /// @brief Layer of a neural network
 /// @tparam T The type of the node values

diff --git a/src/serial/include/Network.hpp → src/nnhep/headers/Network.hpp b/src/serial/include/Network.hpp → src/nnhep/headers/Network.hpp
@@ -17,8 +17,8 @@
 
 #include "Activators.hpp"
 #include "Layer.hpp"
-#include "DataFormats/Matrix.hpp"
-#include "DataFormats/VectorOperations.hpp"
+#include "../DataFormats/Matrix.hpp"
+#include "../DataFormats/VectorOperations.hpp"
 
 template <typename T>
 using shared = std::shared_ptr<T>;
@@ -176,7 +176,7 @@ template <typename T,
           typename Activator,
           template <typename E, typename LW, template <typename K> typename Act>
           typename Loss>
-Network<T, W, Activator, Loss>::Network(const std::vector<int>& nodes_per_layer)
+Network<T, W, Activator, Loss>::Network(const std::vector<T>& nodes_per_layer)
     : n_layers{static_cast<int>(nodes_per_layer.size())},
       m_layers(n_layers + 1),
       m_weights(n_layers + 1),

diff --git a/src/test.cc b/src/test.cc
@@ -4,9 +4,7 @@
 #include <string>
 #include <sstream>
 
-#include "serial/include/Activators.hpp"
-#include "serial/include/ErrorFunction.hpp"
-#include "serial/include/Network.hpp"
+#include "nnhep.hpp"
 
 int main() {
   double eta{0.975};

diff --git a/src/training_and_validation.cc b/src/training_and_validation.cc
@@ -4,9 +4,7 @@
 #include <string>
 #include <sstream>
 
-#include "serial/include/Activators.hpp"
-#include "serial/include/ErrorFunction.hpp"
-#include "serial/include/Network.hpp"
+#include "nnhep.hpp"
 
 void train_and_validate(double eta, int hidden_layer_size) {
   Network<double, double, Sigmoid, MeanSquaredError> net({30, hidden_layer_size, 1});

diff --git a/test/serial/ActivatorsTest/Activators.cc b/test/serial/ActivatorsTest/Activators.cc
@@ -2,7 +2,7 @@
 #include <cmath>
 #include <limits>
 
-#include "../../src/serial/include/Activators.hpp"
+#include "nnhep.hpp"
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"

diff --git a/test/serial/ActivatorsTest/CMakeLists.txt b/test/serial/ActivatorsTest/CMakeLists.txt
@@ -23,7 +23,7 @@ if(NOT doctest_POPULATED)
 endif()
 
 # Set base directory for serial code
-include_directories(../../../src/serial/)
+include_directories(../../../src/)
 
 # Compile
 add_executable(Activators.out ./Activators.cc)

diff --git a/test/serial/MatrixTest/CMakeLists.txt b/test/serial/MatrixTest/CMakeLists.txt
@@ -23,7 +23,7 @@ if(NOT doctest_POPULATED)
 endif()
 
 # Set base directory for serial code
-include_directories(../../../src/serial/)
+include_directories(../../../src/)
 
 # Compile
 add_executable(MatrixSum.out ./MatrixSum.cc)

diff --git a/test/serial/MatrixTest/MatrixMultiplication.cc b/test/serial/MatrixTest/MatrixMultiplication.cc
@@ -4,7 +4,7 @@
 #include <ranges>
 #include <vector>
 
-#include "DataFormats/Matrix.hpp"
+#include "nnhep/DataFormats/Matrix.hpp"
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"

diff --git a/test/serial/MatrixTest/MatrixSum.cc b/test/serial/MatrixTest/MatrixSum.cc
@@ -4,7 +4,7 @@
 #include <ranges>
 #include <vector>
 
-#include "DataFormats/Matrix.hpp"
+#include "nnhep/DataFormats/Matrix.hpp"
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"

diff --git a/test/serial/MatrixTest/MatrixTransposition.cc b/test/serial/MatrixTest/MatrixTransposition.cc
@@ -4,7 +4,7 @@
 #include <ranges>
 #include <vector>
 
-#include "DataFormats/Matrix.hpp"
+#include "nnhep/DataFormats/Matrix.hpp"
 
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"