Skip to content

Commit 7746497

Browse files
committed
Relax OpenMP parallelism signal check
1 parent 62fd592 commit 7746497

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

tests/testthat/test-openmp-parallelization.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ check_thread_scaling_subprocess <- function(label, n, iters) {
155155
}
156156
}
157157

158-
test_that("parallel loops consume more CPU time without large slowdowns", {
158+
test_that("parallel loops show parallelism without large slowdowns", {
159159
openmp_supported_or_skip()
160160

161161
serial <- function(x, n) {
@@ -235,7 +235,9 @@ test_that("parallel loops consume more CPU time without large slowdowns", {
235235
)
236236

237237
if (!anyNA(c(parallel_time$cpu, serial_time$cpu))) {
238-
expect_gt(parallel_time$cpu, serial_time$cpu * 1.2, label = info)
238+
cpu_increase <- parallel_time$cpu > serial_time$cpu * 1.1
239+
elapsed_improve <- parallel_time$elapsed < serial_time$elapsed * 0.95
240+
expect_true(cpu_increase || elapsed_improve, label = info)
239241
expect_lt(parallel_time$elapsed, serial_time$elapsed * 1.5, label = info)
240242
} else {
241243
expect_lt(parallel_time$elapsed, serial_time$elapsed * 1.5, label = info)

0 commit comments

Comments
 (0)