Commit e59e3058 authored by Paul's avatar Paul
Browse files

Fix impl issues

parent 8cd2c875
...@@ -15,9 +15,9 @@ struct program_impl; ...@@ -15,9 +15,9 @@ struct program_impl;
struct program struct program
{ {
program();; program();
program(program&&) = default; program(program&&) noexcept;
program& operator=(program&&) = default; program& operator=(program&&);
~program(); ~program();
template <class... Ts> template <class... Ts>
......
...@@ -41,13 +41,14 @@ struct onnx_parser ...@@ -41,13 +41,14 @@ struct onnx_parser
{ {
using attribute_map = std::unordered_map<std::string, onnx::AttributeProto>; using attribute_map = std::unordered_map<std::string, onnx::AttributeProto>;
using node_map = std::unordered_map<std::string, onnx::NodeProto>; using node_map = std::unordered_map<std::string, onnx::NodeProto>;
using op_func = std::function<rtg::instruction*(attribute_map, std::vector<rtg::instruction*>)>;
node_map nodes; node_map nodes;
std::unordered_map<std::string, rtg::instruction*> instructions; std::unordered_map<std::string, rtg::instruction*> instructions;
rtg::program prog = std::make_shared<rtg::program>(); rtg::program prog = rtg::program();
std::unordered_map< std::unordered_map<
std::string, std::string,
std::function<rtg::instruction*(attribute_map, std::vector<rtg::instruction*>)>> op_func>
ops; ops;
onnx_parser() onnx_parser()
...@@ -305,8 +306,7 @@ int main(int argc, char const* argv[]) ...@@ -305,8 +306,7 @@ int main(int argc, char const* argv[])
} }
catch(...) catch(...)
{ {
if(parser.prog) parser.prog.print();
parser.prog.print();
throw; throw;
} }
parser.prog.print(); parser.prog.print();
......
...@@ -16,8 +16,9 @@ program::program() ...@@ -16,8 +16,9 @@ program::program()
: impl(std::make_unique<program_impl>()) : impl(std::make_unique<program_impl>())
{} {}
program::~program() program::program(program&&) noexcept = default;
{} program& program::operator=(program&&) = default;
program::~program() = default;
instruction* program::add_instruction(operation op, std::vector<instruction*> args) instruction* program::add_instruction(operation op, std::vector<instruction*> args)
{ {
......
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