Reduce operators.hpp includes

src/include/migraphx/op/pooling.hpp

@@ -6,6 +6,7 @@
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/stringutils.hpp>
 #include <migraphx/streamutils.hpp>
+#include <migraphx/functional.hpp>
 #include <migraphx/literal.hpp>
 #include <migraphx/shape_for_each.hpp>
 #include <migraphx/int_divide.hpp>

test/ref_ops_test.cpp

 #include <iostream>
 #include <vector>
 #include <migraphx/literal.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
+#include <migraphx/op/batch_norm_inference.hpp>
 #include <migraphx/instruction.hpp>
 #include <migraphx/quantization.hpp>
 #include <migraphx/ref/target.hpp>

test/ref_rnn_ops_test.cpp

 #include <iostream>
 #include <vector>
 #include <migraphx/literal.hpp>
-#include <migraphx/op/rnn.hpp>
-#include <migraphx/op/gru.hpp>
-#include <migraphx/op/lstm.hpp>
-#include <migraphx/op/rnn_last_hs_output.hpp>
-#include <migraphx/op/rnn_last_cell_output.hpp>
-#include <migraphx/op/undefined.hpp>
-#include <migraphx/op/concat.hpp>
+#include <migraphx/op/common.hpp>
 #include <migraphx/instruction.hpp>
 #include <migraphx/ref/target.hpp>
 #include <migraphx/verify.hpp>

test/verify/quant_conv_default_mode.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/quant_convolution.hpp>
 
 struct quant_conv_default_mode : verify_program<quant_conv_default_mode>
 {

test/verify/quant_conv_valid_mode.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/quant_convolution.hpp>
 
 struct quant_conv_valid_mode : verify_program<quant_conv_valid_mode>
 {

test/verify/test_arg_ops.cpp

@@ -2,7 +2,8 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/argmax.hpp>
+#include <migraphx/op/argmin.hpp>
 
 template <class T, int Axis>
 struct test_arg_ops : verify_program<test_arg_ops<T, Axis>>

test/verify/test_avg_pooling_1d.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
 
 struct test_avg_pooling_1d : verify_program<test_avg_pooling_1d>
 {

test/verify/test_avg_pooling_3d.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
 
 struct test_avg_pooling_3d : verify_program<test_avg_pooling_3d>
 {

test/verify/test_avg_pooling_3d_opt.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
 
 struct test_avg_pooling_3d_opt : verify_program<test_avg_pooling_3d_opt>
 {

test/verify/test_avg_pooling_ceil_3d.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
 
 struct test_avg_pooling_ceil_3d : verify_program<test_avg_pooling_ceil_3d>
 {

test/verify/test_batchnorm_1d_per_actv.cpp

@@ -6,7 +6,7 @@
 
 #include <migraphx/make_op.hpp>
 
-#include <migraphx/operators.hpp>
+#include <migraphx/op/batch_norm_inference.hpp>
 
 struct test_batchnorm_1d_per_actv : verify_program<test_batchnorm_1d_per_actv>
 {

test/verify/test_batchnorm_2d_per_actv.cpp

@@ -6,7 +6,7 @@
 
 #include <migraphx/make_op.hpp>
 
-#include <migraphx/operators.hpp>
+#include <migraphx/op/batch_norm_inference.hpp>
 
 struct test_batchnorm_2d_per_actv : verify_program<test_batchnorm_2d_per_actv>
 {

test/verify/test_batchnorm_3d_per_actv.cpp

@@ -6,7 +6,7 @@
 
 #include <migraphx/make_op.hpp>
 
-#include <migraphx/operators.hpp>
+#include <migraphx/op/batch_norm_inference.hpp>
 
 struct test_batchnorm_3d_per_actv : verify_program<test_batchnorm_3d_per_actv>
 {

test/verify/test_conv_bn_add.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/common.hpp>
 
 // struct test_conv_bn_add : verify_program<test_conv_bn_add>
 // {

test/verify/test_global_avg_pooling.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
 #include <migraphx/instruction.hpp>
 
 struct test_global_avg_pooling : verify_program<test_global_avg_pooling>

test/verify/test_global_max_pooling.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/pooling.hpp>
 #include <migraphx/instruction.hpp>
 
 struct test_global_max_pooling : verify_program<test_global_max_pooling>

test/verify/test_group_conv.cpp

@@ -2,7 +2,7 @@
 #include "verify_program.hpp"
 #include <migraphx/program.hpp>
 #include <migraphx/generate.hpp>
-#include <migraphx/operators.hpp>
+#include <migraphx/op/convolution.hpp>
 
 struct test_group_conv : verify_program<test_group_conv>
 {

test/verify/test_gru_bidirct.cpp

@@ -6,7 +6,7 @@
 
 #include <migraphx/serialize.hpp>
 
-#include <migraphx/operators.hpp>
+#include <migraphx/op/common.hpp>
 
 struct test_gru_bidirct : verify_program<test_gru_bidirct>
 {

test/verify/test_gru_bidirct_3args.cpp

@@ -6,7 +6,7 @@
 
 #include <migraphx/make_op.hpp>
 
-#include <migraphx/operators.hpp>
+#include <migraphx/op/common.hpp>
 
 struct test_gru_bidirct_3args : verify_program<test_gru_bidirct_3args>
 {

test/verify/test_gru_bidirct_3args_und.cpp

@@ -6,7 +6,7 @@
 
 #include <migraphx/serialize.hpp>
 
-#include <migraphx/operators.hpp>
+#include <migraphx/op/common.hpp>
 
 struct test_gru_bidirct_3args_und : verify_program<test_gru_bidirct_3args_und>
 {