Merge pull request #29 from xiangpin/master

supportting large matrix for the calculation of density
YuLab-SMU · Jun 25, 2024 · cbba261 · cbba261
2 parents f956c78 + 8589d11
commit cbba261
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ggsc
 Title: Visualizing Single Cell and Spatial Transcriptomics
-Version: 1.1.4.001
+Version: 1.3.0.001
 Authors@R: c(
        person("Guangchuang", "Yu", 
               email = "[email protected]", 

diff --git a/NEWS.md b/NEWS.md
@@ -1,7 +1,11 @@
-# ggsc 1.1.4.001
+# ggsc 1.3.001
 
 + add `geom_bgpoint()` layer (2024-06-18, Tue, #24)
 
+# ggsc 1.2.0
+
++ Bioconductor RELEASE_3_19 (2024-05-01, Wed)
+
 # ggsc 1.1.4
 
 + add background outline of umap plot (2024-04-12, Fri, #22)

diff --git a/src/Makevars b/src/Makevars
@@ -1,2 +1,3 @@
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(shell ${R_HOME}/bin/Rscript -e "RcppParallel::RcppParallelLibs()")
+PKG_CXXFLAGS += -DARMA_64BIT_WORD
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,2 +1,4 @@
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_CXXFLAGS += -DARMA_64BIT_WORD
+PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::RcppParallelLibs()")