[med-svn] [r-cran-data.table] 01/04: New upstream version 1.10.4-3
Andreas Tille
tille at debian.org
Sat Nov 11 13:57:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-data.table.
commit 86e94272bf6680c5da0175e3d3ad54f773404f14
Author: Andreas Tille <tille at debian.org>
Date: Sat Nov 11 14:48:42 2017 +0100
New upstream version 1.10.4-3
---
DESCRIPTION | 6 +++---
MD5 | 12 ++++++------
NEWS.md | 5 +++++
inst/doc/datatable-intro.html | 6 +++---
inst/doc/datatable-keys-fast-subset.html | 6 +++---
inst/doc/datatable-secondary-indices-and-auto-indexing.html | 6 +++---
src/openmp-utils.c | 3 ---
7 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 412cd8b..6e7f270 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: data.table
-Version: 1.10.4-2
+Version: 1.10.4-3
Title: Extension of `data.frame`
Authors at R: c(
person("Matt","Dowle", role=c("aut","cre"), email="mattjdowle at gmail.com"),
@@ -22,7 +22,7 @@ MailingList: datatable-help at lists.r-forge.r-project.org
VignetteBuilder: knitr
ByteCompile: TRUE
NeedsCompilation: yes
-Packaged: 2017-10-12 04:08:36.856 UTC; mdowle
+Packaged: 2017-10-19 21:11:19.239 UTC; mdowle
Author: Matt Dowle [aut, cre],
Arun Srinivasan [aut],
Jan Gorecki [ctb],
@@ -31,4 +31,4 @@ Author: Matt Dowle [aut, cre],
Eduard Antonyan [ctb]
Maintainer: Matt Dowle <mattjdowle at gmail.com>
Repository: CRAN
-Date/Publication: 2017-10-12 14:03:42 UTC
+Date/Publication: 2017-10-27 07:40:34 UTC
diff --git a/MD5 b/MD5
index 3c4dd3c..3b2504c 100644
--- a/MD5
+++ b/MD5
@@ -1,7 +1,7 @@
-fac6375e9b7bd47a4b07d14eb27600ae *DESCRIPTION
+3ebd3e68ac8c646449fee3cc205d230a *DESCRIPTION
d32239bcb673463ab874e80d47fae504 *LICENSE
5feca43f299bbbd001563b1033a59705 *NAMESPACE
-25a37cfa18cb1fffe50e5f11dec46d5e *NEWS.md
+1e81005aee5fbcfe1eb3c6468151067d *NEWS.md
4377e4b917c44366f66862324c8fd32a *R/AllS4.R
3d35eb16da4271f72a9118200db76d65 *R/IDateTime.R
55b63a5d831071ec745ce7bd4ab4a336 *R/as.data.table.R
@@ -41,10 +41,10 @@ d20a5d50c2a2fae35659da9de05acea3 *inst/doc/datatable-faq.R
ac84983e3ef23aec8afed8a0a1d58282 *inst/doc/datatable-faq.html
a6cee59288fadeb28014a1ecbd66c326 *inst/doc/datatable-intro.R
e9fff1a46fdf96e3572b583bc89e8f86 *inst/doc/datatable-intro.Rmd
-627a040520c6a285aa2f7f99654c79bf *inst/doc/datatable-intro.html
+cceec6333a4f509c1b5345f6f99fa827 *inst/doc/datatable-intro.html
c2f4d1dc6234576bf0c1f071325d5b1d *inst/doc/datatable-keys-fast-subset.R
3f2980389baaff06c2d6b401b26d71bf *inst/doc/datatable-keys-fast-subset.Rmd
-0ec41e717cbfea0881f2c90841f6f808 *inst/doc/datatable-keys-fast-subset.html
+fda8bfc5ec0b90e7acfc3e3a7b965878 *inst/doc/datatable-keys-fast-subset.html
723df81331669d44c4cab1f541a3d956 *inst/doc/datatable-reference-semantics.R
531acab6260b82f65ab9048aee6fb331 *inst/doc/datatable-reference-semantics.Rmd
c5cebe2a0d8d2bc31d5f5ec1bdc2b4ee *inst/doc/datatable-reference-semantics.html
@@ -53,7 +53,7 @@ e8ef65c1d8424e390059b854cb18740e *inst/doc/datatable-reshape.Rmd
6a3b8dbf14a5a7b78aec35525dbdfee6 *inst/doc/datatable-reshape.html
22265ade65535db347b44213d4354772 *inst/doc/datatable-secondary-indices-and-auto-indexing.R
bcdc8c1716a1e3aa1ef831bad0d67715 *inst/doc/datatable-secondary-indices-and-auto-indexing.Rmd
-9ce3beb36cba7e2c2dc5251f157f05c1 *inst/doc/datatable-secondary-indices-and-auto-indexing.html
+c5327a7a9f386bfbbc65f3681365770b *inst/doc/datatable-secondary-indices-and-auto-indexing.html
e48efd4babf364e97ff98e56b1980c8b *inst/tests/1206FUT.txt
28b57d31f67353c1192c6f65d69a12b1 *inst/tests/1680-fread-header-encoding.csv
fe198c1178f7db508ee0b10a94272e7e *inst/tests/2008head.csv
@@ -158,7 +158,7 @@ e7aae63b27c01a5acce45023ff436b69 *src/gsumm.c
47792eafb3cee1c03bbcb972d00c4aad *src/ijoin.c
bef407b3b627c2e8704e3a9cc6456de8 *src/init.c
520938944d8dbd58460bcf4ca44e9479 *src/inrange.c
-85ad32d99ab86c022521b275f5dc86de *src/openmp-utils.c
+514fdeb8d011660556e8fe1cdbab836f *src/openmp-utils.c
ab561ed83137b5b2d78d5d06030f7446 *src/quickselect.c
5fafe7c34074d2eaf6549debadaa37df *src/rbindlist.c
416562e57a9368398d026ec1edc96313 *src/reorder.c
diff --git a/NEWS.md b/NEWS.md
index 89e746f..fb4d6b6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,9 @@
+### Changes in v1.10.4-3 (on CRAN 20 Oct 2017)
+
+1. Fixed crash/hang on MacOS when `parallel::mclapply` is used and data.table is merely loaded, [#2418](https://github.com/Rdatatable/data.table/issues/2418). Oddly, all tests including test 1705 (which tests `mclapply` with data.table) passed fine on CRAN. It appears to be some versions of MacOS or some versions of libraries on MacOS, perhaps. Many thanks to Martin Morgan for reporting and confirming this fix works. Thanks also to @asenabouth, Joe Thorley and Danton Noriega for testing, [...]
+
+
### Changes in v1.10.4-2 (on CRAN 12 Oct 2017)
1. OpenMP on MacOS is now supported by CRAN and included in CRAN's package binaries for Mac. But installing v1.10.4-1 from source on MacOS failed when OpenMP was not enabled at compile time, [#2409](https://github.com/Rdatatable/data.table/issues/2409). Thanks to Liz Macfie and @fupangpangpang for reporting. The startup message when OpenMP is not enabled has been updated.
diff --git a/inst/doc/datatable-intro.html b/inst/doc/datatable-intro.html
index e980e3c..1f467d5 100644
--- a/inst/doc/datatable-intro.html
+++ b/inst/doc/datatable-intro.html
@@ -367,16 +367,16 @@ head(ans)
<pre><code class="r">odt = data.table(col = sample(1e7))
(t1 <- system.time(ans1 <- odt[base::order(col)])) ## uses order from base R
# user system elapsed
-# 0.408 0.000 0.408
+# 0.384 0.000 0.384
(t2 <- system.time(ans2 <- odt[order(col)])) ## uses data.table's forder
# user system elapsed
-# 0.852 0.000 0.852
+# 0.360 0.004 0.364
(identical(ans1, ans2))
# [1] TRUE
</code></pre></li>
</ul>
-<p>The speedup here is <strong>~0x</strong>. We will discuss <em>data.table</em>'s fast order in more detail in the <em>data.table internals</em> vignette.</p>
+<p>The speedup here is <strong>~1x</strong>. We will discuss <em>data.table</em>'s fast order in more detail in the <em>data.table internals</em> vignette.</p>
<ul>
<li>This is so that you can improve performance tremendously while using already familiar functions.</li>
diff --git a/inst/doc/datatable-keys-fast-subset.html b/inst/doc/datatable-keys-fast-subset.html
index 2512e12..04449e7 100644
--- a/inst/doc/datatable-keys-fast-subset.html
+++ b/inst/doc/datatable-keys-fast-subset.html
@@ -750,7 +750,7 @@ key(DT)
t1 <- system.time(ans1 <- DT[x == "g" & y == 877L])
t1
# user system elapsed
-# 0.132 0.020 0.153
+# 0.140 0.012 0.155
head(ans1)
# x y val
# 1: g 877 0.3946652
@@ -769,7 +769,7 @@ dim(ans1)
t2 <- system.time(ans2 <- DT[.("g", 877L)])
t2
# user system elapsed
-# 0.000 0.000 0.001
+# 0.004 0.000 0.000
head(ans2)
# x y val
# 1: g 877 0.3946652
@@ -786,7 +786,7 @@ identical(ans1$val, ans2$val)
</code></pre>
<ul>
-<li>The speedup is <strong>~153x</strong>!</li>
+<li>The speedup is <strong>~155x</strong>!</li>
</ul>
<h3>b) Why does keying a <em>data.table</em> result in blazing fast susbets?</h3>
diff --git a/inst/doc/datatable-secondary-indices-and-auto-indexing.html b/inst/doc/datatable-secondary-indices-and-auto-indexing.html
index e59255b..ce6ed59 100644
--- a/inst/doc/datatable-secondary-indices-and-auto-indexing.html
+++ b/inst/doc/datatable-secondary-indices-and-auto-indexing.html
@@ -551,7 +551,7 @@ names(attributes(dt))
## run thefirst time
(t1 <- system.time(ans <- dt[x == 989L]))
# user system elapsed
-# 0.208 0.004 0.212
+# 0.164 0.004 0.169
head(ans)
# x y
# 1: 989 0.5372007
@@ -578,11 +578,11 @@ indices(dt)
# 0 0 0
system.time(dt[x %in% 1989:2012])
# user system elapsed
-# 0 0 0
+# 0.004 0.000 0.001
</code></pre>
<ul>
-<li><p>Running the first time took 0.212 seconds where as the second time took 0.000 seconds. </p></li>
+<li><p>Running the first time took 0.169 seconds where as the second time took 0.000 seconds. </p></li>
<li><p>Auto indexing can be disabled by setting the global argument <code>options(datatable.auto.index = FALSE)</code>.</p></li>
<li><p>Disabling auto indexing still allows to use indices created explicitly with <code>setindex</code> or <code>setindexv</code>. You can disable indices fully by setting global argument <code>options(datatable.use.index = FALSE)</code>.</p></li>
</ul>
diff --git a/src/openmp-utils.c b/src/openmp-utils.c
index d812dca..dad43e3 100644
--- a/src/openmp-utils.c
+++ b/src/openmp-utils.c
@@ -47,9 +47,6 @@ SEXP setDTthreads(SEXP threads) {
// auto avoid deadlock when data.table called from parallel::mclapply
void when_fork() {
-#ifdef _OPENMP
- omp_set_num_threads(1);
-#endif
DTthreads = 1;
}
void avoid_openmp_hang_within_fork() {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-data.table.git
More information about the debian-med-commit
mailing list