Changes

Author: NeiroYT

app/Graph/onnx_subgraphs.cpp

@@ -19,8 +19,11 @@ void alexnet_inf_careless(Graph& graph, const RuntimeOptions& options,
   auto* o = new Tensor(output);
   auto* i = new Tensor(input);
   graph.inference(options);
-  graph.setOutput(*o);
-  graph.setInput(*i);
+  if (graph.getLayersCount() == 0) {
+    throw std::runtime_error("No layers");
+  }
+  graph.setOutput(graph.getLayerFromID(graph.getLayersCount() - 1), *o);
+  graph.setInput(graph.getLayerFromID(0), *i);
 }
 
 void alexnet_comparison() {
@@ -45,7 +48,7 @@ void alexnet_comparison() {
   RuntimeOptions options;
   Graph graph;
   Graph graph2;
-  build_graph_linear(graph, input, output, options, true);
+  build_graph_linear(graph, input, output, options, true, false);
   Graph subgraph;
   std::shared_ptr<Layer> layer_0 = std::make_shared<ConvolutionalLayer>();
   std::shared_ptr<Layer> layer_1 = std::make_shared<EWLayer>("relu");
@@ -57,9 +60,11 @@ void alexnet_comparison() {
   Tensor input_c = input;
   Tensor output_c = output;
   auto time1 = elapsed_time_avg<double, std::milli>(
-      2, alexnet_inf_careless, graph, options, input_c, output_c);
+      4, alexnet_inf_careless, graph, options, input_c, output_c);
+  print_time_stats(graph);
   auto time2 = elapsed_time_avg<double, std::milli>(
-      2, alexnet_inf_careless, graph2, options, input_c, output_c);
+      4, alexnet_inf_careless, graph2, options, input_c, output_c);
+  print_time_stats(graph2);
   std::cout << time1 << " for unchanged graph\n";
   std::cout << time2 << " for convrelu graph\n";
 }

include/graph/graph.hpp

@@ -176,16 +176,6 @@ class Graph {
     start_ = layer->getID();
   }
 
-  void setInput(Tensor& vec) {
-    if (layers_.empty()) {
-      throw std::invalid_argument("No layers in graph");
-    }
-    int id = layers_.front()->getID();
-
-    inten_ = {vec};
-    start_ = id;
-  }
-
   void addSingleLayer(const std::shared_ptr<Layer>& layer) {
     if (!layer) return;
 
@@ -459,19 +449,6 @@ class Graph {
     }
   }
 
-  void setOutput(Tensor& vec) {
-    if (layers_.empty()) {
-      throw std::invalid_argument("No layers in graph");
-    }
-    end_ = layers_.back()->getID();
-    outtenres_ = &vec;
-    if (outten_.empty()) {
-      std::vector<int> vec1 = {1, 7, 1, 0};
-      Tensor start = make_tensor(vec1);
-      outten_.push_back(start);
-    }
-  }
-
 #ifdef ENABLE_STATISTIC_TENSORS
   std::vector<Tensor> getTensors() { return tensors_; }
 #endif