Skip to content

Backport for CRAN patch (1.10.4-1)#2410

Merged
mattdowle merged 2 commits intomasterfrom
cran_patch
Oct 12, 2017
Merged

Backport for CRAN patch (1.10.4-1)#2410
mattdowle merged 2 commits intomasterfrom
cran_patch

Conversation

@mattdowle
Copy link
Copy Markdown
Member

@mattdowle mattdowle commented Oct 11, 2017

Patch is already on CRAN. This PR moves the NEWS entries back into a new 1.10.4-1 section and implements two fixes in the patch that weren't in master :
Closes #2330 : CRAN maintainers needed this to pass R-devel
Closes #2137 : Attempted fix of the fork-after-threads problem. It's specific to the CRAN Mac binary using Intel's OpenMP so I attempted a fix in the patch and we'll need Mac users to test the CRAN package binary. If not, we'll have to raise the problem with Intel.

I'm no longer sure there was a problem with the union method of type punning, so I've reverted to union and changed long long to int64_t. If CRAN shows problems again like last time, I'll think again.

Although 1.10.4-1 is passing on CRAN much better (it was in error state on every instance), a second patch is now on CRAN: 1.10.4-2

@codecov-io
Copy link
Copy Markdown

codecov-io commented Oct 11, 2017

Codecov Report

Merging #2410 into master will not change coverage.
The diff coverage is 95.83%.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #2410   +/-   ##
======================================
  Coverage    91.3%   91.3%           
======================================
  Files          62      62           
  Lines       12027   12027           
======================================
  Hits        10981   10981           
  Misses       1046    1046
Impacted Files Coverage Δ
src/freadR.c 93.24% <ø> (ø) ⬆️
src/wrappers.c 95% <100%> (-0.09%) ⬇️
src/init.c 93.1% <100%> (ø) ⬆️
src/openmp-utils.c 95.65% <100%> (+0.41%) ⬆️
R/data.table.R 97.45% <100%> (ø) ⬆️
src/frank.c 90.83% <100%> (-0.16%) ⬇️
src/assign.c 94.31% <80%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c6afa8c...2d7e0d7. Read the comment docs.

@mattdowle mattdowle requested review from MarkusBonsch and st-pasha and removed request for MarkusBonsch and st-pasha October 11, 2017 04:08
@mattdowle mattdowle merged commit ea2ea11 into master Oct 12, 2017
@mattdowle mattdowle deleted the cran_patch branch October 12, 2017 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Changed NAMED to MAYBE_SHARED New MacOS R v3.4.0 CRAN binary support for OpenMP: error with mclapply

2 participants