From 48dcaa496343765f5399eb2252737c7a60a87c25 Mon Sep 17 00:00:00 2001 From: Jan Wijffels Date: Fri, 31 May 2019 14:15:46 +0200 Subject: [PATCH] Get rid of GNU make as part of SystemRequirements --- DESCRIPTION | 4 ++-- NEWS.md | 4 ++++ src/Makevars | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b7d7292..f3bccdf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: ruimtehol Type: Package Title: Learn Text 'Embeddings' with 'Starspace' -Version: 0.2 +Version: 0.2.1 Maintainer: Jan Wijffels Authors@R: c( person('Jan', 'Wijffels', role = c('aut', 'cre', 'cph'), email = 'jwijffels@bnosac.be', comment = "R wrapper"), @@ -23,4 +23,4 @@ Imports: Rcpp (>= 0.11.5), utils, graphics, stats Suggests: udpipe, data.table LinkingTo: Rcpp, BH RoxygenNote: 6.0.1 -SystemRequirements: C++11, GNU make +SystemRequirements: C++11 diff --git a/NEWS.md b/NEWS.md index 283b8f2..601c4a4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +## CHANGES IN ruimtehol VERSION 0.2.1 + +- remove the GNU make as part of the SystemRequirements + ## CHANGES IN ruimtehol VERSION 0.2 - Allow to do transfer learning by passing an embedding matrix and keep on training based on that matrix diff --git a/src/Makevars b/src/Makevars index f840244..4563a59 100644 --- a/src/Makevars +++ b/src/Makevars @@ -2,11 +2,11 @@ CXX_STD = CXX11 PKG_LIBS = -pthread PKG_CPPFLAGS = -pthread -DSTRICT_R_HEADERS -DBOOST_NO_AUTO_PTR -include compliance.h -I./Starspace/src -SOURCES = Starspace/src/utils/args.cpp Starspace/src/utils/normalize.cpp Starspace/src/utils/utils.cpp -SOURCES += Starspace/src/data.cpp Starspace/src/dict.cpp Starspace/src/doc_data.cpp Starspace/src/doc_parser.cpp Starspace/src/model.cpp Starspace/src/parser.cpp Starspace/src/proj.cpp Starspace/src/starspace.cpp -SOURCES += rcpp_textspace.cpp -SOURCES += compliance.cpp -SOURCES += RcppExports.cpp +SOURCES = Starspace/src/utils/args.cpp Starspace/src/utils/normalize.cpp Starspace/src/utils/utils.cpp \ + Starspace/src/data.cpp Starspace/src/dict.cpp Starspace/src/doc_data.cpp Starspace/src/doc_parser.cpp Starspace/src/model.cpp Starspace/src/parser.cpp Starspace/src/proj.cpp Starspace/src/starspace.cpp \ + rcpp_textspace.cpp \ + compliance.cpp \ + RcppExports.cpp OBJECTS = $(SOURCES:.cpp=.o)