Merge branch 'simplify_1_mul_div_ops' into divide_by_zero_check

src/include/migraphx/op/cosh.hpp

@@ -24,16 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_COSH_HPP
 #define MIGRAPHX_GUARD_OPERATORS_COSH_HPP
 
-#include <array>
-#include <migraphx/op/unary.hpp>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/unary.hpp>
 #include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/deconvolution.hpp

@@ -24,16 +24,13 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_DECONVOLUTION_HPP
 #define MIGRAPHX_GUARD_OPERATORS_DECONVOLUTION_HPP
 
-#include <array>
 #include <migraphx/op/common.hpp>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
-#include <migraphx/dfor.hpp>
+#include <migraphx/value.hpp>
+#include <migraphx/argument.hpp>
 #include <migraphx/par_dfor.hpp>
+#include <migraphx/shape_for_each.hpp>
 #include <cmath>
 #include <utility>
 

src/include/migraphx/op/dequantizelinear.hpp

@@ -24,20 +24,12 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_DEQUANTIZE_LINEAR_HPP
 #define MIGRAPHX_GUARD_OPERATORS_DEQUANTIZE_LINEAR_HPP
 
-#include <array>
-#include <migraphx/op/common.hpp>
-#include <migraphx/operation.hpp>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/argument.hpp>
 #include <migraphx/par_for.hpp>
 #include <migraphx/value.hpp>
-#include <migraphx/op/normalize_attribute.hpp>
-#include <migraphx/tune_axis.hpp>
 #include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/div.hpp

@@ -24,16 +24,8 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_DIV_HPP
 #define MIGRAPHX_GUARD_OPERATORS_DIV_HPP
 
-#include <array>
-#include <migraphx/op/binary.hpp>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
-#include <cmath>
-#include <utility>
+#include <migraphx/op/binary.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/dot.hpp

@@ -24,16 +24,10 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_DOT_HPP
 #define MIGRAPHX_GUARD_OPERATORS_DOT_HPP
 
-#include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
+#include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/gemm.hpp>
-#include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/elu.hpp

@@ -24,15 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_ELU_HPP
 #define MIGRAPHX_GUARD_OPERATORS_ELU_HPP
 
-#include <array>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/unary.hpp>
 #include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/equal.hpp

@@ -24,11 +24,8 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_EQUAL_HPP
 #define MIGRAPHX_GUARD_OPERATORS_EQUAL_HPP
 
-#include <migraphx/op/binary.hpp>
-#include <migraphx/operation.hpp>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/float_equal.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/binary.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/exp.hpp

@@ -24,16 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_EXP_HPP
 #define MIGRAPHX_GUARD_OPERATORS_EXP_HPP
 
-#include <array>
-#include <migraphx/op/unary.hpp>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/unary.hpp>
 #include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/flatten.hpp

@@ -24,18 +24,11 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_FLATTEN_HPP
 #define MIGRAPHX_GUARD_OPERATORS_FLATTEN_HPP
 
-#include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
+#include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/value.hpp>
 #include <migraphx/op/normalize_attribute.hpp>
-#include <migraphx/lifetime.hpp>
-#include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/gathernd.hpp

@@ -27,6 +27,7 @@
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/shape_for_each.hpp>
 #include <migraphx/par_for.hpp>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/get_tuple_elem.hpp

@@ -26,10 +26,8 @@
 
 #include "migraphx/errors.hpp"
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/argument.hpp>
 #include <utility>
 
 namespace migraphx {

src/include/migraphx/op/identity.hpp

@@ -24,15 +24,8 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_IDENTITY_HPP
 #define MIGRAPHX_GUARD_OPERATORS_IDENTITY_HPP
 
-#include <array>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
-#include <migraphx/config.hpp>
-#include <cmath>
-#include <utility>
+#include <migraphx/op/unary.hpp>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/if_op.hpp

@@ -26,7 +26,6 @@
 
 #include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/functional.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/module.hpp>

src/include/migraphx/op/leaky_relu.hpp

@@ -24,15 +24,8 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LEAKY_RELU_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LEAKY_RELU_HPP
 
-#include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
-#include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/less.hpp

@@ -24,10 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LESS_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LESS_HPP
 
-#include <migraphx/op/binary.hpp>
-#include <migraphx/operation.hpp>
-#include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/binary.hpp>
+#include <cmath>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/load.hpp

@@ -24,14 +24,11 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LOAD_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LOAD_HPP
 
-#include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/functional.hpp>
 #include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/lifetime.hpp>
-#include <cmath>
-#include <utility>
+#include <migraphx/op/normalize_attribute.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/log.hpp

@@ -24,16 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LOG_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LOG_HPP
 
-#include <array>
-#include <migraphx/op/unary.hpp>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/literal.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/unary.hpp>
 #include <cmath>
-#include <utility>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/logical_and.hpp

@@ -24,10 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LOGICAL_AND_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LOGICAL_AND_HPP
 
-#include <migraphx/op/binary.hpp>
-#include <migraphx/operation.hpp>
-#include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/binary.hpp>
+#include <cmath>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/logical_or.hpp

@@ -24,10 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LOGICAL_OR_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LOGICAL_OR_HPP
 
-#include <migraphx/op/binary.hpp>
-#include <migraphx/operation.hpp>
-#include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/binary.hpp>
+#include <cmath>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/logical_xor.hpp

@@ -24,10 +24,9 @@
 #ifndef MIGRAPHX_GUARD_OPERATORS_LOGICAL_XOR_HPP
 #define MIGRAPHX_GUARD_OPERATORS_LOGICAL_XOR_HPP
 
-#include <migraphx/op/binary.hpp>
-#include <migraphx/operation.hpp>
-#include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/op/binary.hpp>
+#include <cmath>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {