From 4d8f24c99cb1b87d87c3df649dd52fae1710dc18 Mon Sep 17 00:00:00 2001 From: wangrao124 Date: Tue, 8 Mar 2022 10:57:48 +0800 Subject: [PATCH] fix sparsetensor docs --- .../api_python/mindspore/mindspore.COOTensor.rst | 6 +++--- .../api_python/mindspore/mindspore.CSRTensor.rst | 4 ++-- mindspore/core/ops/dtype.cc | 2 +- mindspore/python/mindspore/common/tensor.py | 14 +++++++++++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/docs/api/api_python/mindspore/mindspore.COOTensor.rst b/docs/api/api_python/mindspore/mindspore.COOTensor.rst index 890e92e696c..f70e49dca80 100644 --- a/docs/api/api_python/mindspore/mindspore.COOTensor.rst +++ b/docs/api/api_python/mindspore/mindspore.COOTensor.rst @@ -1,12 +1,12 @@ mindspore.COOTensor =================== -.. py:class:: mindspore.COOTensor(indices=None, values=None, shape=None) +.. py:class:: mindspore.COOTensor(indices=None, values=None, shape=None, coo_tensor=None) 用来表示某一张量在给定索引上非零元素的集合,其中索引(indices)指示了每一个非零元素的位置。 .. note:: - - 这是一个实验特性,在未来可能会发生API的变化。 + 这是一个实验特性,在未来可能会发生API的变化。 **参数:** @@ -15,7 +15,7 @@ mindspore.COOTensor - **shape** (tuple(int)) - 形状为ndims的整数元组,用来指定稀疏矩阵的稠密形状。 - **coo_tensor** (COOTensor) - COOTensor对象,用来初始化新的COOTensor。 - **输出:** + **返回:** COOTensor,由 `indices` 、 `values` 和 `shape` 组成。 diff --git a/docs/api/api_python/mindspore/mindspore.CSRTensor.rst b/docs/api/api_python/mindspore/mindspore.CSRTensor.rst index eee9e24d37e..1e28f45e756 100644 --- a/docs/api/api_python/mindspore/mindspore.CSRTensor.rst +++ b/docs/api/api_python/mindspore/mindspore.CSRTensor.rst @@ -1,13 +1,13 @@ mindspore.CSRTensor =================== -.. py:class:: mindspore.CSRTensor(indptr=None, indices=None, values=None, shape=None) +.. py:class:: mindspore.CSRTensor(indptr=None, indices=None, values=None, shape=None, csr_tensor=None) 用来表示某一张量在给定索引上非零元素的集合,其中行索引由`indptr`表示,列索引由`indices` 表示,非零值由`values`表示。 .. note:: - - 这是一个实验特性,在未来可能会发生API的变化。 + 这是一个实验特性,在未来可能会发生API的变化。 **参数:** diff --git a/mindspore/core/ops/dtype.cc b/mindspore/core/ops/dtype.cc index 916b383f28a..e9914b1c49a 100644 --- a/mindspore/core/ops/dtype.cc +++ b/mindspore/core/ops/dtype.cc @@ -37,7 +37,7 @@ ValuePtr DTypeInferValue(const PrimitivePtr &primitive, const std::vectorisa()) { const std::set valid_types = {kTensorType}; return CheckAndConvertUtils::CheckTensorTypeValid("input_x", type, valid_types, op_name); - } else { + } else if (type->isa() || type->isa()) { const std::set valid_types = {kCSRTensorType, kCOOTensorType}; return CheckAndConvertUtils::CheckSparseTensorTypeValid("input_x", type, valid_types, op_name); } diff --git a/mindspore/python/mindspore/common/tensor.py b/mindspore/python/mindspore/common/tensor.py index cc2654894cb..6e101051e3d 100644 --- a/mindspore/python/mindspore/common/tensor.py +++ b/mindspore/python/mindspore/common/tensor.py @@ -2547,7 +2547,7 @@ class COOTensor(COOTensor_): Return a copy of the COOTensor, cast its values to a specified type. Args: - dtype (class:`mindspore.dtype`): Designated tensor dtype. + dtype (:class:`mindspore.dtype`): Designated tensor dtype. Returns: COOTensor. @@ -2703,7 +2703,15 @@ class CSRTensor(CSRTensor_): return COOTensor(coo_indices, self.values, self.shape) def to_dense(self): - """Return a dense Tensor.""" + """ + Converts CSRTensor to Dense Tensor. + + Returns: + Tensor. + + Supported Platforms: + ``GPU`` ``CPU`` + """ coo_tensor = self.to_coo() return coo_tensor.to_dense() @@ -2712,7 +2720,7 @@ class CSRTensor(CSRTensor_): Return a copy of the CSRTensor, cast its values to a specified type. Args: - dtype (class:`mindspore.dtype`): Designated tensor dtype. + dtype (:class:`mindspore.dtype`): Designated tensor dtype. Returns: CSRTensor.