Unverified Commit 0bdb051a authored by Robert Kimball's avatar Robert Kimball Committed by GitHub

Rename a few tensor view to tensor (#2450)

* rename tensor view to tensor

* one more

* revert change
parent 2b7e74e5
...@@ -71,7 +71,7 @@ namespace ngraph ...@@ -71,7 +71,7 @@ namespace ngraph
/// Nodes are the backbone of the graph of Value dataflow. Every node has /// Nodes are the backbone of the graph of Value dataflow. Every node has
/// zero or more nodes as arguments and one value, which is either a tensor /// zero or more nodes as arguments and one value, which is either a tensor
/// view or a (possibly empty) tuple of values. /// or a (possibly empty) tuple of values.
class Node : public std::enable_shared_from_this<Node> class Node : public std::enable_shared_from_this<Node>
{ {
// So Adjoints can call generate_adjoints // So Adjoints can call generate_adjoints
...@@ -182,10 +182,10 @@ namespace ngraph ...@@ -182,10 +182,10 @@ namespace ngraph
/// Checks that there is exactly one output and returns its tensor. /// Checks that there is exactly one output and returns its tensor.
descriptor::Tensor& get_output_tensor() const; descriptor::Tensor& get_output_tensor() const;
/// Returns the tensor view of output i /// Returns the tensor of output i
std::shared_ptr<descriptor::Tensor> get_output_tensor_ptr(size_t i) const; std::shared_ptr<descriptor::Tensor> get_output_tensor_ptr(size_t i) const;
/// Checks that there is exactly one output and returns its tensor view. /// Checks that there is exactly one output and returns its tensor.
std::shared_ptr<descriptor::Tensor> get_output_tensor_ptr() const; std::shared_ptr<descriptor::Tensor> get_output_tensor_ptr() const;
/// Returns the set of inputs using output i /// Returns the set of inputs using output i
......
...@@ -31,7 +31,7 @@ namespace ngraph ...@@ -31,7 +31,7 @@ namespace ngraph
public: public:
/// \brief Constructs an "all" reduction operation. /// \brief Constructs an "all" reduction operation.
/// ///
/// \param arg The tensor view to be reduced. /// \param arg The tensor to be reduced.
/// \param reduction_axes The axis positions (0-based) to be eliminated. /// \param reduction_axes The axis positions (0-based) to be eliminated.
All(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes); All(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes);
......
...@@ -31,7 +31,7 @@ namespace ngraph ...@@ -31,7 +31,7 @@ namespace ngraph
public: public:
/// \brief Constructs an "any" reduction operation. /// \brief Constructs an "any" reduction operation.
/// ///
/// \param arg The tensor view to be reduced. /// \param arg The tensor to be reduced.
/// \param reduction_axes The axis positions (0-based) to be eliminated. /// \param reduction_axes The axis positions (0-based) to be eliminated.
Any(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes); Any(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes);
......
...@@ -28,7 +28,7 @@ namespace ngraph ...@@ -28,7 +28,7 @@ namespace ngraph
public: public:
/// \brief Constructs a max-reduction operation. /// \brief Constructs a max-reduction operation.
/// ///
/// \param arg The tensor view to be reduced. /// \param arg The tensor to be reduced.
/// \param reduction_axes The axis positions (0-based) to be eliminated. /// \param reduction_axes The axis positions (0-based) to be eliminated.
Max(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes); Max(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes);
......
...@@ -28,7 +28,7 @@ namespace ngraph ...@@ -28,7 +28,7 @@ namespace ngraph
public: public:
/// \brief Constructs a min-reduction operation. /// \brief Constructs a min-reduction operation.
/// ///
/// \param arg The tensor view to be reduced. /// \param arg The tensor to be reduced.
/// \param reduction_axes The axis positions (0-based) to be eliminated. /// \param reduction_axes The axis positions (0-based) to be eliminated.
Min(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes); Min(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes);
......
...@@ -35,7 +35,7 @@ namespace ngraph ...@@ -35,7 +35,7 @@ namespace ngraph
const NodeVector& deltas) override; const NodeVector& deltas) override;
public: public:
/// \brief Constructions a tensor view-typed parameter node. /// \brief Constructions a tensor-typed parameter node.
/// ///
/// \param element_type The element type of the parameter. /// \param element_type The element type of the parameter.
/// \param pshape The partial shape of the parameter. /// \param pshape The partial shape of the parameter.
......
...@@ -31,7 +31,7 @@ namespace ngraph ...@@ -31,7 +31,7 @@ namespace ngraph
public: public:
/// \brief Constructs a product reduction operation. /// \brief Constructs a product reduction operation.
/// ///
/// \param arg The tensor view to be reduced. /// \param arg The tensor to be reduced.
/// \param reduction_axes The axis positions (0-based) to be eliminated. /// \param reduction_axes The axis positions (0-based) to be eliminated.
Product(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes); Product(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes);
......
...@@ -52,8 +52,8 @@ namespace ngraph ...@@ -52,8 +52,8 @@ namespace ngraph
public: public:
/// \brief Constructs a tensor slice replacement operation. /// \brief Constructs a tensor slice replacement operation.
/// ///
/// \param arg0 The tensor view to overwrite into. /// \param arg0 The tensor to overwrite into.
/// \param arg1 The tensor view to write into `arg0`. /// \param arg1 The tensor to write into `arg0`.
/// \param lower_bounds The axiswise lower bounds of the slice (inclusive). /// \param lower_bounds The axiswise lower bounds of the slice (inclusive).
/// \param upper_bounds The axiswise upper bounds of the slice (exclusive). /// \param upper_bounds The axiswise upper bounds of the slice (exclusive).
/// \param strides The slicing strides; for example, strides of `{n,m}` means to take /// \param strides The slicing strides; for example, strides of `{n,m}` means to take
...@@ -67,8 +67,8 @@ namespace ngraph ...@@ -67,8 +67,8 @@ namespace ngraph
/// \brief Constructs a tensor slice replacement operation with unit strides; i.e., every element inside the bounding box will be overwritten. /// \brief Constructs a tensor slice replacement operation with unit strides; i.e., every element inside the bounding box will be overwritten.
/// ///
/// \param arg0 The tensor view to overwrite into. /// \param arg0 The tensor to overwrite into.
/// \param arg1 The tensor view to write into `arg0`. /// \param arg1 The tensor to write into `arg0`.
/// \param lower_bounds The axiswise lower bounds of the slice (inclusive). /// \param lower_bounds The axiswise lower bounds of the slice (inclusive).
/// \param upper_bounds The axiswise upper bounds of the slice (exclusive). /// \param upper_bounds The axiswise upper bounds of the slice (exclusive).
ReplaceSlice(const std::shared_ptr<Node>& arg0, ReplaceSlice(const std::shared_ptr<Node>& arg0,
......
...@@ -62,7 +62,7 @@ namespace ngraph ...@@ -62,7 +62,7 @@ namespace ngraph
public: public:
/// \brief Constructs a reshape operation. /// \brief Constructs a reshape operation.
/// ///
/// \param arg The tensor view to be reshaped. /// \param arg The tensor to be reshaped.
/// \param input_order The order in which to iterate over input axes. This must be a permutation of the /// \param input_order The order in which to iterate over input axes. This must be a permutation of the
/// sequence \f$(0,\dots,n-1)\f$ where \f$n\f$ is the rank of the input tensor. /// sequence \f$(0,\dots,n-1)\f$ where \f$n\f$ is the rank of the input tensor.
/// \param output_shape The output shape. If the input shape is \f$(a_0,\dots,a_{k-1})\f$ then the output shape must /// \param output_shape The output shape. If the input shape is \f$(a_0,\dots,a_{k-1})\f$ then the output shape must
......
...@@ -48,7 +48,7 @@ namespace ngraph ...@@ -48,7 +48,7 @@ namespace ngraph
public: public:
/// \brief Constructs a reverse operation. /// \brief Constructs a reverse operation.
/// ///
/// \param arg The input tensor view, some of whose axes are to be reversed. /// \param arg The input tensor, some of whose axes are to be reversed.
/// \param reversed_axes The axes to reverse. /// \param reversed_axes The axes to reverse.
Reverse(const std::shared_ptr<Node>& arg, const AxisSet& reversed_axes); Reverse(const std::shared_ptr<Node>& arg, const AxisSet& reversed_axes);
......
...@@ -30,7 +30,7 @@ namespace ngraph ...@@ -30,7 +30,7 @@ namespace ngraph
public: public:
/// \brief Constructs a tensor slice operation. /// \brief Constructs a tensor slice operation.
/// ///
/// \param arg The tensor view to be sliced. /// \param arg The tensor to be sliced.
/// \param lower_bounds The axiswise lower bounds of the slice (inclusive). /// \param lower_bounds The axiswise lower bounds of the slice (inclusive).
/// \param upper_bounds The axiswise upper bounds of the slice (exclusive). /// \param upper_bounds The axiswise upper bounds of the slice (exclusive).
/// \param strides The slicing strides; for example, strides of `{n,m}` means to take /// \param strides The slicing strides; for example, strides of `{n,m}` means to take
...@@ -42,7 +42,7 @@ namespace ngraph ...@@ -42,7 +42,7 @@ namespace ngraph
/// \brief Constructs a tensor slice operation with unit strides; i.e., every element inside the bounding box will be copied to the output slice. /// \brief Constructs a tensor slice operation with unit strides; i.e., every element inside the bounding box will be copied to the output slice.
/// ///
/// \param arg The tensor view to be sliced. /// \param arg The tensor to be sliced.
/// \param lower_bounds The axiswise lower bounds of the slice (inclusive). /// \param lower_bounds The axiswise lower bounds of the slice (inclusive).
/// \param upper_bounds The axiswise upper bounds of the slice (exclusive). /// \param upper_bounds The axiswise upper bounds of the slice (exclusive).
Slice(const std::shared_ptr<Node>& arg, Slice(const std::shared_ptr<Node>& arg,
......
...@@ -76,7 +76,7 @@ namespace ngraph ...@@ -76,7 +76,7 @@ namespace ngraph
public: public:
/// \brief Constructs a summation operation. /// \brief Constructs a summation operation.
/// ///
/// \param arg The tensor view to be summed. /// \param arg The tensor to be summed.
/// \param reduction_axes The axis positions (0-based) to be eliminated. /// \param reduction_axes The axis positions (0-based) to be eliminated.
Sum(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes); Sum(const std::shared_ptr<Node>& arg, const AxisSet& reduction_axes);
......
...@@ -97,14 +97,14 @@ void runtime::cpu::CPU_CallFrame::propagate_layouts( ...@@ -97,14 +97,14 @@ void runtime::cpu::CPU_CallFrame::propagate_layouts(
if (layouts.size() != tvs.size()) if (layouts.size() != tvs.size())
{ {
throw ngraph_error( throw ngraph_error(
"Error propagating layouts - tensor view and layout descriptor counts do not match"); "Error propagating layouts - tensor and layout descriptor counts do not match");
} }
for (size_t i = 0; i < tvs.size(); i++) for (size_t i = 0; i < tvs.size(); i++)
{ {
if (layouts[i] == nullptr) if (layouts[i] == nullptr)
{ {
throw ngraph_error( throw ngraph_error(
"Error propagating layouts - layout information missing from tensor view"); "Error propagating layouts - layout information missing from tensor");
} }
tvs[i]->set_tensor_layout(layouts[i]); tvs[i]->set_tensor_layout(layouts[i]);
} }
......
...@@ -1054,7 +1054,7 @@ using namespace ngraph::runtime; ...@@ -1054,7 +1054,7 @@ using namespace ngraph::runtime;
auto tv = parameter->get_output_tensor_ptr(i); auto tv = parameter->get_output_tensor_ptr(i);
if (tv->get_tensor_layout() == nullptr) if (tv->get_tensor_layout() == nullptr)
{ {
throw ngraph_error("layout missing on function parameter's tensor view: " + throw ngraph_error("layout missing on function parameter's tensor: " +
tv->get_name()); tv->get_name());
} }
parameter_layout_descriptors.emplace_back( parameter_layout_descriptors.emplace_back(
...@@ -1568,7 +1568,7 @@ void runtime::cpu::CPU_ExternalFunction::build() ...@@ -1568,7 +1568,7 @@ void runtime::cpu::CPU_ExternalFunction::build()
auto tv = parameter->get_output_tensor_ptr(i); auto tv = parameter->get_output_tensor_ptr(i);
if (tv->get_tensor_layout() == nullptr) if (tv->get_tensor_layout() == nullptr)
{ {
throw ngraph_error("layout missing on function parameter's tensor view: " + throw ngraph_error("layout missing on function parameter's tensor: " +
tv->get_name()); tv->get_name());
} }
parameter_layout_descriptors.emplace_back( parameter_layout_descriptors.emplace_back(
......
...@@ -52,8 +52,8 @@ namespace ngraph ...@@ -52,8 +52,8 @@ namespace ngraph
public: public:
/// \brief Constructs a tensor slice update operation. /// \brief Constructs a tensor slice update operation.
/// ///
/// \param arg0 The tensor view to overwrite into. /// \param arg0 The tensor to overwrite into.
/// \param arg1 The tensor view to increment into `arg0`. /// \param arg1 The tensor to increment into `arg0`.
/// \param lower_bounds The axiswise lower bounds of the slice (inclusive). /// \param lower_bounds The axiswise lower bounds of the slice (inclusive).
/// \param upper_bounds The axiswise upper bounds of the slice (exclusive). /// \param upper_bounds The axiswise upper bounds of the slice (exclusive).
/// \param strides The slicing strides; for example, strides of `{n,m}` means to take /// \param strides The slicing strides; for example, strides of `{n,m}` means to take
...@@ -67,8 +67,8 @@ namespace ngraph ...@@ -67,8 +67,8 @@ namespace ngraph
/// \brief Constructs a tensor slice replacement operation with unit strides; i.e., every element inside the bounding box will be overwritten. /// \brief Constructs a tensor slice replacement operation with unit strides; i.e., every element inside the bounding box will be overwritten.
/// ///
/// \param arg0 The tensor view to overwrite into. /// \param arg0 The tensor to overwrite into.
/// \param arg1 The tensor view to increment into `arg0`. /// \param arg1 The tensor to increment into `arg0`.
/// \param lower_bounds The axiswise lower bounds of the slice (inclusive). /// \param lower_bounds The axiswise lower bounds of the slice (inclusive).
/// \param upper_bounds The axiswise upper bounds of the slice (exclusive). /// \param upper_bounds The axiswise upper bounds of the slice (exclusive).
UpdateSlice(const std::shared_ptr<Node>& arg0, UpdateSlice(const std::shared_ptr<Node>& arg0,
......
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