Commit e59e3058 authored by Paul's avatar Paul
Browse files

Fix impl issues

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