version 4.3.18

Author: kevinushey

DESCRIPTION

@@ -1,11 +1,11 @@
 Package: RcppParallel
 Type: Package
 Title: Parallel Programming Tools for 'Rcpp'
-Version: 4.3.15
-Date: 2016-01-12
+Version: 4.3.18
 Authors@R: c(
- person("JJ", "Allaire", role = c("aut", "cre"), email = "jj@rstudio.com"),
+ person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
  person("Romain", "Francois", role = c("aut", "cph")),
+ person("Kevin", "Ushey", role = c("aut", "cre"), email = "kevin@rstudio.com"),
  person("Gregory", "Vandenbrouck", role = "aut"),
  person("Marcus", "Geelnard", role = c("aut", "cph"),
  comment = "TinyThread library, http://tinythreadpp.bitsnbites.eu/"),
@@ -14,28 +14,31 @@ Authors@R: c(
  comment = "Intel TBB library, https://www.threadingbuildingblocks.org/"),
  person(family = "Microsoft", role = "cph")
  )
-Description: High level functions for doing parallel programming with 'Rcpp'.
- For example, the parallelFor() function can be used to convert the work of 
- a standard serial "for" loop into a parallel one and the parallelReduce() 
- function can be used for accumulating aggregate or other values.
-Suggests: Rcpp, RUnit
+Description: High level functions for parallel programming with 'Rcpp'.
+ For example, the 'parallelFor()' function can be used to convert the work of
+ a standard serial "for" loop into a parallel one and the 'parallelReduce()'
+ function can be used for accumulating aggregate or other values.
+Depends: R (>= 3.0.2)
+Suggests: Rcpp, RUnit, knitr, rmarkdown
+LinkingTo: BH (>= 1.60.0-1)
 SystemRequirements: GNU make, Windows: cmd.exe and cscript.exe,
  Solaris: g++ is required
 License: GPL-2
 URL: http://rcppcore.github.io/RcppParallel,
  https://github.com/RcppCore/RcppParallel
 Collate: 'build.R' 'hooks.R' 'options.R'
 NeedsCompilation: yes
-Packaged: 2016-01-12 13:39:30 UTC; jjallaire
-Author: JJ Allaire [aut, cre],
+Packaged: 2016-04-20 19:03:10 UTC; kevin
+Author: JJ Allaire [aut],
  Romain Francois [aut, cph],
+ Kevin Ushey [aut, cre],
  Gregory Vandenbrouck [aut],
  Marcus Geelnard [aut, cph] (TinyThread library,
  http://tinythreadpp.bitsnbites.eu/),
  RStudio [cph],
  Intel [aut, cph] (Intel TBB library,
  https://www.threadingbuildingblocks.org/),
  Microsoft [cph]
-Maintainer: JJ Allaire <jj@rstudio.com>
+Maintainer: Kevin Ushey <kevin@rstudio.com>
 Repository: CRAN
-Date/Publication: 2016-01-12 22:46:10
+Date/Publication: 2016-04-21 19:35:07

MD5

@@ -1,13 +1,13 @@
-b2c6f4c9425d4975f3e4f0fcd9665273 *DESCRIPTION
-6684f7af533cedbca1dda7f22759016b *NAMESPACE
-d68de76ac3034457a9275f580f5c41ba *R/build.R
+43002986ff78249650380158a7472b4b *DESCRIPTION
+41a7ed7fb7d5974429d3047e3f9c0b91 *NAMESPACE
+5a1495bf7a04c7ba544b8d4c4c002d79 *R/build.R
 2cd3bdbbfa4aa54c45e9413b93b1d1b6 *R/hooks.R
 cb7259a31eb853ae93044c43fb1cf101 *R/options.R
 e89153e4f767f8d3efb6c16896362e00 *inst/NEWS
 5ff513fb33023d45231d644c6cd9e7ba *inst/include/RcppParallel.h
-565df1e5d841a44945867c15c102488e *inst/include/RcppParallel/Common.h
+d4ab7ad2384f150a32637a284e831bc0 *inst/include/RcppParallel/Common.h
 713b5bf399a131309eadefd0d0924dd2 *inst/include/RcppParallel/RMatrix.h
-d38427a7601c227e4d2e19b03cf7badd *inst/include/RcppParallel/RVector.h
+7b0de08055d8aa0b21de7a1260083041 *inst/include/RcppParallel/RVector.h
 70ea4c28bcd015bcf2eef88bb1d45ced *inst/include/RcppParallel/TBB.h
 804a6a70a3eefef66c5700bd0fbbfe9b *inst/include/RcppParallel/Timer.h
 bc648370d52bcd49fafb79868128d370 *inst/include/RcppParallel/TinyThread.h
@@ -114,8 +114,6 @@ a81a9a9aa5599ac8e23deeabd7d38b19 *inst/include/tthread/tinythread.h
 0c44e73699a42f681fe19e2c97d387b0 *inst/presentations/header.tex
 8e6bce8f0fa9f6145727aeafac626ae2 *inst/presentations/images/big-data-big-machine-tweet.png
 c2423aacc0fa4e2f520477749c96e7ad *inst/presentations/rcpp_parallel_talk_jan2015.Rmd
-86f28ba828e0ab4aed07deda77b62963 *inst/presentations/rcpp_parallel_talk_jan2015.pdf
-414995ebb0c43800f8ba9230cb8b1cf3 *inst/presentations/rcpp_parallel_talk_jan2015.tex
 c7e35f89b0b1ffb309920b6596b13d62 *inst/tests/cpp/distance.cpp
 b9e5bbe1cadd17714288718fa225e49c *inst/tests/cpp/innerproduct.cpp
 7e29328ca6927d0297b4ff2d2f498305 *inst/tests/cpp/malloc.cpp
@@ -127,9 +125,9 @@ d201cb80099dba62315a39eaadc0eb67 *inst/tests/runit.innerproduct.R
 3b28677a7432e04b31b7cb91ca17855f *inst/tests/runit.sum.R
 bcb7cccabfbd3e3f24834d40d1f014a0 *inst/tests/runit.transform.R
 cee8e00decc99c13c084f3af8256c9df *man/RcppParallel-package.Rd
-383a5f06b6ff0e8183c1779a6a8c499a *man/RcppParallelLibs.Rd
+ede5dd7c3ef93a2587b0a8bb6e07e99b *man/RcppParallelFlags.Rd
 f3b91a97f7f2c4cbe658b0858d74017e *man/setThreadOptions.Rd
-f058fb703b049c996e079f56328b2da1 *src/Makevars
+d2d755fa825e45d2ee551b52641b2bf0 *src/Makevars
 32ee0b5805df0877ee7e81d97619ec96 *src/options.cpp
 226aad3e6ae47bda6bea91202848216b *src/tbb/CHANGES
 2c7f2caf277a3933e3acdf7f89d54cc1 *src/tbb/COPYING
@@ -190,7 +188,7 @@ fe50a0837adfa4d28a4eb54330b5b89d *src/tbb/build/vs2010/index.html
 3958791e4af00d096c9d6a11a891da08 *src/tbb/build/vs2010/tbbmalloc_proxy.vcxproj
 05383b27de90238f9e901658c1812a81 *src/tbb/build/vs2010/version_string.ver
 aeaa643fcb83517e92e762ed0b3b27fa *src/tbb/build/windows.cl.inc
-1749d820f760329bd1b76fcc6562cd40 *src/tbb/build/windows.gcc.inc
+818ec998d400f298e2fdf1d25f07f3bb *src/tbb/build/windows.gcc.inc
 56588cb3cca759312fad844b79846a95 *src/tbb/build/windows.icl.inc
 afc244fd609cbd6c7c35e1a8a0ac47b7 *src/tbb/build/windows.inc
 db4c2aeff8c80d7e311740d4aaefb8c8 *src/tbb/build/xbox360.cl.inc

NAMESPACE

@@ -1,4 +1,7 @@
 export(setThreadOptions)
 export(defaultNumThreads)
 export(RcppParallelLibs)
+export(CxxFlags)
+export(LdFlags)
+
 

R/build.R

@@ -1,19 +1,32 @@
 
 
+# Output the CXX flags. These flags are propagated to sourceCpp via the 
+# inlineCxxPlugin (defined below) and to packages via a line in Makevars[.win]
+# like this:
+#
+# PKG_CXXFLAGS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::CxxFlags()")
+#
+CxxFlags <- function() {
+ cat(tbbCxxFlags())
+}
+
+
 # Output the LD flags for building against TBB. These flags are propagated
 # to sourceCpp via the inlineCxxPlugin (defined below) and to packages 
-# via a line in Makevars.win like this:
+# via a line in Makevars[.win] like this:
 #
 # PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::LdFlags()")
 #
-# Note that this is only required for Windows builds (on Linux and OS X no 
-# explicit link to TBB is required).
-RcppParallelLibs <- function() {
+LdFlags <- function() {
  cat(tbbLdFlags())
 }
 
+# alias for backward compatibility
+RcppParallelLibs <- function() {
+ LdFlags()
+}
 
-# Inline plugin used by sourceCpp to link to the TBB library
+# Inline plugin used by sourceCpp.
 inlineCxxPlugin <- function() {
  list(
  env = list(
@@ -22,15 +35,19 @@ inlineCxxPlugin <- function() {
  ),
  includes = "#include <RcppParallel.h>",
  LinkingTo = "RcppParallel",
- body = function( x ) x,
+ body = function(x) x,
  Depends = "RcppParallel"
  )
 }
 
 tbbCxxFlags <- function() {
- flags <- "$(CXX1XSTD)"
+ 
+ flags <- c()
+ 
+ # opt-in to TBB on Windows
  if (Sys.info()['sysname'] == "Windows")
  flags <- paste(flags, "-DRCPP_PARALLEL_USE_TBB=1")
+ 
  flags
 }
 

inst/include/RcppParallel/Common.h

@@ -21,6 +21,7 @@ struct Worker
  virtual void operator()(std::size_t begin, std::size_t end) = 0; 
 
  // disable copying and assignment
+private:
  Worker(const Worker&);
  void operator=(const Worker&);
 };

inst/include/RcppParallel/RVector.h

@@ -42,6 +42,7 @@ class RVector {
  inline const_iterator begin() const { return begin_; }
  inline const_iterator end() const { return end_; }
 
+ inline std::size_t size() const { return end_ - begin_; }
  inline std::size_t length() const { return end_ - begin_; }
 
  inline T& operator[](std::size_t i) {

inst/presentations/rcpp_parallel_talk_jan2015.pdf

@@ -0,0 +1,28 @@
+\name{RcppParallelFlags}
+\alias{RcppParallelLibs}
+\alias{LdFlags}
+\alias{CxxFlags}
+\title{
+Compilation flags for RcppParallel
+}
+\description{
+Output the compiler or linker flags required to build against RcppParallel.
+}
+\usage{
+CxxFlags()
+LdFlags()
+RcppParallelLibs()
+}
+
+\details{
+These functions are typically called from \code{Makevars} as follows:
+
+\code{PKG_LIBS += $(shell "${R_HOME}/bin/Rscript/" -e "RcppParallel::LdFlags()")}
+
+}
+
+\value{
+ Returns \code{NULL} invisibly. The function is not called for it's
+ return value rather for the side effect of outputting the flags.
+}
+