diff --git a/CHANGELOG.md b/CHANGELOG.md index ca72569..e09a3ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## [1.0.3] - 2024-Feb-26 +* Need to explicitly set `CXX ?= g++` as some default clang settings need explicit '-std=c++11' + ## [1.0.2] - 2024-Feb-22 * Remove 'SystemRequirements: C++11, GNU make' * Fix Makevars files diff --git a/DESCRIPTION b/DESCRIPTION index 5f3af95..86b59e0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: N2R Type: Package Title: Fast and Scalable Approximate k-Nearest Neighbor Search Methods using 'N2' Library -Version: 1.0.2 +Version: 1.0.3 Authors@R: c(person("Peter", "Kharchenko", email = "Peter_Kharchenko@hms.harvard.edu", role = c("aut")), person("Viktor", "Petukhov", email = "viktor.s.petukhov@ya.ru", role = c("aut")), person("Dirk", "Eddelbuettel", email="edd@debian.org", role=c("ctb")), person("Evan", "Biederstedt", email = "evan.biederstedt@gmail.com", role=c("cre", "aut"))) Description: Implements methods to perform fast approximate K-nearest neighbor search on input matrix. Algorithm based on the 'N2' implementation of an approximate nearest neighbor search using hierarchical Navigable Small World (NSW) graphs. The original algorithm is described in "Efficient and Robust Approximate Nearest Neighbor Search Using Hierarchical Navigable Small World Graphs", Y. Malkov and D. Yashunin, , . License: Apache License 2.0 diff --git a/README.md b/README.md index 49a7cd8..2ba91cd 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,6 @@ If you find `N2R` useful for your publication, please cite: ``` Peter Kharchenko, Viktor Petukhov and Evan Biederstedt (2022). N2R: Fast and Scalable Approximate k-Nearest Neighbor Search Methods using -N2 Library. R package version 1.0.2 +N2 Library. R package version 1.0.3 https://github.com/kharchenkolab/N2R ``` diff --git a/src/n2/Makefile b/src/n2/Makefile index 60ad3f0..4fd9c7e 100644 --- a/src/n2/Makefile +++ b/src/n2/Makefile @@ -1,6 +1,6 @@ -CXX = g++ +CXX ?= g++ PKG_CXXFLAGS = -O3 -pthread -fPIC -I"./include" $(SHLIB_OPENMP_CXXFLAGS) -##PKG_CXXFLAGS = -I"./include" +PKG_CXXFLAGS = -I"./include" LDFLAGS = -lpthread LIB = ../libn2.a diff --git a/src/n2/Makefile.win b/src/n2/Makefile.win index 54e5e84..29bb599 100644 --- a/src/n2/Makefile.win +++ b/src/n2/Makefile.win @@ -1,6 +1,6 @@ -CXX = g++ +CXX ?= g++ PKG_CXXFLAGS = -O3 -pthread -fPIC -I"./include" $(SHLIB_OPENMP_CXXFLAGS) -##PKG_CXXFLAGS = -I"./include" +PKG_CXXFLAGS = -I"./include" LDFLAGS = -lpthread LIB = ../libn2.a