0.5.0 CRAN release

.Rbuildignore

@@ -12,3 +12,4 @@ docs/
 ^.clang-format$
 ^Makefile$
 extradata/
+revdep/

.gitignore

@@ -7,9 +7,9 @@ src/*.so
 src/*.dll
 .DS_Store
 extradata/
-
 *.status
 config.log
 autom4te.cache
-
 src/Makevars
+revdep
+.Rprofile

DESCRIPTION

@@ -40,9 +40,9 @@ License: GPL (>= 2)
 Encoding: UTF-8
 LazyData: true
 ByteCompile: true
-Depends: R (>= 3.6.0), methods, MatrixExtra (>= 0.1.7)
-Imports: 
-    Matrix (>= 1.3),
+Depends: R (>= 3.6.0), methods, Matrix (>= 1.3)
+Imports:
+    MatrixExtra (>= 0.1.7),
     Rcpp (>= 0.11),
     data.table (>= 1.10.0),
     float (>= 0.2-2),

NAMESPACE

@@ -13,7 +13,6 @@ export(ndcg_k)
 export(soft_impute)
 export(soft_svd)
 import(Matrix)
-import(MatrixExtra)
 import(Rcpp)
 import(data.table)
 import(float)

R/zzz.R

@@ -1,10 +1,9 @@
 #' @import methods
-#' @import Matrix
 #' @importFrom stats rnorm
 #' @import data.table
 #' @import Rcpp
 #' @import float
-#' @import MatrixExtra
+#' @import Matrix
 #' @importFrom RhpcBLASctl get_num_cores
 #' @useDynLib rsparse, .registration = TRUE
 

cran-comments.md

@@ -1,6 +1,6 @@
-# New release
+# Resubmission
 
-- fixed autoconf 2.71 warnings
+- fixed pkg imports to not break dependencies
 
 # Test environments
 
@@ -9,10 +9,4 @@
 
 # R CMD check results
 
-0 errors | 0 warning | 1 notes
-
-> File ‘rsparse/libs/rsparse.so’:
-  Found ‘__ZNSt3__14cerrE’, possibly from ‘std::cerr’ (C++)
-    Objects: ‘wrmf_explicit.o’, ‘wrmf_implicit.o’
-
-this is spurious NOTE, we don't touch stderr.
+0 errors | 0 warning | 0 notes

inst/include/nnls.hpp

@@ -1,4 +1,9 @@
+#ifdef RSPARSE_R_PKG
+#include <RcppArmadillo.h>
+#else
 #include <armadillo>
+#endif
+
 
 #define EPS 1e-16
 

inst/include/wrmf.hpp

@@ -1,4 +1,9 @@
+#ifdef RSPARSE_R_PKG
+#include <RcppArmadillo.h>
+#else
 #include <armadillo>
+#endif
+
 #include "mapped_csc.hpp"
 #include "mapped_csr.hpp"
 

src/Makevars.in

@@ -1,4 +1,4 @@
-PKG_CPPFLAGS = -DARMA_32BIT_WORD -I../inst/include/
+PKG_CPPFLAGS = -DARMA_32BIT_WORD -I../inst/include/ -DRSPARSE_R_PKG -DARMA_NO_DEBUG
 PKG_CXXFLAGS = @OPENMP_FLAG@
 PKG_LIBS = @OPENMP_FLAG@ @FLOAT_LIBS@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 

src/Makevars.win

@@ -1,7 +1,7 @@
 R_SCMD = ${R_HOME}/bin${R_ARCH_BIN}/Rscript -e
 FLOAT_LIBS = $(shell ${R_SCMD} "float:::ldflags()")
 
-PKG_CPPFLAGS = -I../inst/include/ -DARMA_32BIT_WORD -DARMA_DONT_USE_BLAS -DARMA_NO_DEBUG
+PKG_CPPFLAGS = -I../inst/include/ -DARMA_32BIT_WORD -DARMA_DONT_USE_BLAS -DARMA_NO_DEBUG -DRSPARSE_R_PKG
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(FLOAT_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)