Commit 5e066523 authored by Adam Procter's avatar Adam Procter

Formatting

parent 4ccb3757
...@@ -20,7 +20,7 @@ namespace ngraph ...@@ -20,7 +20,7 @@ namespace ngraph
{ {
namespace kernel namespace kernel
{ {
template <typename TI,typename TO> template <typename TI, typename TO>
void convert(TI* arg, TO* out, size_t count) void convert(TI* arg, TO* out, size_t count)
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
......
...@@ -23,7 +23,7 @@ namespace ngraph ...@@ -23,7 +23,7 @@ namespace ngraph
template <typename T> template <typename T>
void copy(T* arg, T* out, size_t count) void copy(T* arg, T* out, size_t count)
{ {
memcpy(out,arg,sizeof(T) * count); memcpy(out, arg, sizeof(T) * count);
} }
} }
} }
......
...@@ -24,7 +24,8 @@ namespace ngraph ...@@ -24,7 +24,8 @@ namespace ngraph
namespace kernel namespace kernel
{ {
template <typename T> template <typename T>
void equal(T* arg0, T* arg1, char* out, size_t count) // FIXME: temporarily char not bool void
equal(T* arg0, T* arg1, char* out, size_t count) // FIXME: temporarily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -21,7 +21,10 @@ namespace ngraph ...@@ -21,7 +21,10 @@ namespace ngraph
namespace kernel namespace kernel
{ {
template <typename T> template <typename T>
void greater(T* arg0, T* arg1, char* out, size_t count) // FIXME: temporarily char not bool void greater(T* arg0,
T* arg1,
char* out,
size_t count) // FIXME: temporarily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -21,7 +21,10 @@ namespace ngraph ...@@ -21,7 +21,10 @@ namespace ngraph
namespace kernel namespace kernel
{ {
template <typename T> template <typename T>
void greater_eq(T* arg0, T* arg1, char* out, size_t count) // FIXME: temporarily char not bool void greater_eq(T* arg0,
T* arg1,
char* out,
size_t count) // FIXME: temporarily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -21,7 +21,10 @@ namespace ngraph ...@@ -21,7 +21,10 @@ namespace ngraph
namespace kernel namespace kernel
{ {
template <typename T> template <typename T>
void less_eq(T* arg0, T* arg1, char* out, size_t count) // FIXME: temporarily char not bool void less_eq(T* arg0,
T* arg1,
char* out,
size_t count) // FIXME: temporarily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -20,7 +20,9 @@ namespace ngraph ...@@ -20,7 +20,9 @@ namespace ngraph
{ {
namespace kernel namespace kernel
{ {
void logical_not(char* arg, char* out, size_t count) // FIXME: temporararily char not bool void logical_not(char* arg,
char* out,
size_t count) // FIXME: temporararily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -24,7 +24,10 @@ namespace ngraph ...@@ -24,7 +24,10 @@ namespace ngraph
namespace kernel namespace kernel
{ {
template <typename T> template <typename T>
void not_equal(T* arg0, T* arg1, char* out, size_t count) // FIXME: temporarily char not bool void not_equal(T* arg0,
T* arg1,
char* out,
size_t count) // FIXME: temporarily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -25,7 +25,7 @@ namespace ngraph ...@@ -25,7 +25,7 @@ namespace ngraph
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
out[i] = std::pow(arg0[i],arg1[i]); out[i] = std::pow(arg0[i], arg1[i]);
} }
} }
} }
......
...@@ -21,7 +21,11 @@ namespace ngraph ...@@ -21,7 +21,11 @@ namespace ngraph
namespace kernel namespace kernel
{ {
template <typename T> template <typename T>
void select(char* arg0, T* arg1, T* arg2, T* out, size_t count) // FIXME: temporararily char not bool void select(char* arg0,
T* arg1,
T* arg2,
T* out,
size_t count) // FIXME: temporararily char not bool
{ {
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
{ {
......
...@@ -70,18 +70,34 @@ ...@@ -70,18 +70,34 @@
#include "ngraph/ops/tuple.hpp" #include "ngraph/ops/tuple.hpp"
#include "ngraph/pass/manager.hpp" #include "ngraph/pass/manager.hpp"
#include "ngraph/pass/topological_sort.hpp" #include "ngraph/pass/topological_sort.hpp"
#include "ngraph/runtime/ngvm/eigen/broadcast_scalar.hpp"
#include "ngraph/runtime/ngvm/eigen/broadcast_vector_colwise.hpp"
#include "ngraph/runtime/ngvm/eigen/broadcast_vector_rowwise.hpp"
#include "ngraph/runtime/ngvm/eigen/concat_matrix.hpp"
#include "ngraph/runtime/ngvm/eigen/concat_vector.hpp"
#include "ngraph/runtime/ngvm/eigen/dot.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_mult.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_slice.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_transpose.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_vector_product.hpp"
#include "ngraph/runtime/ngvm/eigen/reduce_matrix_columns.hpp"
#include "ngraph/runtime/ngvm/eigen/reduce_matrix_rows.hpp"
#include "ngraph/runtime/ngvm/eigen/reduce_to_scalar.hpp"
#include "ngraph/runtime/ngvm/eigen/replace_matrix_slice.hpp"
#include "ngraph/runtime/ngvm/eigen/replace_vector_slice.hpp"
#include "ngraph/runtime/ngvm/eigen/scalar_tensor_product.hpp"
#include "ngraph/runtime/ngvm/eigen/sum_matrix_columns.hpp"
#include "ngraph/runtime/ngvm/eigen/sum_matrix_rows.hpp"
#include "ngraph/runtime/ngvm/eigen/sum_to_scalar.hpp"
#include "ngraph/runtime/ngvm/eigen/vector_slice.hpp"
#include "ngraph/runtime/ngvm/external_function.hpp"
#include "ngraph/runtime/ngvm/instruction/abs.hpp" #include "ngraph/runtime/ngvm/instruction/abs.hpp"
#include "ngraph/runtime/ngvm/instruction/acos.hpp" #include "ngraph/runtime/ngvm/instruction/acos.hpp"
#include "ngraph/runtime/ngvm/instruction/add.hpp" #include "ngraph/runtime/ngvm/instruction/add.hpp"
#include "ngraph/runtime/ngvm/instruction/asin.hpp" #include "ngraph/runtime/ngvm/instruction/asin.hpp"
#include "ngraph/runtime/ngvm/instruction/atan.hpp" #include "ngraph/runtime/ngvm/instruction/atan.hpp"
#include "ngraph/runtime/ngvm/eigen/broadcast_scalar.hpp"
#include "ngraph/runtime/ngvm/eigen/broadcast_vector_colwise.hpp"
#include "ngraph/runtime/ngvm/eigen/broadcast_vector_rowwise.hpp"
#include "ngraph/runtime/ngvm/instruction/call.hpp" #include "ngraph/runtime/ngvm/instruction/call.hpp"
#include "ngraph/runtime/ngvm/instruction/ceiling.hpp" #include "ngraph/runtime/ngvm/instruction/ceiling.hpp"
#include "ngraph/runtime/ngvm/eigen/concat_matrix.hpp"
#include "ngraph/runtime/ngvm/eigen/concat_vector.hpp"
#include "ngraph/runtime/ngvm/instruction/constant.hpp" #include "ngraph/runtime/ngvm/instruction/constant.hpp"
#include "ngraph/runtime/ngvm/instruction/convert.hpp" #include "ngraph/runtime/ngvm/instruction/convert.hpp"
#include "ngraph/runtime/ngvm/instruction/copy.hpp" #include "ngraph/runtime/ngvm/instruction/copy.hpp"
...@@ -89,19 +105,14 @@ ...@@ -89,19 +105,14 @@
#include "ngraph/runtime/ngvm/instruction/cos.hpp" #include "ngraph/runtime/ngvm/instruction/cos.hpp"
#include "ngraph/runtime/ngvm/instruction/cosh.hpp" #include "ngraph/runtime/ngvm/instruction/cosh.hpp"
#include "ngraph/runtime/ngvm/instruction/divide.hpp" #include "ngraph/runtime/ngvm/instruction/divide.hpp"
#include "ngraph/runtime/ngvm/eigen/dot.hpp"
#include "ngraph/runtime/ngvm/instruction/equal.hpp" #include "ngraph/runtime/ngvm/instruction/equal.hpp"
#include "ngraph/runtime/ngvm/instruction/exp.hpp" #include "ngraph/runtime/ngvm/instruction/exp.hpp"
#include "ngraph/runtime/ngvm/instruction/floor.hpp" #include "ngraph/runtime/ngvm/instruction/floor.hpp"
#include "ngraph/runtime/ngvm/instruction/greater_eq.hpp"
#include "ngraph/runtime/ngvm/instruction/greater.hpp" #include "ngraph/runtime/ngvm/instruction/greater.hpp"
#include "ngraph/runtime/ngvm/instruction/less_eq.hpp" #include "ngraph/runtime/ngvm/instruction/greater_eq.hpp"
#include "ngraph/runtime/ngvm/instruction/less.hpp" #include "ngraph/runtime/ngvm/instruction/less.hpp"
#include "ngraph/runtime/ngvm/instruction/less_eq.hpp"
#include "ngraph/runtime/ngvm/instruction/log.hpp" #include "ngraph/runtime/ngvm/instruction/log.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_mult.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_slice.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_transpose.hpp"
#include "ngraph/runtime/ngvm/eigen/matrix_vector_product.hpp"
#include "ngraph/runtime/ngvm/instruction/maximum.hpp" #include "ngraph/runtime/ngvm/instruction/maximum.hpp"
#include "ngraph/runtime/ngvm/instruction/minimum.hpp" #include "ngraph/runtime/ngvm/instruction/minimum.hpp"
#include "ngraph/runtime/ngvm/instruction/multiply.hpp" #include "ngraph/runtime/ngvm/instruction/multiply.hpp"
...@@ -109,26 +120,15 @@ ...@@ -109,26 +120,15 @@
#include "ngraph/runtime/ngvm/instruction/not.hpp" #include "ngraph/runtime/ngvm/instruction/not.hpp"
#include "ngraph/runtime/ngvm/instruction/not_equal.hpp" #include "ngraph/runtime/ngvm/instruction/not_equal.hpp"
#include "ngraph/runtime/ngvm/instruction/power.hpp" #include "ngraph/runtime/ngvm/instruction/power.hpp"
#include "ngraph/runtime/ngvm/eigen/reduce_matrix_columns.hpp"
#include "ngraph/runtime/ngvm/eigen/reduce_matrix_rows.hpp"
#include "ngraph/runtime/ngvm/eigen/reduce_to_scalar.hpp"
#include "ngraph/runtime/ngvm/eigen/replace_matrix_slice.hpp"
#include "ngraph/runtime/ngvm/eigen/replace_vector_slice.hpp"
#include "ngraph/runtime/ngvm/instruction/return.hpp" #include "ngraph/runtime/ngvm/instruction/return.hpp"
#include "ngraph/runtime/ngvm/eigen/scalar_tensor_product.hpp"
#include "ngraph/runtime/ngvm/instruction/select.hpp" #include "ngraph/runtime/ngvm/instruction/select.hpp"
#include "ngraph/runtime/ngvm/instruction/sign.hpp" #include "ngraph/runtime/ngvm/instruction/sign.hpp"
#include "ngraph/runtime/ngvm/instruction/sin.hpp" #include "ngraph/runtime/ngvm/instruction/sin.hpp"
#include "ngraph/runtime/ngvm/instruction/sinh.hpp" #include "ngraph/runtime/ngvm/instruction/sinh.hpp"
#include "ngraph/runtime/ngvm/instruction/sqrt.hpp" #include "ngraph/runtime/ngvm/instruction/sqrt.hpp"
#include "ngraph/runtime/ngvm/instruction/subtract.hpp" #include "ngraph/runtime/ngvm/instruction/subtract.hpp"
#include "ngraph/runtime/ngvm/eigen/sum_matrix_columns.hpp"
#include "ngraph/runtime/ngvm/eigen/sum_matrix_rows.hpp"
#include "ngraph/runtime/ngvm/eigen/sum_to_scalar.hpp"
#include "ngraph/runtime/ngvm/instruction/tan.hpp" #include "ngraph/runtime/ngvm/instruction/tan.hpp"
#include "ngraph/runtime/ngvm/instruction/tanh.hpp" #include "ngraph/runtime/ngvm/instruction/tanh.hpp"
#include "ngraph/runtime/ngvm/eigen/vector_slice.hpp"
#include "ngraph/runtime/ngvm/external_function.hpp"
#include "ngraph/runtime/utils.hpp" #include "ngraph/runtime/utils.hpp"
#include "ngraph/util.hpp" #include "ngraph/util.hpp"
...@@ -325,7 +325,7 @@ std::vector<typename ET::type> ...@@ -325,7 +325,7 @@ std::vector<typename ET::type>
{ \ { \
REGISTER_INSTRUCTION( \ REGISTER_INSTRUCTION( \
op::ParameterizedConstant<T>, \ op::ParameterizedConstant<T>, \
instruction::ConstantInstruction<T>, \ instruction::ConstantInstruction<T>, \
std::vector<T::type>{ \ std::vector<T::type>{ \
get_vector<T>(dynamic_cast<const op::ParameterizedConstant<T>*>(n)->get_value())}, \ get_vector<T>(dynamic_cast<const op::ParameterizedConstant<T>*>(n)->get_value())}, \
out[0]); \ out[0]); \
...@@ -385,7 +385,7 @@ ExternalFunction::OpMap& ExternalFunction::get_op_map() ...@@ -385,7 +385,7 @@ ExternalFunction::OpMap& ExternalFunction::get_op_map()
auto c_value_strings = c->get_value_strings(); auto c_value_strings = c->get_value_strings();
#define M_REGISTER_POLYMORPHIC_CONSTANT(ET) \ #define M_REGISTER_POLYMORPHIC_CONSTANT(ET) \
ef->get_instructions()->push_back(make_shared<instruction::ConstantInstruction<ET>>( \ ef->get_instructions()->push_back(make_shared<instruction::ConstantInstruction<ET>>( \
parse_string<typename ET::type>(c_value_strings), out[0])); parse_string<typename ET::type>(c_value_strings), out[0]));
DO_ON_ELEMENT_TYPE(c_element_type, DO_ON_ELEMENT_TYPE(c_element_type,
...@@ -532,7 +532,7 @@ ExternalFunction::OpMap& ExternalFunction::get_op_map() ...@@ -532,7 +532,7 @@ ExternalFunction::OpMap& ExternalFunction::get_op_map()
result_element_type == (TO::element_type())) \ result_element_type == (TO::element_type())) \
{ \ { \
ef->get_instructions()->push_back( \ ef->get_instructions()->push_back( \
make_shared<instruction::ConvertInstruction<TI, TO>>(in[0], out[0])); \ make_shared<instruction::ConvertInstruction<TI, TO>>(in[0], out[0])); \
} }
// End hacky macro // End hacky macro
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/abs.hpp" #include "ngraph/runtime/kernel/abs.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class AbsInstruction : public Instruction class AbsInstruction : public Instruction
{ {
public: public:
AbsInstruction(const TensorViewInfo& arg, AbsInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/acos.hpp" #include "ngraph/runtime/kernel/acos.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class AcosInstruction : public Instruction class AcosInstruction : public Instruction
{ {
public: public:
AcosInstruction(const TensorViewInfo& arg, AcosInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/add.hpp" #include "ngraph/runtime/kernel/add.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/asin.hpp" #include "ngraph/runtime/kernel/asin.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class AsinInstruction : public Instruction class AsinInstruction : public Instruction
{ {
public: public:
AsinInstruction(const TensorViewInfo& arg, AsinInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/atan.hpp" #include "ngraph/runtime/kernel/atan.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class AtanInstruction : public Instruction class AtanInstruction : public Instruction
{ {
public: public:
AtanInstruction(const TensorViewInfo& arg, AtanInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/ceiling.hpp" #include "ngraph/runtime/kernel/ceiling.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class CeilingInstruction : public Instruction class CeilingInstruction : public Instruction
{ {
public: public:
CeilingInstruction(const TensorViewInfo& arg, CeilingInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/convert.hpp" #include "ngraph/runtime/kernel/convert.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -28,12 +28,11 @@ namespace ngraph ...@@ -28,12 +28,11 @@ namespace ngraph
{ {
namespace instruction namespace instruction
{ {
template <typename ETI,typename ETO> template <typename ETI, typename ETO>
class ConvertInstruction : public Instruction class ConvertInstruction : public Instruction
{ {
public: public:
ConvertInstruction(const TensorViewInfo& arg, ConvertInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
...@@ -46,7 +45,7 @@ namespace ngraph ...@@ -46,7 +45,7 @@ namespace ngraph
size_t count = get_tensor_element_count(call_frame, m_arg); size_t count = get_tensor_element_count(call_frame, m_arg);
kernel::convert<typename ETI::type,typename ETO::type>(arg, out, count); kernel::convert<typename ETI::type, typename ETO::type>(arg, out, count);
} }
protected: protected:
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/copy.hpp" #include "ngraph/runtime/kernel/copy.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class CopyInstruction : public Instruction class CopyInstruction : public Instruction
{ {
public: public:
CopyInstruction(const TensorViewInfo& arg, CopyInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/cos.hpp" #include "ngraph/runtime/kernel/cos.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class CosInstruction : public Instruction class CosInstruction : public Instruction
{ {
public: public:
CosInstruction(const TensorViewInfo& arg, CosInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/cosh.hpp" #include "ngraph/runtime/kernel/cosh.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class CoshInstruction : public Instruction class CoshInstruction : public Instruction
{ {
public: public:
CoshInstruction(const TensorViewInfo& arg, CoshInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/divide.hpp" #include "ngraph/runtime/kernel/divide.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
DivideInstruction(const TensorViewInfo& arg0, DivideInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/equal.hpp" #include "ngraph/runtime/kernel/equal.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
EqualInstruction(const TensorViewInfo& arg0, EqualInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
{ {
typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0); typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0);
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg0); size_t count = get_tensor_element_count(call_frame, m_arg0);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/exp.hpp" #include "ngraph/runtime/kernel/exp.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class ExpInstruction : public Instruction class ExpInstruction : public Instruction
{ {
public: public:
ExpInstruction(const TensorViewInfo& arg, ExpInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/floor.hpp" #include "ngraph/runtime/kernel/floor.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class FloorInstruction : public Instruction class FloorInstruction : public Instruction
{ {
public: public:
FloorInstruction(const TensorViewInfo& arg, FloorInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/greater.hpp" #include "ngraph/runtime/kernel/greater.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
GreaterInstruction(const TensorViewInfo& arg0, GreaterInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
{ {
typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0); typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0);
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg0); size_t count = get_tensor_element_count(call_frame, m_arg0);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/greater_eq.hpp" #include "ngraph/runtime/kernel/greater_eq.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
GreaterEqInstruction(const TensorViewInfo& arg0, GreaterEqInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
{ {
typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0); typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0);
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg0); size_t count = get_tensor_element_count(call_frame, m_arg0);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/less.hpp" #include "ngraph/runtime/kernel/less.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
LessInstruction(const TensorViewInfo& arg0, LessInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
{ {
typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0); typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0);
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg0); size_t count = get_tensor_element_count(call_frame, m_arg0);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/less_eq.hpp" #include "ngraph/runtime/kernel/less_eq.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
LessEqInstruction(const TensorViewInfo& arg0, LessEqInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
{ {
typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0); typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0);
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg0); size_t count = get_tensor_element_count(call_frame, m_arg0);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/log.hpp" #include "ngraph/runtime/kernel/log.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class LogInstruction : public Instruction class LogInstruction : public Instruction
{ {
public: public:
LogInstruction(const TensorViewInfo& arg, LogInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/maximum.hpp" #include "ngraph/runtime/kernel/maximum.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
MaximumInstruction(const TensorViewInfo& arg0, MaximumInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/minimum.hpp" #include "ngraph/runtime/kernel/minimum.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
MinimumInstruction(const TensorViewInfo& arg0, MinimumInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/multiply.hpp" #include "ngraph/runtime/kernel/multiply.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
MultiplyInstruction(const TensorViewInfo& arg0, MultiplyInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/negate.hpp" #include "ngraph/runtime/kernel/negate.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class NegateInstruction : public Instruction class NegateInstruction : public Instruction
{ {
public: public:
NegateInstruction(const TensorViewInfo& arg, NegateInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/not.hpp" #include "ngraph/runtime/kernel/not.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -31,8 +31,7 @@ namespace ngraph ...@@ -31,8 +31,7 @@ namespace ngraph
class NotInstruction : public Instruction class NotInstruction : public Instruction
{ {
public: public:
NotInstruction(const TensorViewInfo& arg, NotInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
...@@ -40,8 +39,10 @@ namespace ngraph ...@@ -40,8 +39,10 @@ namespace ngraph
virtual void execute(CallFrame& call_frame) const override virtual void execute(CallFrame& call_frame) const override
{ {
char* arg = get_tensor_data_ptr<element::Bool>(call_frame, m_arg); // FIXME: temporarily char not bool char* arg = get_tensor_data_ptr<element::Bool>(
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool call_frame, m_arg); // FIXME: temporarily char not bool
char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg); size_t count = get_tensor_element_count(call_frame, m_arg);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/not_equal.hpp" #include "ngraph/runtime/kernel/not_equal.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
NotEqualInstruction(const TensorViewInfo& arg0, NotEqualInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
{ {
typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0); typename ET::type* arg0 = get_tensor_data_ptr<ET>(call_frame, m_arg0);
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
char* out = get_tensor_data_ptr<element::Bool>(call_frame, m_out); // FIXME: temporarily char not bool char* out = get_tensor_data_ptr<element::Bool>(
call_frame, m_out); // FIXME: temporarily char not bool
size_t count = get_tensor_element_count(call_frame, m_arg0); size_t count = get_tensor_element_count(call_frame, m_arg0);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/power.hpp" #include "ngraph/runtime/kernel/power.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
PowerInstruction(const TensorViewInfo& arg0, PowerInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/select.hpp" #include "ngraph/runtime/kernel/select.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,9 +33,9 @@ namespace ngraph ...@@ -33,9 +33,9 @@ namespace ngraph
{ {
public: public:
SelectInstruction(const TensorViewInfo& arg0, SelectInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& arg2, const TensorViewInfo& arg2,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_arg2(arg2) , m_arg2(arg2)
...@@ -45,7 +45,8 @@ namespace ngraph ...@@ -45,7 +45,8 @@ namespace ngraph
virtual void execute(CallFrame& call_frame) const override virtual void execute(CallFrame& call_frame) const override
{ {
char* arg0 = get_tensor_data_ptr<element::Bool>(call_frame, m_arg0); // FIXME: temporarily char not bool char* arg0 = get_tensor_data_ptr<element::Bool>(
call_frame, m_arg0); // FIXME: temporarily char not bool
typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1); typename ET::type* arg1 = get_tensor_data_ptr<ET>(call_frame, m_arg1);
typename ET::type* arg2 = get_tensor_data_ptr<ET>(call_frame, m_arg2); typename ET::type* arg2 = get_tensor_data_ptr<ET>(call_frame, m_arg2);
typename ET::type* out = get_tensor_data_ptr<ET>(call_frame, m_out); typename ET::type* out = get_tensor_data_ptr<ET>(call_frame, m_out);
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/sign.hpp" #include "ngraph/runtime/kernel/sign.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class SignInstruction : public Instruction class SignInstruction : public Instruction
{ {
public: public:
SignInstruction(const TensorViewInfo& arg, SignInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/sin.hpp" #include "ngraph/runtime/kernel/sin.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class SinInstruction : public Instruction class SinInstruction : public Instruction
{ {
public: public:
SinInstruction(const TensorViewInfo& arg, SinInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/sinh.hpp" #include "ngraph/runtime/kernel/sinh.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class SinhInstruction : public Instruction class SinhInstruction : public Instruction
{ {
public: public:
SinhInstruction(const TensorViewInfo& arg, SinhInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/sqrt.hpp" #include "ngraph/runtime/kernel/sqrt.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class SqrtInstruction : public Instruction class SqrtInstruction : public Instruction
{ {
public: public:
SqrtInstruction(const TensorViewInfo& arg, SqrtInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/subtract.hpp" #include "ngraph/runtime/kernel/subtract.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -33,8 +33,8 @@ namespace ngraph ...@@ -33,8 +33,8 @@ namespace ngraph
{ {
public: public:
SubtractInstruction(const TensorViewInfo& arg0, SubtractInstruction(const TensorViewInfo& arg0,
const TensorViewInfo& arg1, const TensorViewInfo& arg1,
const TensorViewInfo& out) const TensorViewInfo& out)
: m_arg0(arg0) : m_arg0(arg0)
, m_arg1(arg1) , m_arg1(arg1)
, m_out(out) , m_out(out)
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/tan.hpp" #include "ngraph/runtime/kernel/tan.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class TanInstruction : public Instruction class TanInstruction : public Instruction
{ {
public: public:
TanInstruction(const TensorViewInfo& arg, TanInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "ngraph/runtime/kernel/tanh.hpp" #include "ngraph/runtime/kernel/tanh.hpp"
#include "ngraph/runtime/ngvm/call_frame.hpp" #include "ngraph/runtime/ngvm/call_frame.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/ngvm/instruction.hpp" #include "ngraph/runtime/ngvm/instruction.hpp"
#include "ngraph/runtime/ngvm/utils.hpp"
#include "ngraph/runtime/tensor_view.hpp" #include "ngraph/runtime/tensor_view.hpp"
namespace ngraph namespace ngraph
...@@ -32,8 +32,7 @@ namespace ngraph ...@@ -32,8 +32,7 @@ namespace ngraph
class TanhInstruction : public Instruction class TanhInstruction : public Instruction
{ {
public: public:
TanhInstruction(const TensorViewInfo& arg, TanhInstruction(const TensorViewInfo& arg, const TensorViewInfo& out)
const TensorViewInfo& out)
: m_arg(arg) : m_arg(arg)
, m_out(out) , m_out(out)
{ {
......
...@@ -33,14 +33,18 @@ namespace ngraph ...@@ -33,14 +33,18 @@ namespace ngraph
class CallFrame; class CallFrame;
template <typename ET> template <typename ET>
typename ET::type* get_tensor_data_ptr(CallFrame& call_frame, const TensorViewInfo& tensor_view_info) typename ET::type* get_tensor_data_ptr(CallFrame& call_frame,
const TensorViewInfo& tensor_view_info)
{ {
return call_frame.get_tensor_view_data<ET>(tensor_view_info.get_index()); return call_frame.get_tensor_view_data<ET>(tensor_view_info.get_index());
} }
size_t get_tensor_element_count(CallFrame& call_frame, const TensorViewInfo& tensor_view_info) size_t get_tensor_element_count(CallFrame& call_frame,
const TensorViewInfo& tensor_view_info)
{ {
return tensor_view_info.get_layout<ngraph::descriptor::layout::DenseTensorViewLayout>()->get_size(); return tensor_view_info
.get_layout<ngraph::descriptor::layout::DenseTensorViewLayout>()
->get_size();
} }
} }
} }
......
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