Added ARMA_64BIT_WORD flag to Makevars.

stephenslab · Nov 5, 2024 · f075a01 · f075a01
1 parent 0738d0a
commit f075a01
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Encoding: UTF-8
 Type: Package
 Package: fastTopics
-Version: 0.6-192
-Date: 2024-07-08
+Version: 0.6-193
+Date: 2024-11-05
 Title: Fast Algorithms for Fitting Topic Models and Non-Negative
     Matrix Factorizations to Count Data
 Authors@R: c(person("Peter","Carbonetto",role=c("aut","cre"),

diff --git a/R/fit_poisson_nmf.R b/R/fit_poisson_nmf.R
@@ -449,7 +449,7 @@ fit_poisson_nmf <- function (X, k, fit0, numiter = 100,
     cat(sprintf("Running at most %d %s updates, %s extrapolation ",
                 numiter,method.text,
                 ifelse(control$extrapolate,"with","without")))
-    cat("(fastTopics 0.6-192).\n")
+    cat("(fastTopics 0.6-193).\n")
   }
 
   # INITIALIZE ESTIMATES

diff --git a/src/Makevars b/src/Makevars
@@ -1,7 +1,7 @@
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_DONT_PRINT_ERRORS \
                -DARMA_NO_DEBUG -DARMA_USE_BLAS -DARMA_DONT_USE_OPENMP \
                -DARMA_USE_TBB_ALLOC -DRCPP_PARALLEL_USE_TBB=1 \
-               -DARMA_WARN_LEVEL=1
+               -DARMA_WARN_LEVEL=1 -DARMA_64BIT_WORD
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
            $(shell ${R_HOME}/bin/Rscript -e "RcppParallel::RcppParallelLibs()")
 
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,6 +1,6 @@
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_DONT_PRINT_ERRORS \
                -DARMA_NO_DEBUG -DARMA_USE_BLAS -DARMA_DONT_USE_OPENMP \
                -DARMA_USE_TBB_ALLOC -DRCPP_PARALLEL_USE_TBB=1 \
-               -DARMA_WARN_LEVEL=1
+               -DARMA_WARN_LEVEL=1 -DARMA_64BIT_WORD
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
            $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::RcppParallelLibs()")