Commit c21b3f88 authored by Scott Cyphers's avatar Scott Cyphers

Merge branch 'master' into cyphers/names

parents f73e0238 5f724e48
...@@ -98,7 +98,7 @@ namespace ngraph ...@@ -98,7 +98,7 @@ namespace ngraph
/// Name of the builtin op, for debugging and logging. /// Name of the builtin op, for debugging and logging.
virtual std::string op_name() const = 0; virtual std::string op_name() const = 0;
// TODO: Implement for each op // TODO: Implement for each op. This enables graphs to be built for now.
virtual void propagate_types() override {} virtual void propagate_types() override {}
protected: protected:
......
...@@ -56,8 +56,7 @@ namespace ngraph ...@@ -56,8 +56,7 @@ namespace ngraph
template <typename U> template <typename U>
static std::shared_ptr<ScalarConstantOp<T>> make(U value) static std::shared_ptr<ScalarConstantOp<T>> make(U value)
{ {
return std::make_shared<ScalarConstantOp<T>>( return std::make_shared<ScalarConstantOp<T>>(value);
static_cast<ScalarConstantOp<T>::ctype>(value));
} }
protected: protected:
......
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