Merged changes from aul12/cppflow

- Reduced number of memmory leaks
- Avoid using of unnecessary pointers

To mantain the original structure, aul12/cppflow structure has been modified to match the original serizba/cppflow structure

Author: serizba

CMakeLists.txt

@@ -1,4 +1,8 @@
-add_executable(coco_example main.cpp ../../src/Model.cpp ../../src/Tensor.cpp)
-find_package(OpenCV REQUIRED )
-target_include_directories(coco_example PRIVATE ../../include)
-target_link_libraries (coco_example ${LIBS} ${OpenCV_LIBS})
+cmake_minimum_required(VERSION 3.10)
+project(example)
+
+set(CMAKE_CXX_STANDARD 17)
+add_executable(example main.cpp ../../src/Model.cpp ../../src/Tensor.cpp)
+find_package( OpenCV REQUIRED )
+target_include_directories(example PRIVATE ../../include)
+target_link_libraries (example -ltensorflow ${OpenCV_LIBS})

examples/coco/CMakeLists.txt

@@ -2,8 +2,8 @@
 // Created by sergio on 16/05/19.
 //
 
-#include "../../src/Model.h"
-#include "../../src/Tensor.h"
+#include "../../include/Model.h"
+#include "../../include/Tensor.h"
 #include <opencv2/opencv.hpp>
 #include <numeric>
 #include <iomanip>

examples/coco/main.cpp

@@ -1,4 +1,7 @@
+cmake_minimum_required(VERSION 3.10)
+project(example)
+
 set(CMAKE_CXX_STANDARD 17)
-add_executable(load_model_example main.cpp ../../src/Model.cpp ../../src/Tensor.cpp)
-target_include_directories(load_model_example PRIVATE ../../include)
-target_link_libraries (load_model_example ${LIBS})
+add_executable(example main.cpp ../../src/Model.cpp ../../src/Tensor.cpp)
+target_include_directories(example PRIVATE ../../include)
+target_link_libraries (example -ltensorflow)

examples/load_model/CMakeLists.txt

@@ -2,8 +2,8 @@
 // Created by sergio on 16/05/19.
 //
 
-#include "../../src/Model.h"
-#include "../../src/Tensor.h"
+#include "../../include/Model.h"
+#include "../../include/Tensor.h"
 
 #include <numeric>
 #include <iomanip>

examples/load_model/main.cpp

@@ -1,4 +1,8 @@
-find_package(OpenCV REQUIRED )
-add_executable(nmist_example main.cpp ../../src/Model.cpp ../../src/Tensor.cpp)
-target_include_directories(nmist_example PRIVATE ../../include)
-target_link_libraries (nmist_example ${LIBS} ${OpenCV_LIBS})
+cmake_minimum_required(VERSION 3.10)
+project(example)
+
+set(CMAKE_CXX_STANDARD 17)
+find_package( OpenCV REQUIRED )
+add_executable(example main.cpp ../../src/Model.cpp ../../src/Tensor.cpp)
+target_include_directories(example PRIVATE ../../include)
+target_link_libraries (example -ltensorflow ${OpenCV_LIBS})

examples/mnist/CMakeLists.txt

@@ -2,8 +2,8 @@
 // Created by sergio on 12/05/19.
 //
 
-#include "../../src/Model.h"
-#include "../../src/Tensor.h"
+#include "../../include/Model.h"
+#include "../../include/Tensor.h"
 #include <opencv2/opencv.hpp>
 #include <algorithm>
 #include <iterator>
@@ -12,8 +12,8 @@
 int main() {
 
     // Create model
-    Model m("model.pb");
-    m.restore("checkpoint/train.ckpt");
+    Model m("../model.pb");
+    m.restore("../checkpoint/train.ckpt");
 
     // Create Tensors
     Tensor input(m, "input");
@@ -24,7 +24,7 @@ int main() {
         cv::Mat img, scaled;
 
         // Read image
-        img = cv::imread("images/"+std::to_string(i)+".png");
+        img = cv::imread("../images/"+std::to_string(i)+".png");
 
         // Scale image to range 0-1
         img.convertTo(scaled, CV_64F, 1.f/255);

examples/mnist/main.cpp

@@ -5,12 +5,14 @@
 #ifndef CPPFLOW_MODEL_H
 #define CPPFLOW_MODEL_H
 
+#include <cstring>
+#include <algorithm>
 #include <string>
 #include <vector>
 #include <iostream>
 #include <fstream>
 #include <tuple>
-#include "c_api.h"
+#include <tensorflow/c/c_api.h>
 #include "Tensor.h"
 
 class Tensor;

examples/mnist/model.pb

@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <numeric>
 #include <cstring>
-#include "c_api.h"
+#include <tensorflow/c/c_api.h>
 #include "Model.h"
 
 class Model;