merge

Signed-off-by: Micaela Verucchi <micaelaverucchi@gmail.com>

include/tkDNN/DarknetParser.h

@@ -4,14 +4,13 @@
 
 namespace tk { namespace dnn {
 
-    tk::dnn::Network* DarknetParser(std::string cfg) {
+    struct darknetFields_t{
+        int width = 0;
+        int height = 0;
 
-        tk::dnn::dataDim_t dim;
+    };
-        tk::dnn::Network *net = new tk::dnn::Network(dim);
 
-    }
+    std::string darknetParseType(const std::string& line){
-        
-    std::string parseType(const std::string& line){
             size_t start = line.find("[");
             size_t end  = line.find("]");
             if( start == std::string::npos || end == std::string::npos)
@@ -21,4 +20,40 @@ namespace tk { namespace dnn {
             return type;
     }
 
+    darknetFields_t parseFields(const std::string& line){
+        
+    }
+
+
+
+    tk::dnn::Network* DarknetParser(std::string cfg_file) {
+
+        tk::dnn::dataDim_t dim;
+        tk::dnn::Network *net = new tk::dnn::Network(dim);
+
+        std::ifstream if_cfg(cfg_file);
+        if(!if_cfg.is_open())
+            FatalError("cloud not open cfg file: " + cfg_file);
+
+        std::string line;
+        while(std::getline(if_cfg, line)) {
+            // remove comments
+            std::size_t found = line.find("#");
+            if ( found != std::string::npos ) {
+                line = line.substr(0, found);
+            }
+
+            // skip empty lines
+            if(line.size() == 0)
+                continue;
+            
+            std::string type = darknetParseType(line);
+            if(type.size() > 0) {
+                std::cout<<"type: "<<type<<"\n";
+            }
+        }
+    }
+        
+    
+
 }}

tests/yolo3/yolo3.cpp

@@ -5,8 +5,7 @@
 
 int main() {
 
-    tk::dnn::Network *net = tk::dnn::DarknetParser("../../tests/yolo3/yolo3.cfg");
+    tk::dnn::Network *net = tk::dnn::DarknetParser("../tests/yolo3/yolov3.cfg");
-    tk::dnn::parseType("[net]");
 
     // Network layout
     //tk::dnn::dataDim_t dim(1, 3, 416, 416, 1);