Skip to content

Commit 9499dce

Browse files
More towards major internal rewrite:
* Add support for 'globals = NULL' * Add hidden 'reset' argument to future() that is passed to evalFuture() for controlling what is undone in the workers R session upon completion, e.g. envvars, options, global variables, ... * Add internal setNumberOfThreads(), which can currently control OpenMP and Rcpp. This code was previously scatter here an there * Add 'future_uuid()', which avoid one call to uuid() -> digest::digest() * Drop internal-only globals() and packages() S3 generics * Restructuring some of the cluster future code * Add hidden support for 'R_FUTURE_PRUNE_PKG_CODE' Squashed commit of the following: commit dfc852a Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Mon Feb 17 11:06:09 2025 -0800 Fix bug in new setNumberOfThreads() commit 7aec46f Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 22:33:56 2025 -0800 Add setNumberOfThreads() commit eb080be Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 20:50:56 2025 -0800 Forgot to drop cleanup = TRUE in getExpression() commit 068f6d0 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 20:46:12 2025 -0800 Support globals = NULL commit 360fda7 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 20:45:40 2025 -0800 Prune also functions local to other functions commit f682ede Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 20:06:09 2025 -0800 Drop a few unneeded unique() commit 73d88b6 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 19:37:34 2025 -0800 evalFuture(): Replace logical 'cleanup' with character vector 'reset' commit a296ac3 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 18:29:40 2025 -0800 Add plan('tail') commit 59ad59d Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 18:00:58 2025 -0800 Fixes for conditions = NULL commit 9b1dec3 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 17:26:33 2025 -0800 CLEANUP: base::local() -> local() commit 0f54b80 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 17:18:30 2025 -0800 SPECIAL CASE: conditions = NULL (to be deprecated) commit 870fc58 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 17:04:28 2025 -0800 CLEANUP: future uuid:s are no longer relying on the 'digest' package commit 65657be Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 16:29:48 2025 -0800 Materialize option 'future.relay.immediate' as soon as future is created; avoids querying the option later. which makes it faster, but more importantly fixes the behavior upfront commit b9e2307 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 16:28:02 2025 -0800 make uuid() a tad more performant commit b6907e6 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 15:16:48 2025 -0800 More performance tweaks commit 2d7d943 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 14:39:55 2025 -0800 Add internal canForceSingleThreading() that memoizes the result commit cd350bc Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 13:55:23 2025 -0800 More performance improvements: Add internal getSysCalls() - create sysCalls() once per R session. Add with_assert() and option to prune it commit 502686f Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 12:52:59 2025 -0800 Update default plan from "future" to future::sequential - avoids some lookup code commit a42f7a0 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 12:50:49 2025 -0800 remove stray test code commit 0007791 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 10:51:32 2025 -0800 CLEANUP: Drop internal globals() and packages() generics commit 6607b95 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 10:33:45 2025 -0800 more, minor performance improvements commit e9db64c Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 10:15:25 2025 -0800 Slight performance improvement: future$foo -> future[["foo"]] commit 262fc4e Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 09:41:33 2025 -0800 Add support for 'R_FUTURE_PRUNE_PKG_CODE' commit f226a8b Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sun Feb 16 08:54:35 2025 -0800 tiny performance improvements commit 6a70e0f Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sat Feb 15 23:58:32 2025 -0800 Add attachPackages() commit b29a8a6 Author: Henrik Bengtsson <henrik.bengtsson@gmail.com> Date: Sat Feb 15 20:40:09 2025 -0800 First steps toward a FutureBackend class; emulating for ClusterFuture for now
1 parent d17e255 commit 9499dce

Some content is hidden

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

43 files changed

+1558
-1081
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future
2-
Version: 1.34.0-9134
2+
Version: 1.34.0-9140
33
Title: Unified Parallel and Distributed Processing in R for Everyone
44
Imports:
55
digest,

NAMESPACE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ S3method(getFutureBackendConfigs,ClusterFuture)
1717
S3method(getFutureBackendConfigs,Future)
1818
S3method(getFutureBackendConfigs,MulticoreFuture)
1919
S3method(getFutureBackendConfigs,UniprocessFuture)
20-
S3method(globals,Future)
2120
S3method(journal,Future)
2221
S3method(journal,FutureJournal)
2322
S3method(journal,FutureJournalCondition)
@@ -36,7 +35,6 @@ S3method(nbrOfWorkers,cluster)
3635
S3method(nbrOfWorkers,future)
3736
S3method(nbrOfWorkers,multiprocess)
3837
S3method(nbrOfWorkers,uniprocess)
39-
S3method(packages,Future)
4038
S3method(plot,Mandelbrot)
4139
S3method(print,Future)
4240
S3method(print,FutureCondition)
@@ -187,6 +185,7 @@ importFrom(utils,file_test)
187185
importFrom(utils,getS3method)
188186
importFrom(utils,globalVariables)
189187
importFrom(utils,head)
188+
importFrom(utils,installed.packages)
190189
importFrom(utils,object.size)
191190
importFrom(utils,packageVersion)
192191
importFrom(utils,sessionInfo)

0 commit comments

Comments
 (0)