Module impl (#678)

* add an api get_main_module

* clang format

* modify onnx unit test for module

* clang format

* refactor ops unit test with the get_main_module

* clang format

* code backup

* clang format

* refine module c api

* add python api for module

* clang format

* fix a python api issue

* clang format

* fix cppcheck error

* clang format

* refine unit tests changes

* clang format

* code backup

* code backup

* clang format

* defer some changes to later PRs

* change return of get_main_module from ref to pointer

* clang format

* add unit tests for the get_main_module_api

* clang format

* fix cppcheck error

* clang format

* fix cppcheck error

* clang format

* add more unit tests for more code change coverage

* clang format

* fixed a unit test error

* clang format

* fix unit test

* clang format

* code backup

* code change for more code coverage

* change program to module in various passes and matcher

* clang format

* modify the pass API

* code backup

* code backup

* clang format

* code backup

* clang format

* Add option to no generate a destroy method

* Formatting

* fix some review comments

* clang format

* fix review comments

* clang format

* clang format

* code backup

* code backup

* clang format

* fix cppcheck errors

* clang format

* clang format

* fix build errors

* clang format

* modify gpu unit tests to using module

* clang format

* fix cppcheck error

* clang format

* Add flag to enable cpu backend

* Make buffers shared

* Enable optimizations

* Formatting

* fix review comments

* code backup

* clang format

* code backup

* clang format

* fix a bug related to a unit test

* clang format

* clang format

* fix a build error

* remove unnecessary code

* remove unnecessary files

* code backup

* clang format

* remove the compile function from the module class

* clang format

* clang format

* remove the context parameter from the from_value method of the module class

* code refinement

* clang format

* merge changes from develop branch

* clang format

* fix cppcheck error

* clang format

* fix a build error

* fixed a merge error

* fix cppcheck error

* fixed review comments

* clang format

* fix cppcheck error

* fix a cppcheck error

* fix cppcheck error

* fix build error caused by merge

* Add missing has_op function

* Formatting

* merge changes from develop branch

* fix a cppcheck error

* fixed some review comments

* clang format

* remove the begin/end function of the program class

* clang format

* refine code and fix cppcheck error

* clang format

* fix review comments

* clang format

* fix review comments

* clang format

* add unit tests for more code coverage

* clang format

* fix review comments

* clang format

* fix review comments

* clang format

* fix a build error in debug mode

* clang format
Co-authored-by: Paul <pfultz2@yahoo.com>

src/include/migraphx/propagate_constant.hpp

@@ -7,8 +7,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Replace instructions which take all literals with a literal of the computation.

src/include/migraphx/remap.hpp

@@ -8,8 +8,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Decompose operators.

src/include/migraphx/rewrite_batchnorm.hpp

@@ -8,8 +8,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Rewrite batchnorm to a multiply and add.

src/include/migraphx/rewrite_pooling.hpp

@@ -7,8 +7,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Rewrite pooling to reduce_mean

src/include/migraphx/rewrite_rnn.hpp

@@ -11,8 +11,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Rewrite rnn to gemm and add.

src/include/migraphx/schedule.hpp

@@ -9,8 +9,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Schedule instructions for concurrent execution

src/include/migraphx/schedule_model.hpp

@@ -15,8 +15,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 struct operation;
 
 #ifdef DOXYGEN

src/include/migraphx/simplify_algebra.hpp

@@ -7,8 +7,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Simplify many algebraic instructions to more efficient versions.

src/include/migraphx/simplify_reshapes.hpp

@@ -8,8 +8,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 /**
  * Eliminate redundant reshapes.

src/onnx/parse_onehot.cpp

@@ -35,7 +35,7 @@ struct parse_onehot : op_parser<parse_onehot>
 
         auto type = args[2]->get_shape().type();
         shape s{type, {depth, depth}};
-        auto l_val      = info.mm->add_literal({s, depth_input});
+        auto l_val      = info.add_literal({s, depth_input});
         auto gather_out = info.add_instruction(make_op("gather", {{"axis", 0}}), {l_val, args[0]});
 
         // Finally, we need a transpose to move the inner most dim to the axis dim

src/onnx/parse_pad.cpp

@@ -70,7 +70,7 @@ instruction_ref reflect_pad(const onnx_parser::node_info& info,
         {
             *starts_it = idx;
             *ends_it   = *starts_it + 1;
-            slices.push_back(info.mm->add_instruction(
+            slices.push_back(info.add_instruction(
                 make_op("slice", {{"axes", axes}, {"starts", starts}, {"ends", ends}}), input));
         }
         // when padding on the left side, the outermost pad should be at the beginning
@@ -83,7 +83,7 @@ instruction_ref reflect_pad(const onnx_parser::node_info& info,
             slices.push_back(info.add_instruction(
                 make_op("slice", {{"axes", axes}, {"starts", starts}, {"ends", ends}}), input));
         }
-        input = info.mm->add_instruction(make_op("concat", {{"axis", axis}}), slices);
+        input = info.add_instruction(make_op("concat", {{"axis", axis}}), slices);
     }
     return input;
 }

src/py/migraphx_py.cpp

@@ -208,17 +208,6 @@ migraphx::shape to_shape(const py::buffer_info& info)
     }
 }
 
-namespace migraphx {
-inline namespace MIGRAPHX_INLINE_NS {
-struct module_wrap
-{
-    migraphx::program* prog;
-    operator const migraphx::program&() const { return *prog; }
-    operator migraphx::program&() { return *prog; }
-};
-} // namespace MIGRAPHX_INLINE_NS
-} // namespace migraphx
-
 MIGRAPHX_PYBIND11_MODULE(migraphx, m)
 {
     py::class_<migraphx::shape>(m, "shape")
@@ -258,12 +247,11 @@ MIGRAPHX_PYBIND11_MODULE(migraphx, m)
 
     py::class_<migraphx::target>(m, "target");
 
-    py::class_<migraphx::module_wrap>(m, "module")
-        .def("print", [](const migraphx::module_wrap& mm) { std::cout << *mm.prog << std::endl; })
-        .def("__eq__", std::equal_to<migraphx::program>{})
-        .def("__ne__", std::not_equal_to<migraphx::program>{})
-        .def("__repr__",
-             [](const migraphx::module_wrap& mm) { return migraphx::to_string(*mm.prog); });
+    py::class_<migraphx::module>(m, "module")
+        .def("print", [](const migraphx::module& mm) { std::cout << mm << std::endl; })
+        .def("__eq__", std::equal_to<migraphx::module>{})
+        .def("__ne__", std::not_equal_to<migraphx::module>{})
+        .def("__repr__", [](const migraphx::module& mm) { return migraphx::to_string(mm); });
 
     py::class_<migraphx::program>(m, "program")
         .def("clone", [](migraphx::program& p) { return *(new migraphx::program(p)); })
@@ -284,7 +272,7 @@ MIGRAPHX_PYBIND11_MODULE(migraphx, m)
         .def("get_main_module",
              [](migraphx::program& p) {
                  auto* mm = p.get_main_module();
-                 return migraphx::module_wrap{mm};
+                 return *mm;
              })
         .def("run",
              [](migraphx::program& p, py::dict params) {

src/targets/cpu/include/migraphx/cpu/lowering.hpp

@@ -7,15 +7,14 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 namespace cpu {
 
 struct lowering
 {
     std::string name() const { return "cpu::lowering"; }
-    void apply(module& p) const;
+    void apply(module& m) const;
 };
 
 } // namespace cpu

src/targets/cpu/lowering.cpp

@@ -526,14 +526,14 @@ struct cpu_literal
 
 struct cpu_apply
 {
-    module* prog;
+    module* modl;
     std::unordered_map<std::string, std::function<instruction_ref(instruction_ref)>> apply_map{};
     std::unordered_map<instruction_ref, std::string> prog_output_names{};
     instruction_ref last{};
 
     void create_output_names()
     {
-        this->last = instruction::get_output_alias(std::prev(prog->end()));
+        this->last = instruction::get_output_alias(std::prev(modl->end()));
         if(this->last->name() == "@return")
         {
             const auto& prog_outputs = last->inputs();
@@ -558,7 +558,7 @@ struct cpu_apply
             auto&& op = ins->get_operator();
             if(allocate)
                 replace(ins, make_op(cpu_name, op.to_value()));
-            return prog->replace_instruction(ins, make_op(cpu_name, op.to_value()), ins->inputs());
+            return modl->replace_instruction(ins, make_op(cpu_name, op.to_value()), ins->inputs());
         });
     }
 
@@ -610,7 +610,7 @@ struct cpu_apply
     void apply()
     {
         init();
-        for(auto it : iterator_for(*prog))
+        for(auto it : iterator_for(*modl))
         {
             if(it->name() == "@literal")
             {
@@ -629,7 +629,7 @@ struct cpu_apply
 
     instruction_ref apply_literal(instruction_ref ins) const
     {
-        return prog->replace_instruction(ins, cpu_literal{ins->get_literal().get_argument()});
+        return modl->replace_instruction(ins, cpu_literal{ins->get_literal().get_argument()});
     }
 
     instruction_ref apply_pooling(instruction_ref ins)
@@ -651,7 +651,7 @@ struct cpu_apply
     {
         auto inputs = ins->inputs();
         inputs.push_back(insert_allocation(ins, ins->get_shape()));
-        return prog->replace_instruction(ins, op, inputs);
+        return modl->replace_instruction(ins, op, inputs);
     }
 
     instruction_ref insert_allocation(instruction_ref ins, const shape& s)
@@ -659,18 +659,18 @@ struct cpu_apply
         auto ins_alias = instruction::get_output_alias(ins);
         if(last->name() == "@return" and prog_output_names.count(ins_alias) > 0)
         {
-            return prog->add_parameter(prog_output_names[ins_alias], s);
+            return modl->add_parameter(prog_output_names[ins_alias], s);
         }
         else if(ins == last)
         {
-            return prog->add_parameter("output", s);
+            return modl->add_parameter("output", s);
         }
 
-        return prog->insert_instruction(ins, make_op("cpu::allocate", {{"shape", to_value(s)}}));
+        return modl->insert_instruction(ins, make_op("cpu::allocate", {{"shape", to_value(s)}}));
     }
 };
 
-void lowering::apply(module& p) const { cpu_apply{&p}.apply(); }
+void lowering::apply(module& m) const { cpu_apply{&m}.apply(); }
 
 } // namespace cpu
 } // namespace MIGRAPHX_INLINE_NS

src/targets/gpu/fuse_ops.cpp

@@ -356,7 +356,7 @@ struct find_triadd_layernorm
             match::used_once(), match::all_of[match::inputs()](match::standard_shape()))));
     }
 
-    void apply(program& p, const match::matcher_result& r) const
+    void apply(module& p, const match::matcher_result& r) const
     {
         auto ins    = r.result;
         auto triadd = ins->inputs().front();

src/targets/gpu/include/migraphx/gpu/analyze_streams.hpp

@@ -7,8 +7,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 namespace gpu {
 

src/targets/gpu/include/migraphx/gpu/eliminate_workspace.hpp

@@ -7,8 +7,7 @@
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
-struct program;
-using module = program;
+struct module;
 
 namespace gpu {
 

src/targets/gpu/include/migraphx/gpu/fuse_ops.hpp

@@ -7,8 +7,7 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
-struct program;
-using module = program;
+struct module;
 
 namespace gpu {