Merge pull request #199 from ROCmSoftwarePlatform/onnx-output

onnx output node parsing

src/onnx/onnx.cpp

@@ -1150,9 +1150,9 @@ struct onnx_parser
                 instructions[name] = prog.add_parameter(name, s);
             }
         }
-        for(auto&& p : nodes)
+        for(auto&& output : graph.output())
         {
-            this->parse_node(p.first);
+            this->parse_node(output.name());
         }
     }
 

test/onnx/constant_scalar.onnx

-shape-gather-example:O
-2value"Constant*
-value**

Bconst_tensor 
constantb
-
z
+constant-scalar-example:R
+0
0"Constant*!
+value*
*

Bconst_tensor 

test-constantb
+
0
 
 

 
B
\ No newline at end of file

test/onnx/onnx_test.cpp

@@ -470,8 +470,8 @@ TEST_CASE(flatten_test)
 {
     migraphx::program p;
     auto l0 = p.add_parameter("0", migraphx::shape{migraphx::shape::float_type, {2, 3, 4, 5}});
-    p.add_instruction(migraphx::op::flatten{1}, l0);
     p.add_instruction(migraphx::op::flatten{2}, l0);
+    p.add_instruction(migraphx::op::flatten{1}, l0);
     auto prog = migraphx::parse_onnx("flatten_test.onnx");
 
     EXPECT(p == prog);
@@ -524,7 +524,7 @@ TEST_CASE(constant_test)
 TEST_CASE(constant_test_scalar)
 {
     migraphx::program p;
-    p.add_literal(migraphx::literal{migraphx::shape{migraphx::shape::int32_type}, {1}});
+    p.add_literal(migraphx::literal{migraphx::shape{migraphx::shape::int32_type, {1}}, {1}});
     auto prog = migraphx::parse_onnx("constant_scalar.onnx");
 
     EXPECT(p == prog);

test/onnx/sum_test.onnx

-sum-example:e
+sum-example:a
 
 
0
 
1
-
2
3"Sumtest-dropoutZ
+
2
3"Sumtest-sumZ
 
0
 
 

@@ -15,7 +15,7 @@
 
 

 b
-
2
+
3
 
 

 B
\ No newline at end of file

test/onnx/unknown_test.onnx

-unknown-example:
+unknown-example:

 
 
0
 
1
2"Unknown
-
-
2"Unknowntest-unknownZ
+
+
2
3"Unknowntest-unknownZ
 
0
 

 
@@ -14,7 +14,7 @@
 

 
 b
-
2
+
3