Skip to content

Commit 662c24b

Browse files
committed
Additional test predicate and some #nocov edits
1 parent 5413ab9 commit 662c24b

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2025-12-30 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/tinytest/test_misc.R: Additional tests predicate
4+
5+
* R/init.R: Some additional #nocov tags
6+
17
2025-12-29 Dirk Eddelbuettel <[email protected]>
28

39
* DESCRIPTION: Roll micro release and date

R/init.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
.pkgenv <- new.env(parent=emptyenv())
2121

22-
.onLoad <- function(libname, pkgname) {
22+
.onLoad <- function(libname, pkgname) { # nocov start
2323
## simple fallback: 'Ncpus' (if set) or else all cpus seen by OpenMP
2424
ncores <- getOption("Ncpus", EigenNbThreads())
2525
## consider OMP_THREAD_LIMIT (cf Writing R Extensions), gets NA if envvar unset
2626
ompcores <- as.integer(Sys.getenv("OMP_THREAD_LIMIT"))
2727
## keep the smaller value, omitting NA
2828
ncores <- min(na.omit(c(ncores, ompcores)))
29-
.pkgenv[["nb_threads"]] <- ncores # #nocov
29+
.pkgenv[["nb_threads"]] <- ncores
3030
RcppEigen_throttle_cores(ncores)
3131
}
3232

@@ -57,5 +57,5 @@ RcppEigen_throttle_cores <- function(n) {
5757

5858
##' @rdname RcppEigen_throttle_cores
5959
RcppEigen_reset_cores <- function() {
60-
EigenSetNbThreads(.pkgenv[["nb_threads"]])
60+
EigenSetNbThreads(.pkgenv[["nb_threads"]]) # nocov end
6161
}

inst/tinytest/test_misc.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ expect_equal(names(eig), c("major","minor","patch"))
2626
eig <- RcppEigen:::eigen_version(TRUE)
2727
expect_equal(class(eig), "integer")
2828
expect_equal(length(eig), 1L)
29+
eigt <- RcppEigen:::eigen_version_typed()
30+
expect_true(inherits(eigt, "package_version"))
2931
expect_equal(class(RcppEigen:::Eigen_SSE()), "logical")
30-
nt <- RcppEigen:::EigenNbThreads()
32+
nt <- RcppEigen::EigenNbThreads()
3133
expect_true(nt >= 0)
3234

3335
## -- R/flags.R

0 commit comments

Comments
 (0)