Skip to content

Commit 70d2db9

Browse files
Cleanup future backend arguments - 2
1 parent 81cd339 commit 70d2db9

File tree

5 files changed

+125
-52
lines changed

5 files changed

+125
-52
lines changed

DESCRIPTION

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future
2-
Version: 1.58.0-9022
2+
Version: 1.58.0-9023
33
Title: Unified Parallel and Distributed Processing in R for Everyone
44
Depends:
55
R (>= 3.2.0)
@@ -45,3 +45,75 @@ Language: en-US
4545
Encoding: UTF-8
4646
RoxygenNote: 7.3.2
4747
Roxygen: list(markdown = TRUE)
48+
Collate:
49+
'000.bquote.R'
50+
'000.import.R'
51+
'000.re-exports.R'
52+
'010.tweakable.R'
53+
'010.utils-parallelly.R'
54+
'backend_api-01-FutureBackend-class.R'
55+
'backend_api-03.MultiprocessFutureBackend-class.R'
56+
'backend_api-11.ClusterFutureBackend-class.R'
57+
'backend_api-11.MulticoreFutureBackend-class.R'
58+
'backend_api-11.SequentialFutureBackend-class.R'
59+
'backend_api-13.MultisessionFutureBackend-class.R'
60+
'backend_api-ConstantFuture-class.R'
61+
'backend_api-Future-class.R'
62+
'backend_api-FutureRegistry.R'
63+
'backend_api-UniprocessFuture-class.R'
64+
'backend_api-evalFuture.R'
65+
'core_api-cancel.R'
66+
'core_api-future.R'
67+
'core_api-reset.R'
68+
'core_api-resolved.R'
69+
'core_api-value.R'
70+
'delayed_api-futureAssign.R'
71+
'delayed_api-futureOf.R'
72+
'demo_api-mandelbrot.R'
73+
'infix_api-01-futureAssign_OP.R'
74+
'infix_api-02-globals_OP.R'
75+
'infix_api-03-seed_OP.R'
76+
'infix_api-04-stdout_OP.R'
77+
'infix_api-05-conditions_OP.R'
78+
'infix_api-06-lazy_OP.R'
79+
'infix_api-07-label_OP.R'
80+
'infix_api-08-plan_OP.R'
81+
'infix_api-09-tweak_OP.R'
82+
'protected_api-FutureCondition-class.R'
83+
'protected_api-FutureGlobals-class.R'
84+
'protected_api-FutureResult-class.R'
85+
'protected_api-futures.R'
86+
'protected_api-globals.R'
87+
'protected_api-journal.R'
88+
'protected_api-resolve.R'
89+
'protected_api-signalConditions.R'
90+
'testme.R'
91+
'utils-basic.R'
92+
'utils-conditions.R'
93+
'utils-connections.R'
94+
'utils-debug.R'
95+
'utils-immediateCondition.R'
96+
'utils-marshalling.R'
97+
'utils-objectSize.R'
98+
'utils-options.R'
99+
'utils-prune_pkg_code.R'
100+
'utils-registerClusterTypes.R'
101+
'utils-rng_utils.R'
102+
'utils-signalEarly.R'
103+
'utils-stealth_sample.R'
104+
'utils-sticky_globals.R'
105+
'utils-tweakExpression.R'
106+
'utils-uuid.R'
107+
'utils-whichIndex.R'
108+
'utils_api-backtrace.R'
109+
'utils_api-capture_journals.R'
110+
'utils_api-futureCall.R'
111+
'utils_api-futureSessionInfo.R'
112+
'utils_api-makeClusterFuture.R'
113+
'utils_api-minifuture.R'
114+
'utils_api-nbrOfWorkers.R'
115+
'utils_api-plan.R'
116+
'utils_api-plan-with.R'
117+
'utils_api-sessionDetails.R'
118+
'utils_api-tweak.R'
119+
'zzz.R'

R/utils_api-plan-with.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
#'
33
#' @inheritParams plan
44
#'
5-
#' @param data The future plan to use temporarily.
5+
#' @param data The future plan to use temporarily, e.g. `plan(multisession)`.
66
#'
77
#' @param expr The R expression to be evaluated.
88
#'
9-
#' @param \ldots Not used.
10-
#'
119
#' @param local If TRUE, then the future plan specified by `data`
1210
#' is applied temporarily in the calling frame. Argument `expr` must
1311
#' not be specified if `local = TRUE`.
@@ -19,6 +17,7 @@
1917
#'
2018
#' @example incl/with.R
2119
#'
20+
#' @include utils_api-plan.R
2221
#' @rdname plan
2322
#' @export
2423
with.FutureStrategyList <- function(data, expr, ..., local = FALSE, envir = parent.frame(), .cleanup = NA) {

R/utils_api-plan.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ all.equal.FutureStrategyList <- function(target, current, ..., debug = FALSE) {
267267
#'
268268
#' @param \ldots Additional arguments overriding the default arguments
269269
#' of the evaluation function. Which additional arguments are supported
270-
#' depends on what evaluation function is used, e.g. several support
270+
#' depends on which future backend is used, e.g. several support
271271
#' argument `workers` but not all. For details, see the individual
272-
#' functions of which some are linked to below.
272+
#' backends of which some are linked to below.
273273
#"
274274
#' @param substitute If `TRUE`, the `strategy` expression is
275275
#' `substitute()`:d, otherwise not.

R/utils_api-tweak.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#' Tweak a future function by adjusting its default arguments
22
#'
3-
#' @param strategy An existing future function or the name of one.
4-
#' @param \ldots Named arguments to replace the defaults of existing
5-
#' arguments.
3+
#' @param strategy A future backend or the name of one.
4+
#'
65
#' @param penvir The environment used when searching for a future
76
#' function by its name.
87
#'

man/plan.Rd

Lines changed: 46 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)