Closes: #121

Author: srohit0

Makefile.common

@@ -99,6 +99,6 @@ CPP_FLAGS=-Wall -std=c++17 -fPIC -D_DEBUG -g -lmcheck
 endif
 
 ifneq (,$(findstring $(PROF),yY))
-CPP_FLAGS=-pg -Wall -std=c++17 -fPIC
+CPP_FLAGS=-pg -g -Wall -std=c++17 -fPIC
 endif
 

deepC/compiler/read_onnx.py

@@ -508,7 +508,7 @@ def main():
   if len(sys.argv) >= 3:
     bundle_dir = sys.argv[2]
   else:
-    bundle_dir = os.path.dirname(onnx_filename);
+    bundle_dir = os.path.dirname(onnx_file);
 
   parser = pbReader()
   parser.main(onnx_file, bundle_dir, checker=False, optimize=False)

include/graph/graph.h

@@ -115,6 +115,7 @@ class graph {
   }
   ~graph() { destroy(); }
   void setName(std::string name) { _name = name; }
+  std::string getName() { return _name; }
 
   size_t nNodes() { return _nodes.size(); }
   /*<! reset all existing marks on the graph nodes */

src/codegen/cppCodeGen.cpp

@@ -30,6 +30,7 @@
 #include <unistd.h>
 
 bool dnnc::cppCodeGen::write() {
+  // std::cout << "DBG: " << _graph.getName() << " \n\t";
 
   inferDataType typeInference(_graph);
   typeInference.main();
@@ -352,13 +353,15 @@ std::string dnnc::cppCodeGen::write(opNode &computeNode) {
     return code;
   }
 
-  if (ins.size() == 0 && outs.size() == 1) {
+  std::vector<std::string> nodeIns = computeNode.inputs();
+  std::vector<std::string> nodeOuts = computeNode.outputs();
+  if (nodeIns.size() == 0) {
     code = writeConstantOperator(computeNode, outs);
-  } else if (ins.size() == 1 && outs.size() == 1) {
+  } else if (nodeIns.size() == 1 && nodeOuts.size() == 1) {
     code = writeUnaryOperator(computeNode, ins, outs);
-  } else if (ins.size() == 2 && outs.size() == 1) {
+  } else if (nodeIns.size() == 2 && nodeOuts.size() == 1) {
     code = writeBinaryOperator(computeNode, ins, outs);
-  } else if (ins.size() == 3 && outs.size() == 1) {
+  } else if (nodeIns.size() == 3 && nodeOuts.size() == 1) {
     code = writeTernaryOperator(computeNode, ins, outs);
   } else {
     code = writeCustomOperator(computeNode, ins, outs);
@@ -368,6 +371,7 @@ std::string dnnc::cppCodeGen::write(opNode &computeNode) {
 
 std::string dnnc::cppCodeGen::writeConstantOperator(opNode &computeNode,
                                                     std::vector<node *> &outs) {
+  // std::cout << "DBG: " << outs.size() << "\n";
   std::string code;
 
   assert(outs.size() == 1);
@@ -411,6 +415,8 @@ std::string dnnc::cppCodeGen::writeConstantOperator(opNode &computeNode,
 std::string dnnc::cppCodeGen::writeUnaryOperator(opNode &computeNode,
                                                  std::vector<node *> &ins,
                                                  std::vector<node *> &outs) {
+  // std::cout << "DBG: " << computeNode.name() << " " << ins.size() << " " <<
+  // outs.size() << "\n";
   std::string code;
 
   assert(ins.size() == 1 && outs.size() == 1);
@@ -455,6 +461,8 @@ std::string dnnc::cppCodeGen::writeUnaryOperator(opNode &computeNode,
 std::string dnnc::cppCodeGen::writeBinaryOperator(opNode &computeNode,
                                                   std::vector<node *> &ins,
                                                   std::vector<node *> &outs) {
+  // std::cout << "DBG: " << computeNode.name() << " " << ins.size() << " " <<
+  // outs.size() << "\n";
   std::string code;
 
   assert(ins.size() == 2 && outs.size() == 1);
@@ -500,6 +508,8 @@ std::string dnnc::cppCodeGen::writeBinaryOperator(opNode &computeNode,
 std::string dnnc::cppCodeGen::writeTernaryOperator(opNode &computeNode,
                                                    std::vector<node *> &ins,
                                                    std::vector<node *> &outs) {
+  // std::cout << "DBG: " << computeNode.name() << " " << ins.size() << " " <<
+  // outs.size() << "\n";
   std::string code;
 
   assert(ins.size() == 3 && outs.size() == 1);
@@ -552,7 +562,6 @@ std::string dnnc::cppCodeGen::writeCustomOperator(opNode &computeNode,
   std::string code =
       _tab + "// operator " + opCode + " is not supported yet.\n";
   code += _tab + "// Please file a enhancement request at \n";
-  code += _tab +
-          "//        https://github.com/ai-techsystems/dnnCompiler/issues \n";
+  code += _tab + "//        https://github.com/ai-techsystems/deepC/issues \n";
   return code;
 }

test/parser/unitOperators.py

@@ -15,13 +15,17 @@ def find(self, pattern, path):
         return result
 
     def test_readAllOnnxFiles(self):
-        # mute stdout
-        sys_stdout = sys.stdout
-        f = open(os.devnull, 'w')
-        sys.stdout = f
+        debug = False;
+        if debug == False :
+            # mute stdout
+            sys_stdout = sys.stdout
+            f = open(os.devnull, 'w')
+            sys.stdout = f
 
         onnx_files = self.find('*.onnx', 'parser')
         for onnx_file in onnx_files:
+            if ( debug ):
+                print("testing ", onnx_file, flush=True)
             cpp_file = os.path.splitext(os.path.basename(onnx_file))[0]+'.cpp'
             bundle_dir = os.path.dirname(onnx_file);
             parser = read_onnx.pbReader()
@@ -35,7 +39,8 @@ def test_readAllOnnxFiles(self):
             os.remove(cpp_file)
 
         # unmute stdout
-        sys.stdout = sys_stdout
+        if debug == False :
+            sys.stdout = sys_stdout
 
         print("read %d files." %len(onnx_files))
         assert(len(onnx_files)==130)