rowSums2() is now significantly faster for larger matrices

HenrikBengtsson · Jun 22, 2024 · 72b7aaf · 72b7aaf
1 parent 6ff408e
commit 72b7aaf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: matrixStats
-Version: 1.3.0-9001
+Version: 1.3.0-9002
 Depends:
   R (>= 2.12.0)
 Suggests:

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,8 @@
 # Version (development version)
 
- * ...
+## Performance
+
+ * `rowSums2()` is now significantly faster for larger matrices.
 
 
 # Version 1.3.0 [2024-04-10]

diff --git a/src/rowSums2.c b/src/rowSums2.c
@@ -45,7 +45,7 @@ SEXP rowSums2(SEXP x, SEXP dim, SEXP rows, SEXP cols, SEXP naRm, SEXP hasNA, SEX
   */
 
   /* R allocate a double vector of the desired length */
-  PROTECT(ans = allocVector(REALSXP, byrow ? nrows: ncols));
+  PROTECT(ans = allocVector(REALSXP, byrow ? nrows : ncols));
 
   /* Double matrices are more common to use. */
   if (isReal(x)) {

diff --git a/src/rowSums2_lowlevel_template.h b/src/rowSums2_lowlevel_template.h
@@ -46,7 +46,7 @@ void CONCAT_MACROS(rowSums2, X_C_SIGNATURE)(X_C_TYPE *x, R_xlen_t nrow, R_xlen_t
       rowSum = LDOUBLE_ALLOC(nrows);
       /* Ensures that all elements of array are intialized to zero,
        * this is VERY important */
-      memset(rowSum, 0, nrows*sizeof(LDOUBLE));
+      memset(rowSum, 0, nrows*  sizeof(LDOUBLE));
     }
 
     for (jj=0; jj < ncols; jj++) {
@@ -58,7 +58,7 @@ void CONCAT_MACROS(rowSums2, X_C_SIGNATURE)(X_C_TYPE *x, R_xlen_t nrow, R_xlen_t
       } else if (!colsHasNA) {
         colOffset = cols[jj] * nrow;
       } else {
-        colOffset = R_INDEX_OP(cols[jj], *, nrow,1,1);
+        colOffset = R_INDEX_OP(cols[jj], *, nrow, 1, 1);
       }
       for (ii=0; ii < nrows; ii++) {
         if (!colsHasNA && norows) {
@@ -73,9 +73,9 @@ void CONCAT_MACROS(rowSums2, X_C_SIGNATURE)(X_C_TYPE *x, R_xlen_t nrow, R_xlen_t
           value = x[idx];
         } else {
           if (norows) {
-            idx = R_INDEX_OP(colOffset, +, ii,1,1);
+            idx = R_INDEX_OP(colOffset, +, ii, 1, 1);
           } else {
-            idx = R_INDEX_OP(colOffset, +, rows[ii],1,1);
+            idx = R_INDEX_OP(colOffset, +, rows[ii], 1, 1);
           }
           value = R_INDEX_GET(x, idx, X_NA, 1);
         }