normalizePath... and simplify virtualenv setup

OHDSI · Jul 8, 2024 · fbf0fd4 · fbf0fd4
1 parent 215df23
commit fbf0fd4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/R_CDM_check_hades.yaml b/.github/workflows/R_CDM_check_hades.yaml
@@ -81,8 +81,7 @@ jobs:
             c("polars", "tqdm", "connectorx", "pyarrow", "pynvml", "numpy==1.26.4")
           
           library(reticulate)
-          virtualenv_create("r-reticulate", Sys.which("python"))
-          virtualenv_install("r-reticulate", python_packages)
+          virtualenv_create("r-reticulate", Sys.which("python"), packages=python_packages)
           virtualenv_install("r-reticulate", "torch", pip_options = c("--index-url https://download.pytorch.org/whl/cpu"))
           
           path_to_python <- virtualenv_python("r-reticulate")

diff --git a/tests/testthat/test-Finetuner.R b/tests/testthat/test-Finetuner.R
@@ -46,8 +46,8 @@ test_that("Finetuner fitEstimator works", {
                                          "DeepEstimatorModel.pt"))
   expect_true(fineTunedModel$estimator_settings$finetune)
   expect_equal(fineTunedModel$estimator_settings$finetune_model_path, 
-               file.path(fitEstimatorPath, "plpModel", "model",
-                         "DeepEstimatorModel.pt"))   
+               normalizePath(file.path(fitEstimatorPath, "plpModel", "model",
+                         "DeepEstimatorModel.pt")))
   expect_equal(fineTunedModel$model_parameters$model_type, 
                fitEstimatorResults$modelDesign$modelSettings$modelType)
-})
+})