Skip to content

Commit f659b80

Browse files
kevinusheycran-robot
authored andcommitted
version 5.1.11
1 parent 7e717c9 commit f659b80

File tree

8 files changed

+33
-18
lines changed

8 files changed

+33
-18
lines changed

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: RcppParallel
22
Type: Package
33
Title: Parallel Programming Tools for 'Rcpp'
4-
Version: 5.1.10
4+
Version: 5.1.11
55
Authors@R: c(
66
person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
77
person("Romain", "Francois", role = c("aut", "cph")),
@@ -34,18 +34,18 @@ Biarch: TRUE
3434
RoxygenNote: 7.1.1
3535
Encoding: UTF-8
3636
NeedsCompilation: yes
37-
Packaged: 2025-01-23 23:26:25 UTC; kevin
37+
Packaged: 2025-08-27 00:16:42 UTC; kevin
3838
Author: JJ Allaire [aut],
3939
Romain Francois [aut, cph],
4040
Kevin Ushey [aut, cre],
4141
Gregory Vandenbrouck [aut],
4242
Marcus Geelnard [aut, cph] (TinyThread library,
4343
https://tinythreadpp.bitsnbites.eu/),
44-
Hamada S. Badr [ctb] (<https://orcid.org/0000-0002-9808-2344>),
44+
Hamada S. Badr [ctb] (ORCID: <https://orcid.org/0000-0002-9808-2344>),
4545
Posit, PBC [cph],
4646
Intel [aut, cph] (Intel TBB library,
4747
https://www.threadingbuildingblocks.org/),
4848
Microsoft [cph]
4949
Maintainer: Kevin Ushey <kevin@rstudio.com>
5050
Repository: CRAN
51-
Date/Publication: 2025-01-24 02:00:02 UTC
51+
Date/Publication: 2025-08-27 05:10:22 UTC

MD5

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
2940d53a6aa75156f743508ef9481a0a *DESCRIPTION
1+
ce3e7a141e7c983b063e4fc1ee22b191 *DESCRIPTION
22
ac5bf58d5c93a8009b0a3b8ae1ecabba *NAMESPACE
3-
e30dd714333a1f33baca986cc2e68490 *NEWS.md
3+
60325e9b96f95fbb2922ea7fe0dd79bc *NEWS.md
44
4939bb891c20f17804b6d352c57c11d8 *R/RcppParallel-package.R
55
a3ac253c981edd6f2fa1cb6d9b90490a *R/aaa.R
66
5840541bf85bbc1a5cda5ee91b053b8c *R/flags.R
@@ -18,10 +18,10 @@ e890112877abbbe5071b3bd3fb711d7a *configure
1818
eabcad63d8b0a123cfa5594db25a6074 *configure.win
1919
42b0c04465e92560c2115fda3b330641 *inst/include/RcppParallel.h
2020
a6c056a4c7e284fb4a0258a525669340 *inst/include/RcppParallel/Backend.h
21-
ac56df57773b7a0cb486e3c1f4ee750c *inst/include/RcppParallel/Common.h
21+
e55235d77e3025bc577abd97d0756bf2 *inst/include/RcppParallel/Common.h
2222
bdd2f294b6f0cbd436617eb4df15401e *inst/include/RcppParallel/RMatrix.h
2323
7b0de08055d8aa0b21de7a1260083041 *inst/include/RcppParallel/RVector.h
24-
b90c6ff48f74a501d83c09b49dfb792e *inst/include/RcppParallel/TBB.h
24+
e537a5f4aa80e96da320e173e791f39f *inst/include/RcppParallel/TBB.h
2525
804a6a70a3eefef66c5700bd0fbbfe9b *inst/include/RcppParallel/Timer.h
2626
8a02a105057ddfd80fd9e3916d4d96dc *inst/include/RcppParallel/TinyThread.h
2727
36a8c5ad8e670d6c23f41c480b437b56 *inst/include/tthread/fast_mutex.h
@@ -51,8 +51,8 @@ b350d5e8cdc06cef519240e85f81b78f *man/tbbLibraryPath.Rd
5151
6fede758b0da52a3302e2731e35e6655 *src/Makevars.in
5252
045a4820dd01a1a7dcaef8fd86b733af *src/init.cpp
5353
e69672bb4874a75c45ba99b8abd1cbe5 *src/install.libs.R.in
54-
9c48669d14f38146b870211c0735b2e7 *src/options.cpp
55-
379971a977a261fce5ed365331d92bc6 *src/tbb.cpp
54+
426adec0faacae91154aaf31070e48bc *src/options.cpp
55+
bd642660635b7ac9f2fd7659063da240 *src/tbb.cpp
5656
071898d575026ef4372aefb6397b972c *src/tbb/CHANGES
5757
86d3f3a95c324c9479bd8986968f4327 *src/tbb/COPYING
5858
2ce5ccb08b9241779b00daa1bc9527c4 *src/tbb/Doxyfile
@@ -245,7 +245,7 @@ f695403ace72c8a47dc29652ee5fddd8 *src/tbb/include/tbb/runtime_loader.h
245245
b8659493818dcc3865043f1fbb0e5890 *src/tbb/include/tbb/scalable_allocator.h
246246
76fdaa55c991a4d5bcdd20e816c4edd0 *src/tbb/include/tbb/spin_mutex.h
247247
5c734b9b080b0aa64c004f7eeb5a0a7a *src/tbb/include/tbb/spin_rw_mutex.h
248-
1d643fc517a95e564ae269c536e8972d *src/tbb/include/tbb/task.h
248+
d257bf79ee5250b39d4899da11c4eb16 *src/tbb/include/tbb/task.h
249249
5ffc1ef9ec106461e362a17284942c0b *src/tbb/include/tbb/task_arena.h
250250
f06a5dbac72c100ccb622d543926a91d *src/tbb/include/tbb/task_group.h
251251
ffd12e342ce2f7a2230fcb9a3dd263db *src/tbb/include/tbb/task_scheduler_init.h

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
## RcppParallel 5.1.11
3+
4+
* Compatibility with LLVM 21.
5+
26
## RcppParallel 5.1.10
37

48
* Fixed an issue where packages linking to RcppParallel could inadverently

inst/include/RcppParallel/Common.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
#include <cstddef>
66
#include <cstdlib>
77

8+
#include <algorithm>
9+
#include <memory>
10+
#include <functional>
11+
#include <utility>
12+
813
namespace RcppParallel {
914

1015
template <typename T, typename U>

inst/include/RcppParallel/TBB.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
# define TBB_PREVIEW_GLOBAL_CONTROL 1
88
#endif
99

10-
#include <tbb/tbb.h>
11-
#include <tbb/global_control.h>
12-
#include <tbb/scalable_allocator.h>
10+
#include "tbb/tbb.h"
1311

1412
namespace RcppParallel {
1513

src/options.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#include <string>
99
#include <exception>
1010

11+
#include <tbb/tbb.h>
12+
#include <tbb/global_control.h>
13+
#include <tbb/scalable_allocator.h>
14+
1115
extern "C" SEXP defaultNumThreads() {
1216
SEXP threadsSEXP = Rf_allocVector(INTSXP, 1);
1317
#ifdef __TBB_task_arena_H

src/tbb.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#include <RcppParallel/Common.h>
55
#include <RcppParallel/TBB.h>
66

7+
#include <tbb/tbb.h>
8+
#include <tbb/global_control.h>
9+
#include <tbb/scalable_allocator.h>
10+
711
namespace RcppParallel {
812

913
tbb::global_control* s_globalControl = nullptr;

src/tbb/include/tbb/task.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,10 @@ class task_group_context : internal::no_copy {
350350
public:
351351
enum kind_type {
352352
isolated,
353-
bound
353+
bound,
354+
binding_completed,
355+
detached,
356+
dying
354357
};
355358

356359
enum traits_type {
@@ -561,9 +564,6 @@ class task_group_context : internal::no_copy {
561564
friend class internal::allocate_root_with_context_proxy;
562565

563566
static const kind_type binding_required = bound;
564-
static const kind_type binding_completed = kind_type(bound+1);
565-
static const kind_type detached = kind_type(binding_completed+1);
566-
static const kind_type dying = kind_type(detached+1);
567567

568568
//! Propagates any state change detected to *this, and as an optimisation possibly also upward along the heritage line.
569569
template <typename T>

0 commit comments

Comments
 (0)