Skip to content

Commit a2f702d

Browse files
spell and grammar corrections [ci skip]
1 parent d06660a commit a2f702d

21 files changed

Lines changed: 58 additions & 58 deletions

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future.batchtools
2-
Version: 0.21.0-9006
2+
Version: 0.21.0-9007
33
Depends:
44
R (>= 3.2.0),
55
future (>= 1.58.0)

NEWS.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"shutdown" code resource specifications via character vectors
9696
`resources[["startup"]]` and `resources[["shutdown"]]`. When
9797
specified, corresponding lines are injected in the generated job
98-
script and the beginning and end, respectively.
98+
script at the beginning and end, respectively.
9999

100100
- All built-in template job scripts support a "details" resource
101101
specification via logical scalar `resources[["details"]]`. If
@@ -131,14 +131,14 @@
131131
`fs.latency` seconds (default 65 seconds) to give job schedulers
132132
and any global file system time to write output to file. Now
133133
**future.batchtools** will no longer wait for such files and only
134-
read their content if they exists when checked.
134+
read their content if they exist when checked.
135135

136136
## Deprecated and Defunct
137137

138138
* R option `future.delete` is deprecated. Please use new R option
139-
`future.batchtools.delete` instead. For backward compatible
140-
reasons, if R option `future.delete` sets option
141-
`future.batchtools.delete` when the packages is loaded and the
139+
`future.batchtools.delete` instead. For backward compatibility
140+
reasons, R option `future.delete` sets option
141+
`future.batchtools.delete` when the package is loaded, if the
142142
latter is not already set. If `future.delete` is FALSE, then
143143
`future.batchtools.delete` is set to `"never"`. If `future.delete`
144144
is TRUE, then `future.batchtools.delete` is set to `"on-success"`.
@@ -149,7 +149,7 @@
149149
## Bug Fixes
150150

151151
* Attempts to cancel batchtools futures via `cancel()` would result
152-
in "Interruption of futures require a backend implementing the
152+
in "Interruption of futures requires a backend implementing the
153153
FutureBackend API". Until this package implements the new
154154
FutureBackend API of future (>= 1.40.0), any calls to `cancel()`
155155
will be silently ignored.
@@ -170,7 +170,7 @@
170170
* Improved performance of batchtools futures by avoiding re-checking
171171
the **batchtools** status if the **batchtools** job has already
172172
been observed to be resolved. Checking the **batchtools** status
173-
is fairly expense, especially since each status check queries a set
173+
is fairly expensive, especially since each status check queries a set
174174
of files on the file system.
175175

176176
* Improved performance of batchtools futures by making the removal of
@@ -189,7 +189,7 @@
189189
* `R_FUTURE_BATCHTOOLS_*` environment variables are now only read
190190
when the **future.batchtools** package is loaded, where they set
191191
the corresponding `future.batchtools*` option. This is in line
192-
with how all packages in the Futureverse works.
192+
with how all packages in the Futureverse work.
193193

194194
* Add `nbrOfFreeWorkers()` for batchtools futures.
195195

@@ -205,11 +205,11 @@
205205
`batchtools_multicore` worker.
206206

207207
* `print()` for BatchtoolsFuture now reports on the batchtools
208-
configuration file (an R script) and the the batchtools job template
208+
configuration file (an R script) and the batchtools job template
209209
file (a shell script) with info on location, file size, and number
210210
of lines, if they exist.
211211

212-
* `run()` for BatchtoolsFuture now produce an informative
212+
* `run()` for BatchtoolsFuture now produces an informative
213213
BatchtoolsFutureError in case `batchtools::submitJobs()` fails, for
214214
instance, due to invalid job-scheduler resource specifications.
215215

@@ -261,7 +261,7 @@
261261

262262
## Significant Changes
263263

264-
* Lazy batchtools futures only creates the internal **batchtools**
264+
* Lazy batchtools futures only create the internal **batchtools**
265265
registry when the future is launched.
266266

267267
* Removed S3 generic functions `await()`, `finished()`, and
@@ -455,9 +455,9 @@
455455
* The period between each poll of the scheduler to check whether a
456456
future (job) is finished or not now increases geometrically as a
457457
function of number of polls. This lowers the load on the scheduler
458-
for long running jobs.
458+
for long-running jobs.
459459

460-
* The error message for expired batchtools futures now include the
460+
* The error message for expired batchtools futures now includes the
461461
last few lines of the logged output, which sometimes includes clues
462462
on why the future expired. For instance, if a TORQUE/PBS job use
463463
more than the allocated amount of memory it might be terminated by

R/batchtools_bash.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ BatchtoolsBashFutureBackend <- function(..., template = "bash", fs.latency = 0.0
2626
}
2727

2828

29-
#' A batchtools bash backend that resolves futures sequentially via a Bash template script
29+
#' A batchtools Bash backend that resolves futures sequentially via a Bash template script
3030
#'
3131
#' The `batchtools_bash` backend was added to illustrate how to write a
3232
#' custom \pkg{future.batchtools} backend that uses a templated job script.
@@ -41,7 +41,7 @@ BatchtoolsBashFutureBackend <- function(..., template = "bash", fs.latency = 0.0
4141
#' @param \ldots Not used.
4242
#'
4343
#' @details
44-
#' Batchtools bash futures use \pkg{batchtools} cluster functions
44+
#' Batchtools Bash futures use \pkg{batchtools} cluster functions
4545
#' created by [makeClusterFunctionsBash()] and requires that `bash` is
4646
#' installed on the current machine and the `timeout` command is available.
4747
#'
@@ -51,7 +51,7 @@ BatchtoolsBashFutureBackend <- function(..., template = "bash", fs.latency = 0.0
5151
#' system.file("templates", "bash.tmpl", package = "future.batchtools")
5252
#' ```
5353
#'
54-
#' and comprise:
54+
#' and comprises:
5555
#'
5656
#' `r paste(c("\x60\x60\x60bash", readLines("inst/templates/bash.tmpl"), "\x60\x60\x60"), collapse = "\n")`
5757
#'

R/batchtools_local.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#' batchtools local and interactive futures
1+
#' Batchtools local and interactive futures
22
#'
3-
#' A batchtools local future is an synchronous uniprocess future that
3+
#' A batchtools local future is a synchronous uniprocess future that
44
#' will be evaluated in a background R session.
5-
#' A batchtools interactive future is an synchronous uniprocess future
5+
#' A batchtools interactive future is a synchronous uniprocess future
66
#' that will be evaluated in the current R session (and variables will
77
#' be assigned to the calling environment rather than to a local one).
88
#' Both types of futures will block until the futures are resolved.
@@ -15,7 +15,7 @@
1515
#' @return An object of class `BatchtoolsUniprocessFuture`.
1616
#'
1717
#' @details
18-
#' batchtools local futures rely on the batchtools backend set up by
18+
#' Batchtools local futures rely on the batchtools backend set up by
1919
#' \code{\link[batchtools:makeClusterFunctionsInteractive]{batchtools::makeClusterFunctionsInteractive(external = TRUE)}}
2020
#' and batchtools interactive futures on the one set up by
2121
#' [batchtools::makeClusterFunctionsInteractive()].

R/batchtools_lsf.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ BatchtoolsLsfFutureBackend <- function(...) {
3030
#' system.file("templates", "lsf.tmpl", package = "future.batchtools")
3131
#' ```
3232
#'
33-
#' and comprise:
33+
#' and comprises:
3434
#'
3535
#' `r paste(c("\x60\x60\x60bash", readLines("inst/templates/lsf.tmpl"), "\x60\x60\x60"), collapse = "\n")`
3636
#'

R/batchtools_multicore.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#' batchtools multicore futures
1+
#' Batchtools multicore futures
22
#'
33
#' A batchtools multicore future is an asynchronous multiprocess
44
#' future that will be evaluated in a background R session.\cr
@@ -19,7 +19,7 @@
1919
#' @return An object of class `BatchtoolsMulticoreFuture`.
2020
#'
2121
#' @details
22-
#' batchtools multicore futures rely on the batchtools backend set
22+
#' Batchtools multicore futures rely on the batchtools backend set
2323
#' up by [batchtools::makeClusterFunctionsMulticore()].
2424
#' The batchtools multicore backend only works on operating systems
2525
#' supporting the `ps` command-line tool, e.g. Linux and macOS.

R/batchtools_openlava.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BatchtoolsOpenLavaFutureBackend <- function(...) {
77
}
88

99

10-
#' A batchtools openlava backend resolves futures in parallel via a OpenLava job scheduler
10+
#' A batchtools OpenLava backend resolves futures in parallel via a OpenLava job scheduler
1111
#'
1212
#' @inheritParams BatchtoolsTemplateFutureBackend
1313
#'
@@ -30,7 +30,7 @@ BatchtoolsOpenLavaFutureBackend <- function(...) {
3030
#' system.file("templates", "openlava.tmpl", package = "future.batchtools")
3131
#' ```
3232
#'
33-
#' and comprise:
33+
#' and comprises:
3434
#'
3535
#' `r paste(c("\x60\x60\x60bash", readLines("inst/templates/openlava.tmpl"), "\x60\x60\x60"), collapse = "\n")`
3636
#'

R/batchtools_sge.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ print.BatchtoolsSGEFutureBackend <- function(x, ...) {
3838
#' system.file("templates", "sge.tmpl", package = "future.batchtools")
3939
#' ```
4040
#'
41-
#' and comprise:
41+
#' and comprises:
4242
#'
4343
#' `r paste(c("\x60\x60\x60bash", readLines("inst/templates/sge.tmpl"), "\x60\x60\x60"), collapse = "\n")`
4444
#'

R/batchtools_slurm.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ print.BatchtoolsSlurmFutureBackend <- function(x, ...) {
1616
}
1717

1818

19-
#' A batchtools slurm backend resolves futures in parallel via a Slurm job scheduler
19+
#' A batchtools Slurm backend resolves futures in parallel via a Slurm job scheduler
2020
#'
2121
#' @inheritParams BatchtoolsTemplateFutureBackend
2222
#'
@@ -27,7 +27,7 @@ print.BatchtoolsSlurmFutureBackend <- function(x, ...) {
2727
#' @param \ldots Not used.
2828
#'
2929
#' @details
30-
#' Batchtools slurm futures use \pkg{batchtools} cluster functions
30+
#' Batchtools Slurm futures use \pkg{batchtools} cluster functions
3131
#' created by [makeClusterFunctionsSlurm2()], which are used
3232
#' to interact with the Slurm job scheduler. This requires that Slurm
3333
#' commands `sbatch`, `squeue`, `sacct`, and `scancel` are available on
@@ -39,7 +39,7 @@ print.BatchtoolsSlurmFutureBackend <- function(x, ...) {
3939
#' system.file("templates", "slurm.tmpl", package = "future.batchtools")
4040
#' ```
4141
#'
42-
#' and comprise:
42+
#' and comprises:
4343
#'
4444
#' `r paste(c("\x60\x60\x60bash", readLines("inst/templates/slurm.tmpl"), "\x60\x60\x60"), collapse = "\n")`
4545
#'

R/batchtools_ssh.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#' batchtools SSH futures
1+
#' Batchtools SSH futures
22
#'
33
#' A batchtools SSH future is an asynchronous multiprocess
44
#' future that will be evaluated in a background R session.\cr
@@ -13,7 +13,7 @@
1313
#' @return An object of class `BatchtoolsMulticoreFuture`.
1414
#'
1515
#' @details
16-
#' batchtools SSH futures rely on the batchtools backend set
16+
#' Batchtools SSH futures rely on the batchtools backend set
1717
#' up by [batchtools::makeClusterFunctionsSSH()].
1818
#' The batchtools SSH backend only works on operating systems
1919
#' supporting the `ssh` and `ps` command-line tool, e.g. Linux and macOS.

0 commit comments

Comments
 (0)