From d5a5be890a7d6a6541b1a9b1f470f2a501a70082 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 7 Oct 2024 10:31:55 +0200 Subject: [PATCH 1/3] skip vaeac tests on mac os They run, but give different output due to seed inconsistency in torch --- tests/testthat/test-regular-output.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testthat/test-regular-output.R b/tests/testthat/test-regular-output.R index 5a2ce978..36403848 100644 --- a/tests/testthat/test-regular-output.R +++ b/tests/testthat/test-regular-output.R @@ -161,6 +161,7 @@ test_that("output_lm_numeric_ctree", { }) test_that("output_lm_numeric_vaeac", { + skip_on_os("mac") # The code runs on macOS, but it gives different Shapley values due to inconsistencies in torch seed expect_snapshot_rds( explain( testing = TRUE, @@ -198,6 +199,7 @@ test_that("output_lm_categorical_ctree", { }) test_that("output_lm_categorical_vaeac", { + skip_on_os("mac") # The code runs on macOS, but it gives different Shapley values due to inconsistencies in torch seed expect_snapshot_rds( explain( testing = TRUE, From 16253fcf9fa16effcc20e10b98cd415daac9f579 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 7 Oct 2024 14:30:28 +0200 Subject: [PATCH 2/3] GHA running also for PRs into shapr-1.0.0 --- .github/workflows/R-CMD-check.yaml | 4 ++-- .github/workflows/lint-changed-files.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 2b496dba..bdc738e1 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -19,9 +19,9 @@ on: push: - branches: [main, master, cranversion, devel] + branches: [main, master, cranversion, devel, 'shapr-1.0.0'] pull_request: - branches: [main, master, cranversion, devel] + branches: [main, master, cranversion, devel, 'shapr-1.0.0'] name: R-CMD-check diff --git a/.github/workflows/lint-changed-files.yaml b/.github/workflows/lint-changed-files.yaml index 7f71f45f..59375477 100644 --- a/.github/workflows/lint-changed-files.yaml +++ b/.github/workflows/lint-changed-files.yaml @@ -8,7 +8,7 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: pull_request: - branches: [main, master] + branches: [main, master, cranversion, devel, 'shapr-1.0.0'] name: lint-changed-files From e37a39d47205563e3abe7cf5a7e052096b73f8ce Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 7 Oct 2024 14:47:39 +0200 Subject: [PATCH 3/3] forgot one test --- tests/testthat/test-regular-output.R | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testthat/test-regular-output.R b/tests/testthat/test-regular-output.R index 36403848..a5bfc02d 100644 --- a/tests/testthat/test-regular-output.R +++ b/tests/testthat/test-regular-output.R @@ -346,6 +346,7 @@ test_that("output_lm_mixed_ctree", { }) test_that("output_lm_mixed_vaeac", { + skip_on_os("mac") # The code runs on macOS, but it gives different Shapley values due to inconsistencies in torch seed expect_snapshot_rds( explain( testing = TRUE,