Skip to content

Commit 8cfb7f8

Browse files
Another attempt at addressing Debian NOTE
1 parent 17a1f29 commit 8cfb7f8

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

CRAN-SUBMISSION

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Version: 0.4.7
2+
Date: 2025-01-14 02:18:38 UTC
3+
SHA: 17a1f29170c6dddf83f8daa57344c5cfc106673a

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ importFrom(mvtnorm,rmvt)
5757
importFrom(nlme,fixef)
5858
importFrom(nlme,getVarCov)
5959
importFrom(parallel,detectCores)
60+
importFrom(parallel,makeCluster)
6061
importFrom(randtoolbox,halton)
6162
importFrom(randtoolbox,sobol)
6263
importFrom(stats,sigma)

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
- Add R-hub workflow to enable checks for platforms not covered already.
2626

27-
- Vignettes now force `Sys.setenv("OMP_THREAD_LIMIT" = 2)` to get around CRAN CMD changes.
27+
- Vignettes now force `Sys.setenv("OMP_THREAD_LIMIT" = 1)` and `options(Ncpus = 1)` in a bid to get around CRAN CMD changes.
2828

2929
# joineRML 0.4.6
3030

R/bootSE.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#'
6262
#' @return An object of class \code{bootSE}.
6363
#' @import foreach
64-
#' @importFrom parallel detectCores
64+
#' @importFrom parallel detectCores makeCluster
6565
#' @importFrom doParallel registerDoParallel
6666
#' @export
6767
#'
@@ -177,15 +177,15 @@ bootSE <- function(object, nboot = 100, ci = 0.95, use.mle = TRUE,
177177
ncores.max))
178178
}
179179
# *** Parallel version ***
180-
doParallel::registerDoParallel(cores = ncores)
180+
cl <- parallel::makeCluster(ncores)
181+
doParallel::registerDoParallel(cl)
181182
out <- foreach(b = 1:nboot, .packages = 'joineRML') %dopar% {
182183
fit.boot <- bootfun()
183184
return(list("coefs" = fit.boot$coefficient,
184185
"conv" = fit.boot$conv))
185186
}
186187
registerDoSEQ()
187188
} else {
188-
doParallel::registerDoParallel(cores = ncores)
189189
# *** Serial version (incl. progress bar) ***
190190
out <- list()
191191
conv.status <- vector(length = nboot)

vignettes/joineRML-tidy.Rmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ editor_options:
1414
```{r load-joineRML, include=FALSE}
1515
library(joineRML)
1616
library(knitr)
17-
Sys.setenv("OMP_THREAD_LIMIT" = 2)
17+
Sys.setenv("OMP_THREAD_LIMIT" = 1)
18+
Sys.setenv("OMP_NUM_THREADS" = 1)
19+
options(Ncpus = 1)
1820
```
1921

2022
# Introduction

vignettes/joineRML.Rmd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ if (requireNamespace('joineR', quietly = TRUE)) {
2222
message("'joineR' not available")
2323
}
2424
25-
Sys.setenv("OMP_THREAD_LIMIT" = 2)
25+
Sys.setenv("OMP_THREAD_LIMIT" = 1)
26+
Sys.setenv("OMP_NUM_THREADS" = 1)
27+
options(Ncpus = 1)
2628
```
2729

2830
# Introduction

0 commit comments

Comments
 (0)