Merge sparse_tensor_format.h into sparse_tensor.h

mrkn · mrkn · commit d57e56fc6c45 · 2019-01-09T17:53:31.000+09:00
diff --git a/cpp/src/arrow/ipc/metadata-internal.h b/cpp/src/arrow/ipc/metadata-internal.h
@@ -33,7 +33,7 @@
 #include "arrow/ipc/dictionary.h"  // IYWU pragma: keep
 #include "arrow/ipc/message.h"
 #include "arrow/memory_pool.h"
-#include "arrow/sparse_tensor_format.h"
+#include "arrow/sparse_tensor.h"
 #include "arrow/status.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/sparse_tensor.h b/cpp/src/arrow/sparse_tensor.h
@@ -22,14 +22,18 @@
 #include <string>
 #include <vector>
 
-#include "arrow/sparse_tensor_format.h"
 #include "arrow/tensor.h"
 
 namespace arrow {
 
 // ----------------------------------------------------------------------
 // SparseIndex class
 
+/// \brief EXPERIMENTAL: Sparse tensor format enumeration
+struct SparseTensorFormat {
+  enum type { COO, CSR };
+};
+
 /// \brief EXPERIMENTAL: The base class for representing index of non-zero
 /// values in sparse tensor
 class ARROW_EXPORT SparseIndex {
diff --git a/cpp/src/arrow/sparse_tensor_format.h b/cpp/src/arrow/sparse_tensor_format.h
