From 3dc7424259bbd7196b87aacf61e45cdc909b31e7 Mon Sep 17 00:00:00 2001 From: Matt Dowle Date: Wed, 22 Sep 2021 17:08:25 -0600 Subject: [PATCH 1/4] applied patch file from Prof Ripley --- src/data.table.h | 3 ++- src/frollR.c | 3 ++- src/types.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/data.table.h b/src/data.table.h index 2ba639a64a..e618074741 100644 --- a/src/data.table.h +++ b/src/data.table.h @@ -1,3 +1,5 @@ +#include "myomp.h" + #include "dt_stdio.h" // PRId64 and PRIu64 #include #include @@ -10,7 +12,6 @@ #define SEXPPTR_RO(x) ((const SEXP *)DATAPTR_RO(x)) // to avoid overhead of looped STRING_ELT and VECTOR_ELT #include // for uint64_t rather than unsigned long long #include -#include "myomp.h" #include "types.h" #include "po.h" #ifdef WIN32 // positional specifiers (%n$) used in translations; #4402 diff --git a/src/frollR.c b/src/frollR.c index 644b863439..4c91da2641 100644 --- a/src/frollR.c +++ b/src/frollR.c @@ -1,5 +1,6 @@ -#include +//#include #include "data.table.h" +#include SEXP coerceToRealListR(SEXP obj) { // accept atomic/list of integer/logical/real returns list of real diff --git a/src/types.c b/src/types.c index 18f1993dc2..c847c0afdd 100644 --- a/src/types.c +++ b/src/types.c @@ -1,5 +1,5 @@ -#include #include "data.table.h" +#include /* * find end of a string, used to append verbose messages or warnings From c57f095b05dfd663df0480ec4b44d6050ba097b3 Mon Sep 17 00:00:00 2001 From: Matt Dowle Date: Wed, 22 Sep 2021 17:24:46 -0600 Subject: [PATCH 2/4] added comments so we don't forget why data.table.h is first --- src/data.table.h | 3 +-- src/frollR.c | 3 +-- src/types.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/data.table.h b/src/data.table.h index e618074741..6bafdc52af 100644 --- a/src/data.table.h +++ b/src/data.table.h @@ -1,5 +1,4 @@ -#include "myomp.h" - +#include "myomp.h" // first for clang-13-omp, #5122 #include "dt_stdio.h" // PRId64 and PRIu64 #include #include diff --git a/src/frollR.c b/src/frollR.c index 4c91da2641..74cc7dd4ef 100644 --- a/src/frollR.c +++ b/src/frollR.c @@ -1,5 +1,4 @@ -//#include -#include "data.table.h" +#include "data.table.h" // first (before Rdefines.h) for clang-13-omp, #5122 #include SEXP coerceToRealListR(SEXP obj) { diff --git a/src/types.c b/src/types.c index c847c0afdd..6e9020bb59 100644 --- a/src/types.c +++ b/src/types.c @@ -1,4 +1,4 @@ -#include "data.table.h" +#include "data.table.h" // first (before Rdefines.h) for clang-13-omp, #5122 #include /* From fd4b2394f3cdc9b884654bec9a23d106def92d57 Mon Sep 17 00:00:00 2001 From: Matt Dowle Date: Wed, 22 Sep 2021 17:56:42 -0600 Subject: [PATCH 3/4] news item --- NEWS.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index e14e59b590..dbc4571bad 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ **Benchmarks are regularly updated: [here](https://h2oai.github.io/db-benchmark/)** -# data.table [v1.14.1](https://github.com/Rdatatable/data.table/milestone/20) (in development) +# data.table [v1.14.3](https://github.com/Rdatatable/data.table/milestone/20) (in development) ## NEW FEATURES @@ -410,6 +410,13 @@ The message is now upgraded to warning that the option is now ignored. +# data.table [v1.14.2](https://github.com/Rdatatable/data.table/milestone/24?closed=1) + +## NOTES + +1. clang 13.0.0 (Sep 2021) requires the system header `omp.h` to be included before R's headers, [#5122](https://github.com/Rdatatable/data.table/issues/5122). Many thanks to Prof Ripley for testing and providing a patch file. + + # data.table [v1.14.0](https://github.com/Rdatatable/data.table/milestone/23?closed=1) (21 Feb 2021) ## POTENTIALLY BREAKING CHANGES From 558fcca91fb1a67491285e3579c6403e5b260824 Mon Sep 17 00:00:00 2001 From: Matt Dowle Date: Wed, 22 Sep 2021 18:02:00 -0600 Subject: [PATCH 4/4] 1.14.1 => 1.14.3 --- DESCRIPTION | 2 +- src/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3f2fd8936d..5e412260b4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: data.table -Version: 1.14.1 +Version: 1.14.3 Title: Extension of `data.frame` Authors@R: c( person("Matt","Dowle", role=c("aut","cre"), email="mattjdowle@gmail.com"), diff --git a/src/init.c b/src/init.c index 56bf66d419..0c1774508b 100644 --- a/src/init.c +++ b/src/init.c @@ -425,6 +425,6 @@ SEXP initLastUpdated(SEXP var) { SEXP dllVersion() { // .onLoad calls this and checks the same as packageVersion() to ensure no R/C version mismatch, #3056 - return(ScalarString(mkChar("1.14.1"))); + return(ScalarString(mkChar("1.14.3"))); }