Skip to content

Commit d46cd57

Browse files
HenrikBengtssonHenrikBengtsson
committed
Merge branch 'feature/FutureBackend2' into develop
2 parents c040f2f + c33f031 commit d46cd57

37 files changed

+945
-1410
lines changed

‎DESCRIPTION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: future.batchtools
2-
Version: 0.12.2-9001
2+
Version: 0.12.2-9903
33
Depends:
44
R (>= 3.2.0),
55
parallelly,
6-
future (>= 1.49.0)
6+
future (>= 1.58.0)
77
Imports:
8-
batchtools (>= 0.9.16),
8+
batchtools (>= 0.9.17),
99
utils
1010
Suggests:
1111
globals,

‎NAMESPACE‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,47 @@
33
S3method(add_finalizer,BatchtoolsFuture)
44
S3method(cancel,BatchtoolsFuture)
55
S3method(delete,BatchtoolsFuture)
6+
S3method(launchFuture,BatchtoolsFutureBackend)
7+
S3method(listFutures,BatchtoolsUniprocessFutureBackend)
68
S3method(loggedError,BatchtoolsFuture)
79
S3method(loggedOutput,BatchtoolsFuture)
8-
S3method(nbrOfFreeWorkers,batchtools)
9-
S3method(nbrOfFreeWorkers,batchtools_multiprocess)
10-
S3method(nbrOfFreeWorkers,batchtools_uniprocess)
11-
S3method(nbrOfWorkers,batchtools)
12-
S3method(nbrOfWorkers,batchtools_multicore)
13-
S3method(nbrOfWorkers,batchtools_uniprocess)
10+
S3method(nbrOfFreeWorkers,BatchtoolsFutureBackend)
11+
S3method(nbrOfFreeWorkers,BatchtoolsMultiprocessFutureBackend)
12+
S3method(nbrOfFreeWorkers,BatchtoolsUniprocessFutureBackend)
13+
S3method(nbrOfWorkers,BatchtoolsFutureBackend)
14+
S3method(nbrOfWorkers,BatchtoolsMulticoreFutureBackend)
15+
S3method(nbrOfWorkers,BatchtoolsUniprocessFutureBackend)
1416
S3method(print,BatchtoolsFuture)
17+
S3method(print,BatchtoolsFutureBackend)
1518
S3method(registerFuture,BatchtoolsFuture)
1619
S3method(registerFuture,BatchtoolsUniprocessFuture)
1720
S3method(registerFuture,default)
1821
S3method(resolved,BatchtoolsFuture)
1922
S3method(result,BatchtoolsFuture)
20-
S3method(run,BatchtoolsFuture)
23+
S3method(stopWorkers,BatchtoolsFutureBackend)
2124
S3method(unregisterFuture,BatchtoolsFuture)
2225
S3method(unregisterFuture,BatchtoolsUniprocessFuture)
2326
S3method(unregisterFuture,default)
2427
S3method(waitForWorker,BatchtoolsFuture)
2528
S3method(waitForWorker,BatchtoolsUniprocessFuture)
2629
S3method(waitForWorker,default)
2730
export("%resources%")
28-
export(BatchtoolsBashFuture)
29-
export(BatchtoolsCustomFuture)
30-
export(BatchtoolsFuture)
31+
export(BatchtoolsBashFutureBackend)
32+
export(BatchtoolsCustomFutureBackend)
33+
export(BatchtoolsFutureBackend)
3134
export(BatchtoolsFutureError)
32-
export(BatchtoolsInteractiveFuture)
33-
export(BatchtoolsLocalFuture)
34-
export(BatchtoolsLsfFuture)
35-
export(BatchtoolsMulticoreFuture)
36-
export(BatchtoolsMultiprocessFuture)
37-
export(BatchtoolsOpenLavaFuture)
38-
export(BatchtoolsSGEFuture)
39-
export(BatchtoolsSSHFuture)
40-
export(BatchtoolsSlurmFuture)
41-
export(BatchtoolsTemplateFuture)
42-
export(BatchtoolsTorqueFuture)
43-
export(BatchtoolsUniprocessFuture)
35+
export(BatchtoolsInteractiveFutureBackend)
36+
export(BatchtoolsLocalFutureBackend)
37+
export(BatchtoolsLsfFutureBackend)
38+
export(BatchtoolsMulticoreFutureBackend)
39+
export(BatchtoolsMultiprocessFutureBackend)
40+
export(BatchtoolsOpenLavaFutureBackend)
41+
export(BatchtoolsSGEFutureBackend)
42+
export(BatchtoolsSSHFutureBackend)
43+
export(BatchtoolsSlurmFutureBackend)
44+
export(BatchtoolsTemplateFutureBackend)
45+
export(BatchtoolsTorqueFutureBackend)
46+
export(BatchtoolsUniprocessFutureBackend)
4447
export(batchtools_bash)
4548
export(batchtools_custom)
4649
export(batchtools_interactive)
@@ -82,20 +85,22 @@ importFrom(batchtools,saveRegistry)
8285
importFrom(batchtools,setJobNames)
8386
importFrom(batchtools,submitJobs)
8487
importFrom(batchtools,waitForJobs)
85-
importFrom(future,Future)
88+
importFrom(future,FutureBackend)
8689
importFrom(future,FutureError)
8790
importFrom(future,cancel)
88-
importFrom(future,getExpression)
89-
importFrom(future,getGlobalsAndPackages)
91+
importFrom(future,launchFuture)
92+
importFrom(future,listFutures)
9093
importFrom(future,nbrOfFreeWorkers)
9194
importFrom(future,nbrOfWorkers)
9295
importFrom(future,plan)
9396
importFrom(future,resolved)
9497
importFrom(future,result)
9598
importFrom(future,run)
99+
importFrom(future,stopWorkers)
96100
importFrom(future,tweak)
97101
importFrom(parallelly,availableCores)
98102
importFrom(parallelly,availableWorkers)
103+
importFrom(parallelly,supportsMulticore)
99104
importFrom(utils,capture.output)
100105
importFrom(utils,file_test)
101106
importFrom(utils,sessionInfo)

‎NEWS.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Version (development version)
22

3-
* ...
3+
## Significant Changes
4+
5+
* **future.batchtools** now implements the FutureBackend API
6+
introduced in **future** 1.40.0.
47

58

69
# Version 0.12.2 [2025-06-06]

‎R/001.import_future_functions.R‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
## To be imported from 'future', if available
2+
assertOwner <- NULL
23
readImmediateConditions <- NULL
34
signalEarly <- NULL
45
FutureRegistry <- NULL
56
sQuoteLabel <- NULL
7+
with_stealth_rng <- NULL
8+
getFutureData <- NULL
9+
610
.debug <- NULL
711

812
## Import private functions from 'future'
913
import_future_functions <- function() {
14+
assertOwner <<- import_future("assertOwner")
1015
readImmediateConditions <<- import_future("readImmediateConditions")
1116
signalEarly <<- import_future("signalEarly")
1217
FutureRegistry <<- import_future("FutureRegistry")
18+
with_stealth_rng <<- import_future("with_stealth_rng")
19+
getFutureData <<- import_future("getFutureData")
1320

1421
## future (>= 1.49.0)
1522
sQuoteLabel <<- import_future("sQuoteLabel")

‎R/BatchtoolsCustomFuture-class.R‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)