Skip to content

Commit 6443260

Browse files
kevinusheycran-robot
authored andcommitted
version 5.1.4
1 parent ca3f08e commit 6443260

File tree

124 files changed

+45333
-14
lines changed

Some content is hidden

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

124 files changed

+45333
-14
lines changed

DESCRIPTION

Lines changed: 3 additions & 3 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.3
4+
Version: 5.1.4
55
Authors@R: c(
66
person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
77
person("Romain", "Francois", role = c("aut", "cph")),
@@ -34,7 +34,7 @@ Biarch: TRUE
3434
RoxygenNote: 7.1.1
3535
Encoding: UTF-8
3636
NeedsCompilation: yes
37-
Packaged: 2021-04-29 17:28:06 UTC; kevinushey
37+
Packaged: 2021-05-03 16:57:44 UTC; kevinushey
3838
Author: JJ Allaire [aut],
3939
Romain Francois [aut, cph],
4040
Kevin Ushey [aut, cre],
@@ -48,4 +48,4 @@ Author: JJ Allaire [aut],
4848
Microsoft [cph]
4949
Maintainer: Kevin Ushey <kevin@rstudio.com>
5050
Repository: CRAN
51-
Date/Publication: 2021-05-03 04:50:09 UTC
51+
Date/Publication: 2021-05-04 07:00:20 UTC

MD5

Lines changed: 123 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
c60886359a2992921806c546e4a70d17 *DESCRIPTION
1+
4783dc6ef7147403f5efc0f15b7d044c *DESCRIPTION
22
ac5bf58d5c93a8009b0a3b8ae1ecabba *NAMESPACE
3-
5d8616e528592b90757874679ebbea6c *NEWS.md
3+
d203141e54f9b6729505978ea44c344f *NEWS.md
44
51d2486ca38edeaa99c4414a506f9f5d *R/RcppParallel-package.R
55
ad95444db7d259f4cd137668e99a392a *R/flags.R
66
7f9b0cbd8ff35068a4989368cbc24735 *R/options.R
77
48152deca2e125316d6ed70a77e5e778 *R/platform.R
88
1c06fa524c66c810adbab9efe26c060f *R/plugin.R
99
2d19518f37e17da8358288e413359c8e *R/skeleton.R
1010
42425476443fb64a149a069d7104e986 *R/tbb.R
11-
3c7777f464c7ca1d76d51472588a26a0 *R/utils.R
11+
c06e64d004384da85028018753d4a933 *R/utils.R
1212
2806b33717b906f8140c8c7d89869e18 *R/zzz.R
1313
38ba0348cef0ac8408c22acb51d50d83 *cleanup
1414
64726fb8cb6e37288c195da116ec2ec3 *cleanup.win
@@ -23,6 +23,124 @@ f04542a7aa777d60d1ea032d15435774 *inst/include/RcppParallel/TBB.h
2323
804a6a70a3eefef66c5700bd0fbbfe9b *inst/include/RcppParallel/Timer.h
2424
8a02a105057ddfd80fd9e3916d4d96dc *inst/include/RcppParallel/TinyThread.h
2525
058a8ee371eda9f975f5804b8a5094cb *inst/include/index.html
26+
d38a2b40e93d77f0f262e4096fb6bdde *inst/include/serial/tbb/parallel_for.h
27+
1d8c400a5ce6edd32b1e7c772f874c58 *inst/include/serial/tbb/tbb_annotate.h
28+
6574022a871577f2fda431c0f78a06e9 *inst/include/tbb/aggregator.h
29+
3914e14fd9b037de85bc2281d69a6626 *inst/include/tbb/aligned_space.h
30+
310ac60ddcdd6b3485d41e56a0c7f615 *inst/include/tbb/atomic.h
31+
91ebc46d80b4d73bb84cb7ff7512b5a1 *inst/include/tbb/blocked_range.h
32+
f63c8cfca708a87b96b67b4b13bf2764 *inst/include/tbb/blocked_range2d.h
33+
ad400bb9ed3296d3791d75d78e9323b0 *inst/include/tbb/blocked_range3d.h
34+
e63dcc25215495777172351b515cb2b5 *inst/include/tbb/blocked_rangeNd.h
35+
06fb4b2c06267c53148e5e91084f7c57 *inst/include/tbb/cache_aligned_allocator.h
36+
8367f0ac6f348d6a2a43a952352516b1 *inst/include/tbb/combinable.h
37+
3df214361b251c6e1dd5a982c344f861 *inst/include/tbb/compat/condition_variable
38+
a787fef95b424a13ed544eac5c58e332 *inst/include/tbb/compat/ppl.h
39+
ff1d1bdac3c898a0c924efb5bfd75c55 *inst/include/tbb/compat/thread
40+
833ba96a3b57878f7386d930c2811ae3 *inst/include/tbb/compat/tuple
41+
fa9ac0942b8ba1d6f714417002ed5d08 *inst/include/tbb/concurrent_hash_map.h
42+
9bc7db15729298a6bd14e64536b74c1e *inst/include/tbb/concurrent_lru_cache.h
43+
cfa50de8595df42ad6563eefbc125012 *inst/include/tbb/concurrent_map.h
44+
f61755317ba63270cabbe674c6d85955 *inst/include/tbb/concurrent_priority_queue.h
45+
e9ae39a7770162acf57f8d2186b4fee1 *inst/include/tbb/concurrent_queue.h
46+
54c691bed0d7407f8377645ac1b9fd8f *inst/include/tbb/concurrent_set.h
47+
f14a739b90db6562b5e79e9fd97b73e6 *inst/include/tbb/concurrent_unordered_map.h
48+
47d32d36075d3c18cdd0c6fa7a1a6994 *inst/include/tbb/concurrent_unordered_set.h
49+
768eb64a6d7312e5e78a1d4008e7ab88 *inst/include/tbb/concurrent_vector.h
50+
a906de17302d5e7efe45e5a63849121c *inst/include/tbb/critical_section.h
51+
6e7eede3024745cc3cf66e63e69b9287 *inst/include/tbb/enumerable_thread_specific.h
52+
f837711999fce34d195b89361a0c17a5 *inst/include/tbb/flow_graph.h
53+
c0327cca0c915141403ddee130fdf444 *inst/include/tbb/flow_graph_abstractions.h
54+
1b8ab200f967640352118534b5084e7a *inst/include/tbb/flow_graph_opencl_node.h
55+
a07b99914acafd9305f36c97a0d68d57 *inst/include/tbb/gfx_factory.h
56+
5b6a7070eb39d72a6162c45a0691adc8 *inst/include/tbb/global_control.h
57+
f808c84bdf1bfce0ae97d9341ae49a8b *inst/include/tbb/index.html
58+
e48f6155968af04198b3b8e896777239 *inst/include/tbb/internal/_aggregator_impl.h
59+
7ca4fd6a33d00e8c2eee8aa48a9839a0 *inst/include/tbb/internal/_allocator_traits.h
60+
22af809d87aad7c1e60686c0a75f891e *inst/include/tbb/internal/_concurrent_queue_impl.h
61+
8d26962579c8bc9bbbcc077f5f099f3d *inst/include/tbb/internal/_concurrent_skip_list_impl.h
62+
f85e2de12d5f5c2b9c32913127ca757d *inst/include/tbb/internal/_concurrent_unordered_impl.h
63+
5bb84dfaed0297e6a47fe822a737d8db *inst/include/tbb/internal/_flow_graph_async_msg_impl.h
64+
5d289d7da3c34fe24db200008a0a8660 *inst/include/tbb/internal/_flow_graph_body_impl.h
65+
807b6e13202972a44e91d4d84397b6ec *inst/include/tbb/internal/_flow_graph_cache_impl.h
66+
332f0349004ae2c3be1ca2114f60c337 *inst/include/tbb/internal/_flow_graph_impl.h
67+
63fd7fa48acd03afd905f084a9762034 *inst/include/tbb/internal/_flow_graph_indexer_impl.h
68+
42f5356f30a6bee9df0ef29b6e68367c *inst/include/tbb/internal/_flow_graph_item_buffer_impl.h
69+
96390ad41861e031d55948745a0178fc *inst/include/tbb/internal/_flow_graph_join_impl.h
70+
93fd686c619675c684beb81b755e4717 *inst/include/tbb/internal/_flow_graph_node_impl.h
71+
55ab70bd14c186ec6677b784f6c0c6fc *inst/include/tbb/internal/_flow_graph_streaming_node.h
72+
bd716bf5b07772e37333e1ba5df0947a *inst/include/tbb/internal/_flow_graph_tagged_buffer_impl.h
73+
c7999a8cfd9871e85f142939b4019889 *inst/include/tbb/internal/_flow_graph_trace_impl.h
74+
f6fdf13955568bcbf10d6b885083683e *inst/include/tbb/internal/_flow_graph_types_impl.h
75+
18f9aa59723f0f08740a7061345512a7 *inst/include/tbb/internal/_mutex_padding.h
76+
0b17e1abc9fdafbdf6b0eb97f02ab0d3 *inst/include/tbb/internal/_node_handle_impl.h
77+
1809ded9f98d5f92766e5e60bcdf3164 *inst/include/tbb/internal/_range_iterator.h
78+
6886a4c038fd32e7e097d25ad4069ed6 *inst/include/tbb/internal/_tbb_hash_compare_impl.h
79+
157f89c39d44a90bb75730555779aaad *inst/include/tbb/internal/_tbb_strings.h
80+
8bc41e0f6a475cc8d31b0d01392af6f9 *inst/include/tbb/internal/_tbb_trace_impl.h
81+
44ad5baf3301860997a707c8f46dc088 *inst/include/tbb/internal/_tbb_windef.h
82+
1a0b54ffb2a1a69386db8478e345bd36 *inst/include/tbb/internal/_template_helpers.h
83+
2567eaeb86d92db1612b6b379a5b7006 *inst/include/tbb/internal/_x86_eliding_mutex_impl.h
84+
974792bb9195faa872800bcd163c56a1 *inst/include/tbb/internal/_x86_rtm_rw_mutex_impl.h
85+
84d5ec1c5111b8de2fcb4f7f30274d64 *inst/include/tbb/iterators.h
86+
5e96735075096475afdc6d7a94ed378d *inst/include/tbb/machine/gcc_arm.h
87+
740ef2d6c133ebdc2aec6d7443ee68de *inst/include/tbb/machine/gcc_armv7.h
88+
ef01158639aad839e2a3c852218bd628 *inst/include/tbb/machine/gcc_generic.h
89+
0138d95534cbf2621200bac09a0d06e0 *inst/include/tbb/machine/gcc_ia32_common.h
90+
14f3dcf6b484daac823298b2973121fb *inst/include/tbb/machine/gcc_itsx.h
91+
ad573141db6256888774147cac7d7c02 *inst/include/tbb/machine/ibm_aix51.h
92+
aa22c645b1251aaff44839d371dffe25 *inst/include/tbb/machine/icc_generic.h
93+
ceedc77ef2e8a534f2d7b0a3df4499ab *inst/include/tbb/machine/linux_common.h
94+
0506191d9e3bec7e00ad1d52bd901f6a *inst/include/tbb/machine/linux_ia32.h
95+
1cb75df0a6775d92f284f069d5b3dd1e *inst/include/tbb/machine/linux_ia64.h
96+
9e689511ed69e7129c5271ea6808c120 *inst/include/tbb/machine/linux_intel64.h
97+
cd0e80de258c9919c9940fe681842f74 *inst/include/tbb/machine/mac_ppc.h
98+
194f088f60b6fe07bb81c666c2fc713d *inst/include/tbb/machine/macos_common.h
99+
feaac5914637b62e9a486b9bb11bfb29 *inst/include/tbb/machine/mic_common.h
100+
f1d2fda48cf7eabd865f47101b4b6f21 *inst/include/tbb/machine/msvc_armv7.h
101+
b4e65beb84651ddbf4270a69ea04d6d8 *inst/include/tbb/machine/msvc_ia32_common.h
102+
93a3be84899c35ec6499f2aa6c5b9e1a *inst/include/tbb/machine/sunos_sparc.h
103+
c71134ab861952e58720295f0edfbacc *inst/include/tbb/machine/windows_api.h
104+
751c905c619c0e7734d19b627c037bc4 *inst/include/tbb/machine/windows_ia32.h
105+
bca5c101eba949a3dfbe53f5b23aecfd *inst/include/tbb/machine/windows_intel64.h
106+
7f8fc49351ba63092e9988ba8957ee7f *inst/include/tbb/memory_pool.h
107+
a1c6c6083dd42beb5cf981432168c91e *inst/include/tbb/mutex.h
108+
7a3cf7ad4d616b5fdf37c9e268e03fe2 *inst/include/tbb/null_mutex.h
109+
f3f7dc976aded06ffe6a3faa16b807fa *inst/include/tbb/null_rw_mutex.h
110+
6051372df53cabe55535eeab35df4a0b *inst/include/tbb/parallel_do.h
111+
e7b6d806d6363305d60a8f0413b8f864 *inst/include/tbb/parallel_for.h
112+
c1b0662e0edc08b903367e5dc4ce75e0 *inst/include/tbb/parallel_for_each.h
113+
0f87a2dcaba25710388d00ebfec92b04 *inst/include/tbb/parallel_invoke.h
114+
3feb60163918488c64183c7fd49aea77 *inst/include/tbb/parallel_reduce.h
115+
bd31edc2d93db73f1ba044c3a5bfbb0b *inst/include/tbb/parallel_scan.h
116+
6b4d85b8127b37b3ba35110d1a467187 *inst/include/tbb/parallel_sort.h
117+
834cd1575c0cb41c87e45761da084135 *inst/include/tbb/parallel_while.h
118+
eb3efa48b77a41df0ec6b18b86443466 *inst/include/tbb/partitioner.h
119+
9da643a3f05444478979c5e919358e02 *inst/include/tbb/pipeline.h
120+
6b867b6d2b36783aa547ba8c67da740d *inst/include/tbb/queuing_mutex.h
121+
bff5e264a39bb4191fb9cf95f3846f64 *inst/include/tbb/queuing_rw_mutex.h
122+
c24887ce0a610953a59fe7c5bdf565d3 *inst/include/tbb/reader_writer_lock.h
123+
ee4a108546828bee9a5812d850dda68b *inst/include/tbb/recursive_mutex.h
124+
f695403ace72c8a47dc29652ee5fddd8 *inst/include/tbb/runtime_loader.h
125+
b8659493818dcc3865043f1fbb0e5890 *inst/include/tbb/scalable_allocator.h
126+
76fdaa55c991a4d5bcdd20e816c4edd0 *inst/include/tbb/spin_mutex.h
127+
5c734b9b080b0aa64c004f7eeb5a0a7a *inst/include/tbb/spin_rw_mutex.h
128+
439760f253a6736369f3527cdac73e87 *inst/include/tbb/task.h
129+
5ffc1ef9ec106461e362a17284942c0b *inst/include/tbb/task_arena.h
130+
f06a5dbac72c100ccb622d543926a91d *inst/include/tbb/task_group.h
131+
ffd12e342ce2f7a2230fcb9a3dd263db *inst/include/tbb/task_scheduler_init.h
132+
ab6800bfe3e0024308d543a31ff0ce15 *inst/include/tbb/task_scheduler_observer.h
133+
b1f3d29f6214053aaa5eb7310830eebb *inst/include/tbb/tbb.h
134+
b4f25a3668e539e9452a1ace8c4b4153 *inst/include/tbb/tbb_allocator.h
135+
5ba1b949d620998fe262208a90805d28 *inst/include/tbb/tbb_config.h
136+
4ff7356cc547c606761bdc66b57c79eb *inst/include/tbb/tbb_disable_exceptions.h
137+
ed53132edacc679b63fa3f99cdd4e884 *inst/include/tbb/tbb_exception.h
138+
dd76c54281736d6440a080a13e80d204 *inst/include/tbb/tbb_machine.h
139+
1fa955fccab4d63f5680c23e2a6573d3 *inst/include/tbb/tbb_profiling.h
140+
d581c407b1f5d4f8fde8e6e461c5fbb6 *inst/include/tbb/tbb_stddef.h
141+
1c4527401622d855504f88c72c865ccc *inst/include/tbb/tbb_thread.h
142+
a310ea50930f8b898d83f08489a27175 *inst/include/tbb/tbbmalloc_proxy.h
143+
f9dcd2ed2d97b8d439d6a4abb7da2cde *inst/include/tbb/tick_count.h
26144
36a8c5ad8e670d6c23f41c480b437b56 *inst/include/tthread/fast_mutex.h
27145
9ecb9b2d39c30add02250bf830b027c5 *inst/include/tthread/tinythread.h
28146
9d61a54db6779348e55e3725a8782ea4 *inst/include/tthread/tinythread.inl
@@ -40,7 +158,7 @@ b9e5bbe1cadd17714288718fa225e49c *inst/tests/cpp/innerproduct.cpp
40158
d201cb80099dba62315a39eaadc0eb67 *inst/tests/runit.innerproduct.R
41159
3b28677a7432e04b31b7cb91ca17855f *inst/tests/runit.sum.R
42160
bcb7cccabfbd3e3f24834d40d1f014a0 *inst/tests/runit.transform.R
43-
61dc5bb8a069b7f0ad1b50932c5fe611 *man/RcppParallel-package.Rd
161+
1dc4f6f837288f3ce744e47c1c2771dc *man/RcppParallel-package.Rd
44162
c9898639195af880de82891fa2712b00 *man/RcppParallel.package.skeleton.Rd
45163
d440867dddd5b3b7aadd690fb404b7a4 *man/flags.Rd
46164
198117b96fc23ea6a6a1c5a81c7c9a5b *man/setThreadOptions.Rd
@@ -639,7 +757,7 @@ e253d1de439b0281a1e4347eb474be46 *src/tbb/src/test/test_tuple.cpp
639757
1a8426b5179086121692fac0922ad991 *tests/doRUnit.R
640758
447c8872e235f31a7428d4b6aa724a0e *tools/config.R
641759
036ef8823c3f1f96c246edd2fb65932c *tools/config/cleanup.R
642-
8b344a28f496105a24b88f21965abc1a *tools/config/configure.R
760+
c46a289a9376930956483cb46b8830a0 *tools/config/configure.R
643761
214d69e8857b24cce127f284d78c9fde *tools/tbb/disable-pragmas.R
644762
22e170b8850604104e2ff7cf11b8ad91 *tools/tbb/fix-memset.R
645763
61c42a00d296636f242e93f116054ef1 *tools/tbb/update-tbb.R

NEWS.md

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

2+
## RcppParallel 5.1.4
3+
4+
- Fixed an issue causing client packages of RcppParallel to fail to compile
5+
on Solaris.
6+
27
## RcppParallel 5.1.3
38

49
* Fixed an issue that prevented compilation of RcppParallel with R (< 4.0.0)

R/utils.R

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11

22
# generate paths consumable by the compilers and linkers
3-
# in particular, on Windows, this means the path _cannot_ be quoted !!
3+
# in particular, on Windows and Solaris, this means the path _cannot_ be quoted !!
44
asBuildPath <- function(path) {
55

6-
if (!is_windows())
7-
return(shQuote(path))
8-
96
# normalize paths using forward slashes
107
path <- normalizePath(path, winslash = "/", mustWork = FALSE)
118

129
# prefer short path names if the path has spaces
13-
if (grepl(" ", path, fixed = TRUE))
10+
if (is_windows() && grepl(" ", path, fixed = TRUE))
1411
path <- utils::shortPathName(path)
1512

13+
# if we still have spaces, and we're not Windows or Solaris, try quoting
14+
if (grepl(" ", path, fixed = TRUE) && !is_windows() && !is_solaris())
15+
path <- shQuote(path)
16+
1617
# return path
1718
return(path)
1819

0 commit comments

Comments
 (0)