From 3eb5e1689b4d0b787bdfccd07f68eaa0543f7e6b Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 15 May 2024 02:01:32 -0700 Subject: [PATCH 1/8] Bump develop version [ci skip] --- NEWS.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.md b/NEWS.md index 03aa2b3..8429ce8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Version (development version) + * ... + + +# Version 0.2.1 + ## Bug Fix * `nbrOfWorkers()` and `nbrOfFreeWorkers()` did not handle mirai From e6572fe9cda04fdeff4587126c038a8795fe4151 Mon Sep 17 00:00:00 2001 From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com> Date: Tue, 11 Jun 2024 09:03:41 +0100 Subject: [PATCH 2/8] removes resilience post mirai 1.1.0 --- DESCRIPTION | 4 ++-- R/MiraiFuture-class.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6370051..389c3c3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,9 +1,9 @@ Package: future.mirai -Version: 0.2.1 +Version: 0.2.1.9000 Depends: future Imports: - mirai (>= 0.12.1), + mirai (>= 1.1.0), parallelly, utils Suggests: diff --git a/R/MiraiFuture-class.R b/R/MiraiFuture-class.R index 38fa3cd..c572ae3 100644 --- a/R/MiraiFuture-class.R +++ b/R/MiraiFuture-class.R @@ -58,7 +58,7 @@ MiraiFuture <- function(expr = NULL, daemons(n = 0L) } else if (workers != nworkers) { daemons(n = 0L) ## reset is required - daemons(n = workers, dispatcher = dispatcher, resilience = FALSE) + daemons(n = workers, dispatcher = dispatcher) } } else if (!is.null(workers)) { stop("Argument 'workers' should be a numeric scalar or NULL: ", mode(workers)) From d7488c6a8be894090904772cc646139412e50126 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Tue, 18 Jun 2024 16:01:40 +0200 Subject: [PATCH 3/8] Re-enable worker termination test on MS Windows for R (>= 4.5.0) [#6] --- pkgdown/_pkgdown.yml.rsp | 2 +- tests/mirai_cluster,worker-termination.R | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgdown/_pkgdown.yml.rsp b/pkgdown/_pkgdown.yml.rsp index fc1792a..fe85ef5 100644 --- a/pkgdown/_pkgdown.yml.rsp +++ b/pkgdown/_pkgdown.yml.rsp @@ -18,7 +18,7 @@ url: https://<%= pkg %>.futureverse.org home: links: - text: Roadmap/Milestones - href: https://github.com/HenrikBengtsson/<%= pkg %>/milestones + href: https://github.com/<%= gsub("(^.*:|[.]git$)", "", subset(gert::git_remote_list(), name == "origin")$url) %>/milestones - text: The Futureverse Project href: https://www.futureverse.org/ - text: Futureverse User Forum diff --git a/tests/mirai_cluster,worker-termination.R b/tests/mirai_cluster,worker-termination.R index 896a4ca..280ed85 100644 --- a/tests/mirai_cluster,worker-termination.R +++ b/tests/mirai_cluster,worker-termination.R @@ -14,7 +14,8 @@ stopifnot(free == 2L) ## Don't test on MS Windows, because that will leave behind a ## stray Rscript file, which 'R CMD check --as-cran' ## will complain about. /HB 2024-04-12 -if (.Platform$OS.type != "windows") { +## This have been fixed in R-devel ("4.5.0") /HB 2024-06-18 +if (.Platform$OS.type != "windows" || getRversion() >= "4.5.0") { ## Force R worker to quit f <- future({ tools::pskill(pid = Sys.getpid()) }) res <- tryCatch(value(f), error = identity) From 5d8a15948172576b4c334fe0b8265a95bdce2d18 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Tue, 18 Jun 2024 16:10:56 +0200 Subject: [PATCH 4/8] retry on failure + revert commit d7488c6a; still not working --- tests/mirai_cluster,worker-termination.R | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/mirai_cluster,worker-termination.R b/tests/mirai_cluster,worker-termination.R index 280ed85..3fb8f22 100644 --- a/tests/mirai_cluster,worker-termination.R +++ b/tests/mirai_cluster,worker-termination.R @@ -14,8 +14,7 @@ stopifnot(free == 2L) ## Don't test on MS Windows, because that will leave behind a ## stray Rscript file, which 'R CMD check --as-cran' ## will complain about. /HB 2024-04-12 -## This have been fixed in R-devel ("4.5.0") /HB 2024-06-18 -if (.Platform$OS.type != "windows" || getRversion() >= "4.5.0") { +if (.Platform$OS.type != "windows") { ## Force R worker to quit f <- future({ tools::pskill(pid = Sys.getpid()) }) res <- tryCatch(value(f), error = identity) @@ -28,6 +27,13 @@ if (.Platform$OS.type != "windows" || getRversion() >= "4.5.0") { print(nworkers) if (!inherits(nworkers, "error")) { message("Number of workers: ", nworkers) + message("Expected number of workers: ", all - 1L) + count <- 0L + while (nworkers != all - 1L && count < 5L) { + Sys.sleep(1.0) + nworkers <- tryCatch(nbrOfWorkers(), error = identity) + message("Number of workers: ", nworkers) + } stopifnot(nworkers == all - 1L) } From bc00336b8b7226e3272c48cbc11fe53b7da4b4df Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 3 Jul 2024 08:11:49 +0200 Subject: [PATCH 5/8] NEWS: refresh --- .github/workflows/covr.yaml | 2 +- DESCRIPTION | 2 +- NEWS.md | 5 ++++- tests/mirai_cluster,worker-termination.R | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/covr.yaml b/.github/workflows/covr.yaml index dd50eeb..81af6c7 100644 --- a/.github/workflows/covr.yaml +++ b/.github/workflows/covr.yaml @@ -67,7 +67,7 @@ jobs: ## https://app.codecov.io/gh///settings ## 2. Set 'CODECOV_TOKEN' in GitHub Secrets: ## https://github.com///settings/environments/ - coverage <- covr::package_coverage() + coverage <- covr::package_coverage(quiet = FALSE) print(coverage) covr::codecov(coverage = coverage, token="${{secrets.CODECOV_TOKEN}}") shell: Rscript {0} diff --git a/DESCRIPTION b/DESCRIPTION index 389c3c3..c324847 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: future.mirai -Version: 0.2.1.9000 +Version: 0.2.1.9002 Depends: future Imports: diff --git a/NEWS.md b/NEWS.md index 8429ce8..6d0f421 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,10 @@ # Version (development version) - * ... +## Miscellaneous + * Internal updates for **mirai** (>= 1.1.0), e.g. `mirai::daemons()` + argument `resilience` is being removed. + # Version 0.2.1 diff --git a/tests/mirai_cluster,worker-termination.R b/tests/mirai_cluster,worker-termination.R index 3fb8f22..9e7a3a4 100644 --- a/tests/mirai_cluster,worker-termination.R +++ b/tests/mirai_cluster,worker-termination.R @@ -25,6 +25,8 @@ if (.Platform$OS.type != "windows") { ## cf. https://github.com/HenrikBengtsson/future.mirai/issues/7 nworkers <- tryCatch(nbrOfWorkers(), error = identity) print(nworkers) + + ## If a valid result, then validate the value if (!inherits(nworkers, "error")) { message("Number of workers: ", nworkers) message("Expected number of workers: ", all - 1L) From 5f4512975c0999dcc513c8d28b535148c62db60c Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 3 Jul 2024 12:48:26 +0200 Subject: [PATCH 6/8] future.mirai 0.2.2 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c324847..5f83f54 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: future.mirai -Version: 0.2.1.9002 +Version: 0.2.2 Depends: future Imports: diff --git a/NEWS.md b/NEWS.md index 6d0f421..f54f744 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version (development version) +# Version 0.2.2 ## Miscellaneous From 2654e2ec0d901fc282c8165c4685a9c5729759c6 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 3 Jul 2024 12:51:44 +0200 Subject: [PATCH 7/8] Move GitHub repo to the 'futureverse' organization --- DESCRIPTION | 6 +++--- README.md | 6 +++--- man/future.mirai.Rd | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5f83f54..63c8070 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,7 @@ Authors@R: c( )) License: GPL (>= 3) Encoding: UTF-8 -URL: https://future.mirai.futureverse.org, https://github.com/HenrikBengtsson/future.mirai -BugReports: https://github.com/HenrikBengtsson/future.mirai/issues -RoxygenNote: 7.3.1 +URL: https://future.mirai.futureverse.org, https://github.com/futureverse/future.mirai +BugReports: https://github.com/futureverse/future.mirai/issues +RoxygenNote: 7.3.2 Roxygen: list(markdown = TRUE) diff --git a/README.md b/README.md index ad3a94c..5973f83 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
CRAN check status R CMD check status future.tests checks status Coverage Status +order="0" src="https://www.r-pkg.org/badges/version/future.mirai" alt="CRAN check status"/> R CMD check status future.tests checks status Coverage Status
# future.mirai: A Future API for Parallel Processing using 'mirai' @@ -112,7 +112,7 @@ To install the pre-release version that is available in Git branch `develop` on GitHub, use: ```r -remotes::install_github("HenrikBengtsson/future.mirai", ref="develop") +remotes::install_github("futureverse/future.mirai", ref="develop") ``` This will install the package from source. @@ -120,7 +120,7 @@ This will install the package from source. [mirai]: https://cran.r-project.org/package=mirai [future]: https://cran.r-project.org/package=future -[future.mirai]: https://github.com/HenrikBengtsson/future.mirai +[future.mirai]: https://cran.r-project.org/package=future.mirai [future.apply]: https://cran.r-project.org/package=future.apply [furrr]: https://cran.r-project.org/package=furrr [doFuture]: https://cran.r-project.org/package=doFuture diff --git a/man/future.mirai.Rd b/man/future.mirai.Rd index 5a176b2..b68657f 100644 --- a/man/future.mirai.Rd +++ b/man/future.mirai.Rd @@ -19,8 +19,8 @@ TRUE Useful links: \itemize{ \item \url{https://future.mirai.futureverse.org} - \item \url{https://github.com/HenrikBengtsson/future.mirai} - \item Report bugs at \url{https://github.com/HenrikBengtsson/future.mirai/issues} + \item \url{https://github.com/futureverse/future.mirai} + \item Report bugs at \url{https://github.com/futureverse/future.mirai/issues} } } From b5e6075938bfd01cf72aef41a9db88f124afa171 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 3 Jul 2024 14:18:07 +0200 Subject: [PATCH 8/8] pkgdown refresh --- cran-comments.md | 11 ++++------- pkgdown/_pkgdown.yml | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 738091d..164610f 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,11 +1,8 @@ -# CRAN submission future.mirai 0.2.1 +# CRAN submission future.mirai 0.2.2 -on 2024-05-14 +on 2024-07-03 -This submission attempts to fix a check error that occurs sporadically -and has been reported on the CRAN check servers. - -Thanks in advance + ## Notes not sent to CRAN @@ -19,7 +16,7 @@ The package has been verified using `R CMD check --as-cran` on: | 3.6.x | L | | | 4.2.x | L W | | | 4.3.x | L M W | W | -| 4.4.x | | M1 W | +| 4.4.x | | . W | | devel | L M W | W | *Legend: OS: L = Linux, M = macOS, M1 = macOS M1, W = Windows* diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml index b62283d..1f56a1b 100644 --- a/pkgdown/_pkgdown.yml +++ b/pkgdown/_pkgdown.yml @@ -3,7 +3,7 @@ url: https://future.mirai.futureverse.org home: links: - text: Roadmap/Milestones - href: https://github.com/HenrikBengtsson/future.mirai/milestones + href: https://github.com/futureverse/future.mirai/milestones - text: The Futureverse Project href: https://www.futureverse.org/ - text: Futureverse User Forum