Add more changes from Matrix package and update primme package versio…

…n number
primme · Sep 30, 2023 · fc9ff67 · fc9ff67
1 parent 541d59e
commit fc9ff67
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/R/DESCRIPTION b/R/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: PRIMME
 Type: Package
 Title: Eigenvalues and Singular Values and Vectors from Large Matrices
-Version: 3.2-4
-Date: 2023-05-9
+Version: 3.2-5
+Date: 2023-09-30
 Authors@R: c(person("Eloy", "Romero", role=c("aut", "cre"), email="eloy@cs.wm.edu"),
              person("Andreas", "Stathopoulos", role="aut", email="andreas@cs.wm.edu"),
              person("Lingfei", "Wu", role="aut", email="wuli@us.ibm.com"),

diff --git a/R/cran-comments.md b/R/cran-comments.md
@@ -1,6 +1,6 @@
 ## Changes
 
-* Fix prototype warnings
+* Accommodate following changes in Matrix's API
 
 ## Test environments
 * Ubuntu 20.04, R 4.3 and devel

diff --git a/R/src/primmeR.cpp b/R/src/primmeR.cpp
@@ -550,7 +550,7 @@ void matrixMatvecEigs_CHM_SP(void *x, PRIMME_INT *ldx, void *y, PRIMME_INT *ldy,
 {
    checkUserInterrupt(primme);
 
-   const_CHM_SP chm = (const_CHM_SP)((void**)F::get(primme))[0];
+   CHM_SP chm = (CHM_SP)((void**)F::get(primme))[0];
    ASSERT(chm->nrow == chm->ncol && (PRIMME_INT)chm->nrow == primme->nLocal);
 
    cholmod_dense chx, chy;
@@ -573,7 +573,7 @@ void matrixMatvecEigs_CHM_SP(void *x, PRIMME_INT *ldx, void *y, PRIMME_INT *ldy,
    double ONEf[] = {1.0, 0.0}, ZEROf[] = {0.0, 0.0};
    CHM_CM chol_c = (CHM_CM)((void**)F::get(primme))[1];
 
-   M_cholmod_sdmult(chm, 0, ONEf, ZEROf, (const_CHM_DN)&chx, &chy, chol_c);
+   M_cholmod_sdmult(chm, 0, ONEf, ZEROf, (CHM_DN)&chx, &chy, chol_c);
 
    *ierr = 0;
 }
@@ -1114,7 +1114,7 @@ static void matrixMatvecSvds_CHM_SP(void *x, PRIMME_INT *ldx, void *y, PRIMME_IN
 {  
    checkUserInterrupt(primme_svds);
 
-   const_CHM_SP chm = (const_CHM_SP)((void**)primme_svds->matrix)[0];
+   CHM_SP chm = (CHM_SP)((void**)primme_svds->matrix)[0];
    ASSERT((PRIMME_INT)chm->nrow == primme_svds->mLocal && (PRIMME_INT)chm->ncol == primme_svds->nLocal);
 
    cholmod_dense chx, chy;
@@ -1137,7 +1137,7 @@ static void matrixMatvecSvds_CHM_SP(void *x, PRIMME_INT *ldx, void *y, PRIMME_IN
    double ONEf[] = {1.0, 0.0}, ZEROf[] = {0.0, 0.0};
    CHM_CM chol_c = (CHM_CM)((void**)primme_svds->matrix)[1];
 
-   M_cholmod_sdmult(chm, *transpose?1:0, ONEf, ZEROf, (const_CHM_DN)&chx, &chy,
+   M_cholmod_sdmult(chm, *transpose?1:0, ONEf, ZEROf, (CHM_DN)&chx, &chy,
          chol_c);
 
    *ierr = 0;