Unverified Commit 99bcbf02 authored by mvermeulen's avatar mvermeulen Committed by GitHub
Browse files

Merge branch 'develop' into cse-fix

parents c0640134 92c62bd0
...@@ -675,7 +675,6 @@ struct onnx_parser ...@@ -675,7 +675,6 @@ struct onnx_parser
float epsilon = 1e-5f; float epsilon = 1e-5f;
float momentum = 0.9f; float momentum = 0.9f;
op::batch_norm_inference::bn_infer_mode_t bn_mode = op::batch_norm_inference::spatial; op::batch_norm_inference::bn_infer_mode_t bn_mode = op::batch_norm_inference::spatial;
bool is_test = false;
if(contains(attributes, "epsilon")) if(contains(attributes, "epsilon"))
{ {
epsilon = parse_value(attributes.at("epsilon")).at<float>(); epsilon = parse_value(attributes.at("epsilon")).at<float>();
...@@ -684,17 +683,12 @@ struct onnx_parser ...@@ -684,17 +683,12 @@ struct onnx_parser
{ {
momentum = parse_value(attributes.at("momentum")).at<float>(); momentum = parse_value(attributes.at("momentum")).at<float>();
} }
if(contains(attributes, "is_test"))
{
is_test = parse_value(attributes.at("is_test")).at<uint64_t>() > 0;
}
if(contains(attributes, "spatial")) if(contains(attributes, "spatial"))
{ {
bn_mode = (parse_value(attributes.at("spatial")).at<uint64_t>() > 0) bn_mode = (parse_value(attributes.at("spatial")).at<uint64_t>() > 0)
? op::batch_norm_inference::spatial ? op::batch_norm_inference::spatial
: op::batch_norm_inference::per_activation; : op::batch_norm_inference::per_activation;
} }
(void)is_test;
op::batch_norm_inference op{epsilon, momentum, bn_mode}; op::batch_norm_inference op{epsilon, momentum, bn_mode};
return prog.add_instruction(op, std::move(args)); return prog.add_instruction(op, std::move(args));
} }
......
constant-scalar-example:R constant-scalar-example:R
00"Constant*! 00"Constant*!
value**B const_tensor  test-constantb value**B const_tensor  test-constantb
0 0
 
B B
\ No newline at end of file
......
 conv-example:­
8
0
1
23"Conv*
dilations@@ *
strides@@  test_convZ
0




 Z
1




Z
2

b
3




B
This diff is collapsed.
implicit_bcast-example:u

0
12"Addtest-multi_bcastZ
0




Z
1



b
2




B
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment