Skip to content

Commit

Permalink
[mlir][sparse] cleanup of COO (llvm#69239)
Browse files Browse the repository at this point in the history
Moves typedef to only file where it is used.
Removes some deadcode. Some minor doc changes.
  • Loading branch information
aartbik authored Oct 16, 2023
1 parent d9568bd commit b3fbb67
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
21 changes: 5 additions & 16 deletions mlir/include/mlir/ExecutionEngine/SparseTensor/COO.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,13 @@ struct ElementLT final {
const uint64_t rank;
};

/// The type of callback functions which receive an element.
template <typename V>
using ElementConsumer =
const std::function<void(const std::vector<uint64_t> &, V)> &;

/// A memory-resident sparse tensor in coordinate-scheme representation
/// (a collection of `Element`s). This data structure is used as
/// an intermediate representation; e.g., for reading sparse tensors
/// from external formats into memory, or for certain conversions between
/// different `SparseTensorStorage` formats.
/// (a collection of `Element`s). This data structure is used as an
/// intermediate representation, e.g., for reading sparse tensors from
/// external formats into memory.
template <typename V>
class SparseTensorCOO final {
public:
using const_iterator = typename std::vector<Element<V>>::const_iterator;

/// Constructs a new coordinate-scheme sparse tensor with the given
/// sizes and an optional initial storage capacity.
explicit SparseTensorCOO(const std::vector<uint64_t> &dimSizes,
Expand Down Expand Up @@ -106,7 +98,7 @@ class SparseTensorCOO final {
/// Returns the `operator<` closure object for the COO's element type.
ElementLT<V> getElementLT() const { return ElementLT<V>(getRank()); }

/// Adds an element to the tensor. This method invalidates all iterators.
/// Adds an element to the tensor.
void add(const std::vector<uint64_t> &dimCoords, V val) {
const uint64_t *base = coordinates.data();
const uint64_t size = coordinates.size();
Expand Down Expand Up @@ -135,12 +127,9 @@ class SparseTensorCOO final {
elements.push_back(addedElem);
}

const_iterator begin() const { return elements.cbegin(); }
const_iterator end() const { return elements.cend(); }

/// Sorts elements lexicographically by coordinates. If a coordinate
/// is mapped to multiple values, then the relative order of those
/// values is unspecified. This method invalidates all iterators.
/// values is unspecified.
void sort() {
if (isSorted)
return;
Expand Down
5 changes: 5 additions & 0 deletions mlir/include/mlir/ExecutionEngine/SparseTensor/Storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
namespace mlir {
namespace sparse_tensor {

/// The type of callback functions which receive an element.
template <typename V>
using ElementConsumer =
const std::function<void(const std::vector<uint64_t> &, V)> &;

// Forward references.
template <typename V>
class SparseTensorEnumeratorBase;
Expand Down

0 comments on commit b3fbb67

Please sign in to comment.