Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2bb97ee

Browse filesBrowse files
kevinusheykevinushey
committed
update to oneTBB 2022.0
1 parent 69d50f6 commit 2bb97ee
Copy full SHA for 2bb97ee

File tree

797 files changed

+57177
-168284
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

797 files changed

+57177
-168284
lines changed

‎DESCRIPTION

Copy file name to clipboardExpand all lines: DESCRIPTION
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ Type: Package
33
Title: Parallel Programming Tools for 'Rcpp'
44
Version: 5.1.9.9000
55
Authors@R: c(
6+
person("Kevin", "Ushey", role = c("aut", "cre"), email = "kevin@rstudio.com"),
67
person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
78
person("Romain", "Francois", role = c("aut", "cph")),
8-
person("Kevin", "Ushey", role = c("aut", "cre"), email = "kevin@rstudio.com"),
99
person("Gregory", "Vandenbrouck", role = "aut"),
1010
person("Marcus", "Geelnard", role = c("aut", "cph"),
1111
comment = "TinyThread library, https://tinythreadpp.bitsnbites.eu/"),
1212
person("Hamada S.", "Badr",
1313
email = "badr@jhu.edu",
1414
role = c("ctb"),
1515
comment = c(ORCID = "0000-0002-9808-2344")),
16-
person(family = "Posit, PBC", role = "cph"),
17-
person(family = "Intel", role = c("aut", "cph"),
18-
comment = "Intel TBB library, https://www.threadingbuildingblocks.org/"),
19-
person(family = "Microsoft", role = "cph")
16+
person(family = "Intel", role = c("aut", "cph"), comment = "oneTBB library"),
17+
person(family = "UXL Foundation", role = c("aut", "cph"), comment = "oneTBB library"),
18+
person(family = "Microsoft", role = "cph"),
19+
person(family = "Posit, PBC", role = "cph")
2020
)
2121
Description: High level functions for parallel programming with 'Rcpp'.
2222
For example, the 'parallelFor()' function can be used to convert the work of
@@ -29,7 +29,7 @@ Suggests:
2929
knitr,
3030
rmarkdown
3131
Roxygen: list(markdown = TRUE)
32-
SystemRequirements: GNU make, Intel TBB, Windows: cmd.exe and cscript.exe, Solaris: g++ is required
32+
SystemRequirements: CMake (>= 3.5)
3333
License: GPL (>= 3)
3434
URL: https://rcppcore.github.io/RcppParallel/, https://github.com/RcppCore/RcppParallel
3535
BugReports: https://github.com/RcppCore/RcppParallel/issues

‎NEWS.md

Copy file name to clipboardExpand all lines: NEWS.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
## RcppParallel 5.1.10 (UNRELEASED)
33

4+
* RcppParallel now bundles oneTBB 2022.0.0.
45

56
## RcppParallel 5.1.9
67

‎RcppParallel.Rproj

Copy file name to clipboardExpand all lines: RcppParallel.Rproj
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Version: 1.0
2+
ProjectId: 233b2f71-c2b5-4961-81c5-36b8e5311a3a
23

34
RestoreWorkspace: No
45
SaveWorkspace: No

‎src/Makevars.in

Copy file name to clipboardExpand all lines: src/Makevars.in
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ else
160160
@echo "(tbb) Building TBB using bundled sources ..."
161161
@mkdir -p ../inst/include
162162
@cp -R tbb/include/* ../inst/include/
163-
@(cd tbb/src && $(MAKE_CMD) $(MAKE_ARGS) info)
164-
@(cd tbb/src && $(MAKE_CMD) $(MAKE_ARGS) $(MAKE_TARGETS) $(MAKE_LOG))
163+
@(cd tbb; mkdir -p build; cd build; cmake -DTBB_TEST=0 ..; cmake --build .; mkdir -p lib_release; cp -R *_relwithdebinfo/ lib_release/)
165164
endif
166165

167166
# NOTE: we do not want to clean ../inst/lib or ../inst/libs here,

‎src/install.libs.R.in

Copy file name to clipboardExpand all lines: src/install.libs.R.in
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
tbbLibs <- list.files(
4141
path = "tbb/build/lib_release",
4242
pattern = shlibPattern,
43-
full.names = TRUE
43+
full.names = TRUE,
44+
recursive = TRUE
4445
)
4546

46-
# don't copy symlinks
47-
tbbLibs <- tbbLibs[!nzchar(Sys.readlink(tbbLibs))]
48-
49-
# perform the copy
50-
file.copy(tbbLibs, tbbDest)
47+
# perform the copy; use 'cp' so that we can preserve symlinks
48+
for (tbbLib in tbbLibs) {
49+
system2("cp", c("-P", shQuote(tbbLib), shQuote(tbbDest)))
50+
}
5151

5252
} else {
5353

‎src/tbb/python/TBB.py renamed to ‎src/tbb/.bazelrc

Copy file name to clipboard
+5-10Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#!/usr/bin/env python
2-
#
3-
# Copyright (c) 2016-2019 Intel Corporation
1+
# Copyright (c) 2021 Intel Corporation
42
#
53
# Licensed under the Apache License, Version 2.0 (the "License");
64
# you may not use this file except in compliance with the License.
@@ -14,11 +12,8 @@
1412
# See the License for the specific language governing permissions and
1513
# limitations under the License.
1614

15+
# DISCLAIMER: Bazel support is community-based. The maintainers do not
16+
# use Bazel internally. The Bazel build can have security risks or
17+
# optimization gaps.
1718

18-
from tbb import *
19-
from tbb import __all__, __doc__
20-
21-
if __name__ == "__main__":
22-
from tbb import _main
23-
import sys
24-
sys.exit(_main())
19+
build --symlink_prefix=/ # Out of source build

‎src/tbb/.bazelversion

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.2.1

‎src/tbb/.gitignore

Copy file name to clipboard
+62Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# -------- C++ --------
2+
# Prerequisites
3+
*.d
4+
5+
# Compiled Object files
6+
*.slo
7+
*.lo
8+
*.o
9+
*.obj
10+
11+
# Precompiled Headers
12+
*.gch
13+
*.pch
14+
15+
# Compiled Dynamic libraries
16+
*.so
17+
*.so.*
18+
*.dylib
19+
*.dll
20+
21+
# Fortran module files
22+
*.mod
23+
*.smod
24+
25+
# Compiled Static libraries
26+
*.lai
27+
*.la
28+
*.a
29+
*.lib
30+
31+
# Executables
32+
*.exe
33+
*.out
34+
*.app
35+
36+
# -------- CMake --------
37+
CMakeCache.txt
38+
CMakeFiles
39+
CMakeScripts
40+
Testing
41+
Makefile
42+
cmake_install.cmake
43+
install_manifest.txt
44+
compile_commands.json
45+
CTestTestfile.cmake
46+
build/*
47+
48+
# -------- Python --------
49+
__pycache__/
50+
*.py[cod]
51+
*$py.class
52+
53+
# -------- IDE --------
54+
.vscode/*
55+
.vs/*
56+
out/*
57+
CMakeSettings.json
58+
59+
# -------- CTags --------
60+
.tags
61+
.ctags
62+

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.