more automation in alloc functions

Author: dance858

src/utils/CSC_Matrix.c

@@ -109,14 +109,13 @@ CSR_Matrix *ATA_alloc(const CSC_Matrix *A, size_t *mem)
     }
 
     /* Allocate C and symmetrize it */
-    CSR_Matrix *C = new_csr_matrix(n, n, nnz, NULL);
+    CSR_Matrix *C = new_csr_matrix(n, n, nnz, mem);
     symmetrize_csr(Cp, Ci->data, n, C);
 
     /* free workspace */
     free(Cp);
     iVec_free(Ci);
 
-    if (mem) *mem += csr_memory_bytes(C);
     return C;
 }
 
@@ -213,7 +212,7 @@ void ATDA_fill_values(const CSC_Matrix *A, const double *d, CSR_Matrix *C)
 
 CSC_Matrix *csr_to_csc_alloc(const CSR_Matrix *A, int *iwork, size_t *mem)
 {
-    CSC_Matrix *C = new_csc_matrix(A->m, A->n, A->nnz, NULL);
+    CSC_Matrix *C = new_csc_matrix(A->m, A->n, A->nnz, mem);
 
     int i, j;
     int *count = iwork;
@@ -252,7 +251,6 @@ CSC_Matrix *csr_to_csc_alloc(const CSR_Matrix *A, int *iwork, size_t *mem)
         }
     }
 
-    if (mem) *mem += csc_memory_bytes(C);
     return C;
 }
 
@@ -277,7 +275,7 @@ void csr_to_csc_fill_values(const CSR_Matrix *A, CSC_Matrix *C, int *iwork)
 
 CSR_Matrix *csc_to_csr_alloc(const CSC_Matrix *A, int *iwork, size_t *mem)
 {
-    CSR_Matrix *C = new_csr_matrix(A->m, A->n, A->nnz, NULL);
+    CSR_Matrix *C = new_csr_matrix(A->m, A->n, A->nnz, mem);
 
     int i, j;
     int *count = iwork;
@@ -318,7 +316,6 @@ CSR_Matrix *csc_to_csr_alloc(const CSC_Matrix *A, int *iwork, size_t *mem)
         }
     }
 
-    if (mem) *mem += csr_memory_bytes(C);
     return C;
 }
 
@@ -388,15 +385,14 @@ CSR_Matrix *BTA_alloc(const CSC_Matrix *A, const CSC_Matrix *B, size_t *mem)
     }
 
     /* Allocate C */
-    CSR_Matrix *C = new_csr_matrix(p, n, nnz, NULL);
+    CSR_Matrix *C = new_csr_matrix(p, n, nnz, mem);
     memcpy(C->p, Cp, (p + 1) * sizeof(int));
     memcpy(C->i, Ci->data, nnz * sizeof(int));
 
     /* free workspace */
     free(Cp);
     iVec_free(Ci);
 
-    if (mem) *mem += csr_memory_bytes(C);
     return C;
 }
 
@@ -536,15 +532,14 @@ CSC_Matrix *symBA_alloc(const CSR_Matrix *B, const CSC_Matrix *A, size_t *mem)
 
     /* allocate C and copy the computed structure */
     int total_nnz = Cp[n];
-    CSC_Matrix *C = new_csc_matrix(m, n, total_nnz, NULL);
+    CSC_Matrix *C = new_csc_matrix(m, n, total_nnz, mem);
     memcpy(C->p, Cp, (n + 1) * sizeof(int));
     memcpy(C->i, Ci->data, total_nnz * sizeof(int));
 
     free(marker);
     free(Cp);
     iVec_free(Ci);
 
-    if (mem) *mem += csc_memory_bytes(C);
     return C;
 }
 

src/utils/CSR_Matrix.c

@@ -39,20 +39,18 @@ CSR_Matrix *new_csr_matrix(int m, int n, int nnz, size_t *mem)
 
 CSR_Matrix *new_csr(const CSR_Matrix *A, size_t *mem)
 {
-    CSR_Matrix *copy = new_csr_matrix(A->m, A->n, A->nnz, NULL);
+    CSR_Matrix *copy = new_csr_matrix(A->m, A->n, A->nnz, mem);
     memcpy(copy->p, A->p, (A->m + 1) * sizeof(int));
     memcpy(copy->i, A->i, A->nnz * sizeof(int));
     memcpy(copy->x, A->x, A->nnz * sizeof(double));
-    if (mem) *mem += csr_memory_bytes(copy);
     return copy;
 }
 
 CSR_Matrix *new_csr_copy_sparsity(const CSR_Matrix *A, size_t *mem)
 {
-    CSR_Matrix *copy = new_csr_matrix(A->m, A->n, A->nnz, NULL);
+    CSR_Matrix *copy = new_csr_matrix(A->m, A->n, A->nnz, mem);
     memcpy(copy->p, A->p, (A->m + 1) * sizeof(int));
     memcpy(copy->i, A->i, A->nnz * sizeof(int));
-    if (mem) *mem += csr_memory_bytes(copy);
     return copy;
 }
 
@@ -190,7 +188,7 @@ CSR_Matrix *transpose(const CSR_Matrix *A, int *iwork)
 CSR_Matrix *AT_alloc(const CSR_Matrix *A, int *iwork, size_t *mem)
 {
     /* Allocate A^T and compute sparsity pattern without filling values */
-    CSR_Matrix *AT = new_csr_matrix(A->n, A->m, A->nnz, NULL);
+    CSR_Matrix *AT = new_csr_matrix(A->n, A->m, A->nnz, mem);
 
     int i, j;
     int *count = iwork;
@@ -229,7 +227,6 @@ CSR_Matrix *AT_alloc(const CSR_Matrix *A, int *iwork, size_t *mem)
         }
     }
 
-    if (mem) *mem += csr_memory_bytes(AT);
     return AT;
 }
 

src/utils/linalg_dense_sparse_matmuls.c

@@ -197,7 +197,7 @@ CSR_Matrix *YT_kron_I_alloc(int m, int k, int n, const CSC_Matrix *J, size_t *me
     // ---------------------------------------------------------------
     //           replicate sparsity pattern across blocks
     // ---------------------------------------------------------------
-    CSR_Matrix *C = new_csr_matrix(m * n, J->n, total_nnz, NULL);
+    CSR_Matrix *C = new_csr_matrix(m * n, J->n, total_nnz, mem);
     int idx = 0;
     for (i = 0; i < m * n; i++)
     {
@@ -215,7 +215,6 @@ CSR_Matrix *YT_kron_I_alloc(int m, int k, int n, const CSC_Matrix *J, size_t *me
         iVec_free(pattern[blk_row]);
     }
     free(pattern);
-    if (mem) *mem += csr_memory_bytes(C);
     return C;
 }
 
@@ -287,7 +286,7 @@ CSR_Matrix *I_kron_X_alloc(int m, int k, int n, const CSC_Matrix *J, size_t *mem
 
     /* Step 2: replicate each block's pattern for all m rows
      *         within that block. */
-    CSR_Matrix *C = new_csr_matrix(m * n, J->n, total_nnz, NULL);
+    CSR_Matrix *C = new_csr_matrix(m * n, J->n, total_nnz, mem);
     int idx = 0;
     for (i = 0; i < m * n; i++)
     {
@@ -305,7 +304,6 @@ CSR_Matrix *I_kron_X_alloc(int m, int k, int n, const CSC_Matrix *J, size_t *mem
         iVec_free(pattern[blk]);
     }
     free(pattern);
-    if (mem) *mem += csr_memory_bytes(C);
     return C;
 }
 

src/utils/linalg_sparse_matmuls.c

@@ -304,13 +304,12 @@ CSR_Matrix *csr_csc_matmul_alloc(const CSR_Matrix *A, const CSC_Matrix *B,
         Cp[i + 1] = nnz;
     }
 
-    CSR_Matrix *C = new_csr_matrix(m, p, nnz, NULL);
+    CSR_Matrix *C = new_csr_matrix(m, p, nnz, mem);
     memcpy(C->p, Cp, (m + 1) * sizeof(int));
     memcpy(C->i, Ci->data, nnz * sizeof(int));
     free(Cp);
     iVec_free(Ci);
 
-    if (mem) *mem += csr_memory_bytes(C);
     return C;
 }