Fixed conflicts

4c031df7 · wsttiger · d32653a5 · ed5f9897 · 4c031df7 · 4c031df7
Commit 4c031df7 authored Nov 09, 2018 by wsttiger
20 changed files
--- a/test/constant_propagate_test.cpp
+++ b/test/constant_propagate_test.cpp
--- a/test/cpu_ops_test.cpp
+++ b/test/cpu_ops_test.cpp
--- a/test/dead_code_elimination_test.cpp
+++ b/test/dead_code_elimination_test.cpp
--- a/test/eliminate_allocation_test.cpp
+++ b/test/eliminate_allocation_test.cpp
--- a/test/eliminate_concat_test.cpp
+++ b/test/eliminate_concat_test.cpp
--- a/test/eliminate_contiguous_test.cpp
+++ b/test/eliminate_contiguous_test.cpp
--- a/test/eval_test.cpp
+++ b/test/eval_test.cpp
--- a/test/fwd_conv_batchnorm_rewrite_test.cpp
+++ b/test/fwd_conv_batchnorm_rewrite_test.cpp
--- a/test/gpu/miopen.cpp
+++ b/test/gpu/miopen.cpp
--- a/test/include/test.hpp
+++ b/test/include/test.hpp
--- a/test/literal_test.cpp
+++ b/test/literal_test.cpp
--- a/test/matcher.cpp
+++ b/test/matcher.cpp
--- a/test/memory_coloring_test.cpp
+++ b/test/memory_coloring_test.cpp
--- a/test/onnx/dropout_test.onnx
+++ b/test/onnx/dropout_test.onnx
--- a/test/onnx/onnx_test.cpp
+++ b/test/onnx/onnx_test.cpp
--- a/test/onnx/transpose_test.onnx
+++ b/test/onnx/transpose_test.onnx
--- a/test/op_shape_test.cpp
+++ b/test/op_shape_test.cpp
--- a/test/operation.cpp
+++ b/test/operation.cpp
--- a/test/output_alias.cpp
+++ b/test/output_alias.cpp
--- a/test/program_test.cpp
+++ b/test/program_test.cpp