Further fixes for compilation warnings with weird index types.

tatami-inc · Jul 28, 2023 · cf36c04 · cf36c04
1 parent d6cb425
commit cf36c04
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 17 deletions.
diff --git a/include/tatami/sparse/CompressedSparseMatrix.hpp b/include/tatami/sparse/CompressedSparseMatrix.hpp
@@ -5,6 +5,7 @@
 #include "../base/utils.hpp"
 #include "primary_extraction.hpp"
 #include "SparseSecondaryExtractorCore.hpp"
+#include "../utils/ElementType.hpp"
 
 #include <vector>
 #include <algorithm>
@@ -91,7 +92,7 @@ class CompressedSparseMatrix : public Matrix<Value_, Index_> {
                 throw std::runtime_error("last element of 'indptrs' should be equal to length of 'indices'");
             }
 
-            Stored<IndexStorage_> max_index = (row_ ? ncols : nrows);
+            ElementType<IndexStorage_> max_index = (row_ ? ncols : nrows);
             for (size_t i = 1; i < indptrs.size(); ++i) {
                 auto start = indptrs[i- 1], end = indptrs[i];
                 if (end < start || end > last) {
@@ -299,8 +300,8 @@ class CompressedSparseMatrix : public Matrix<Value_, Index_> {
      ******* Secondary extraction ********
      *************************************/
 private:
-    typedef Stored<IndexStorage_> StoredIndex;
-    typedef Stored<PointerStorage_> StoredPointer;
+    typedef ElementType<IndexStorage_> StoredIndex;
+    typedef ElementType<PointerStorage_> StoredPointer;
 
     struct SecondaryModifier {
         static void increment(StoredPointer& ptr, const IndexStorage_&, StoredPointer) { ++ptr; }

diff --git a/include/tatami/sparse/FragmentedSparseMatrix.hpp b/include/tatami/sparse/FragmentedSparseMatrix.hpp
@@ -5,6 +5,7 @@
 #include "../base/utils.hpp"
 #include "primary_extraction.hpp"
 #include "SparseSecondaryExtractorCore.hpp"
+#include "../utils/ElementType.hpp"
 
 #include <vector>
 #include <algorithm>
@@ -82,7 +83,7 @@ class FragmentedSparseMatrix : public Matrix<Value_, Index_> {
                 }
             }
 
-            Stored<Stored<IndexVectorStorage_> > max_index = (row_ ? ncols : nrows);
+            ElementType<ElementType<IndexVectorStorage_> > max_index = (row_ ? ncols : nrows);
             for (size_t i = 0, end = indices.size(); i < end; ++i) {
                 const auto& curv = values[i];
                 const auto& curi = indices[i];
@@ -288,7 +289,7 @@ class FragmentedSparseMatrix : public Matrix<Value_, Index_> {
      *************************************/
 private:
     typedef typename std::remove_reference<decltype(std::declval<IndexVectorStorage_>()[0])>::type IndexStorage;
-    typedef Stored<IndexStorage> StoredIndex;
+    typedef ElementType<IndexStorage> StoredIndex;
 
     struct SecondaryModifier {
         static void increment(size_t& ptr, const IndexStorage&, size_t) { ++ptr; }

diff --git a/include/tatami/sparse/SemiCompressedSparseMatrix.hpp b/include/tatami/sparse/SemiCompressedSparseMatrix.hpp
@@ -5,6 +5,7 @@
 #include "../base/utils.hpp"
 #include "utils.hpp"
 #include "SparseSecondaryExtractorCore.hpp"
+#include "../utils/ElementType.hpp"
 
 #include <vector>
 #include <algorithm>
@@ -111,8 +112,8 @@ class SemiCompressedSparseMatrix : public Matrix<Value_, Index_> {
     IndexStorage_ indices;
     PointerStorage_ indptrs;
 
-    typedef Stored<IndexStorage_> StoredIndex;
-    typedef Stored<PointerStorage_> StoredPointer;
+    typedef ElementType<IndexStorage_> StoredIndex;
+    typedef ElementType<PointerStorage_> StoredPointer;
 
 public:
     Index_ nrow() const { return nrows; }

diff --git a/include/tatami/sparse/SparseSecondaryExtractorCore.hpp b/include/tatami/sparse/SparseSecondaryExtractorCore.hpp
@@ -9,9 +9,6 @@
 
 namespace tatami {
 
-template<class Storage_>
-using Stored = typename std::remove_reference<decltype(std::declval<Storage_>()[0])>::type;
-
 template<typename Index_, typename StoredIndex_, typename CustomPointer_, class CustomPointerModifier_> 
 struct SparseSecondaryExtractorCore {
 protected:

diff --git a/include/tatami/sparse/primary_extraction.hpp b/include/tatami/sparse/primary_extraction.hpp
@@ -4,6 +4,7 @@
 #include "utils.hpp"
 #include <utility>
 #include <algorithm>
+#include "../utils/ElementType.hpp"
 
 namespace tatami {
 
@@ -36,11 +37,11 @@ std::pair<size_t, size_t> extract_primary_dimension(
     auto eIt = indices.begin() + sparse_utils::get_upper_limit(indices, indptrs, i);
 
     if (iIt != eIt) {
-        if (start > *iIt) {
+        if (start > static_cast<Index_>(*iIt)) {
             iIt = std::lower_bound(iIt, eIt, start);
         } 
 
-        auto last = start + length;
+        ElementType<IndexStorage_> last = start + length;
 
         // Comparing the one-past-the-last requested index with the last observed index at 'eIt'.
         // If the former is less than the latter, then we need to do a binary search.
@@ -143,7 +144,7 @@ void primary_dimension(
 
     Index_ counter = 0;
     while (counter < length) {
-        auto current = subset[counter];
+        ElementType<IndexStorage_> current = subset[counter];
 
         while (iIt != eIt && current > *iIt) {
             ++iIt;

diff --git a/include/tatami/utils/ElementType.hpp b/include/tatami/utils/ElementType.hpp
@@ -0,0 +1,21 @@
+#ifndef TATAMI_ELEMENTTYPE_HPP
+#define TATAMI_ELEMENTTYPE_HPP
+
+/**
+ * @file ElementType.hpp
+ * @brief Get type of elements in an array.
+ */
+
+namespace tatami {
+
+/**
+ * @tparam Array_ Some array of values that are accessed with `[`.
+ *
+ * Extract the type of array elements, after stripping away references and `const`-ness.
+ */
+template<class Array_>
+using ElementType = typename std::remove_cv<typename std::remove_reference<decltype(std::declval<Array_>()[0])>::type>::type;
+
+}
+
+#endif
diff --git a/tests/src/sparse/CompressedSparseMatrix.cpp b/tests/src/sparse/CompressedSparseMatrix.cpp
@@ -72,10 +72,19 @@ TEST(CompressedSparseMatrix, ConstructionFail) {
 
 TEST(CompressedSparseMatrix, OddTypes) {
     // Checking for compilation warnings here when the interface and storage types are different.
-    std::vector<uint8_t> values;
-    std::vector<uint16_t> indices;
-    std::vector<uint64_t> indptr(11);
-    tatami::CompressedSparseRowMatrix<double, int, decltype(values), decltype(indices), decltype(indptr)> rmat(10, 20, values, indices, indptr);
+    {
+        std::vector<uint8_t> values;
+        std::vector<uint16_t> indices;
+        std::vector<uint64_t> indptr(11);
+        tatami::CompressedSparseRowMatrix<double, int, decltype(values), decltype(indices), decltype(indptr)> rmat(10, 20, values, indices, indptr);
+    }
+
+    {
+        std::vector<uint8_t> values;
+        std::vector<uint32_t> indices; // Check for signed/unsigned comparisons with the interface index type.
+        std::vector<uint64_t> indptr(11);
+        tatami::CompressedSparseRowMatrix<double, int32_t, decltype(values), decltype(indices), decltype(indptr)> rmat(10, 20, values, indices, indptr);
+    }
 }
 
 /*************************************