update to oneTBB 2022.0

DESCRIPTION

@@ -3,20 +3,20 @@ Type: Package
 Title: Parallel Programming Tools for 'Rcpp'
 Version: 5.1.9.9000
 Authors@R: c(
+    person("Kevin", "Ushey", role = c("aut", "cre"), email = "kevin@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, https://tinythreadpp.bitsnbites.eu/"),
     person("Hamada S.", "Badr",
        email = "badr@jhu.edu",
        role = c("ctb"),
        comment = c(ORCID = "0000-0002-9808-2344")),
-    person(family = "Posit, PBC", role = "cph"),
-    person(family = "Intel", role = c("aut", "cph"),
-       comment = "Intel TBB library, https://www.threadingbuildingblocks.org/"),
-    person(family = "Microsoft", role = "cph")
+    person(family = "Intel", role = c("aut", "cph"), comment = "oneTBB library"),
+    person(family = "UXL Foundation", role = c("aut", "cph"), comment = "oneTBB library"),
+    person(family = "Microsoft", role = "cph"),
+    person(family = "Posit, PBC", role = "cph")
     )
 Description: High level functions for parallel programming with 'Rcpp'.
     For example, the 'parallelFor()' function can be used to convert the work of
@@ -29,7 +29,7 @@ Suggests:
     knitr,
     rmarkdown
 Roxygen: list(markdown = TRUE)
-SystemRequirements: GNU make, Intel TBB, Windows: cmd.exe and cscript.exe, Solaris: g++ is required
+SystemRequirements: CMake (>= 3.5)
 License: GPL (>= 3)
 URL: https://rcppcore.github.io/RcppParallel/, https://github.com/RcppCore/RcppParallel
 BugReports: https://github.com/RcppCore/RcppParallel/issues

NEWS.md

@@ -1,6 +1,7 @@
 
 ## RcppParallel 5.1.10  (UNRELEASED)
 
+* RcppParallel now bundles oneTBB 2022.0.0.
 
 ## RcppParallel 5.1.9
 

RcppParallel.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 233b2f71-c2b5-4961-81c5-36b8e5311a3a
 
 RestoreWorkspace: No
 SaveWorkspace: No

src/Makevars.in

@@ -160,8 +160,7 @@ else
 	@echo "(tbb) Building TBB using bundled sources ..."
 	@mkdir -p ../inst/include
 	@cp -R tbb/include/* ../inst/include/
-	@(cd tbb/src && $(MAKE_CMD) $(MAKE_ARGS) info)
-	@(cd tbb/src && $(MAKE_CMD) $(MAKE_ARGS) $(MAKE_TARGETS) $(MAKE_LOG))
+	@(cd tbb; mkdir -p build; cd build; cmake -DTBB_TEST=0 ..; cmake --build .; mkdir -p lib_release; cp -R *_relwithdebinfo/ lib_release/)
 endif
 
 # NOTE: we do not want to clean ../inst/lib or ../inst/libs here,

src/install.libs.R.in

@@ -40,14 +40,14 @@
       tbbLibs <- list.files(
          path       = "tbb/build/lib_release",
          pattern    = shlibPattern,
-         full.names = TRUE
+         full.names = TRUE,
+         recursive  = TRUE
       )
 
-      # don't copy symlinks
-      tbbLibs <- tbbLibs[!nzchar(Sys.readlink(tbbLibs))]
-
-      # perform the copy
-      file.copy(tbbLibs, tbbDest)
+      # perform the copy; use 'cp' so that we can preserve symlinks
+      for (tbbLib in tbbLibs) {
+         system2("cp", c("-P", shQuote(tbbLib), shQuote(tbbDest)))
+      }
 
    } else {
 

src/tbb/python/TBB.py → src/tbb/.bazelrc

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2016-2019 Intel Corporation
+# Copyright (c) 2021 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# DISCLAIMER: Bazel support is community-based. The maintainers do not
+# use Bazel internally. The Bazel build can have security risks or 
+# optimization gaps.
 
-from tbb import *
-from tbb import __all__, __doc__
-
-if __name__ == "__main__":
-    from tbb import _main
-    import sys
-    sys.exit(_main())
+build --symlink_prefix=/ # Out of source build

src/tbb/.bazelversion

@@ -0,0 +1 @@
+7.2.1

src/tbb/.gitignore

@@ -0,0 +1,62 @@
+# -------- C++ --------
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.so.*
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# -------- CMake --------
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+build/*
+
+# -------- Python --------
+__pycache__/
+*.py[cod]
+*$py.class
+
+# -------- IDE --------
+.vscode/*
+.vs/*
+out/*
+CMakeSettings.json
+
+# -------- CTags --------
+.tags
+.ctags
+