Fix actions so torch installs correctly (#65)

* torch install environment variable on * update version and news
OHDSI · Apr 17, 2023 · f4c5e92 · f4c5e92
1 parent 89dd41b
commit f4c5e92
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/R_CDM_check_hades.yaml b/.github/workflows/R_CDM_check_hades.yaml
@@ -43,6 +43,7 @@ jobs:
       CDM5_SQL_SERVER_PASSWORD: ${{ secrets.CDM5_SQL_SERVER_PASSWORD }}
       CDM5_SQL_SERVER_SERVER: ${{ secrets.CDM5_SQL_SERVER_SERVER }}
       CDM5_SQL_SERVER_USER: ${{ secrets.CDM5_SQL_SERVER_USER }}
+      TORCH_INSTALL: '1'
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/R_CMD_check_main_weekly.yaml b/.github/workflows/R_CMD_check_main_weekly.yaml
@@ -47,6 +47,7 @@ jobs:
       WEBAPI_TEST_SECURE_WEBAPI_URL: ${{ secrets.WEBAPI_TEST_SECURE_WEBAPI_URL }}
       WEBAPI_TEST_ADMIN_USER_NAME: ${{ secrets.WEBAPI_TEST_ADMIN_USER_NAME }}
       WEBAPI_TEST_ADMIN_USER_PASSWORD: ${{ secrets.WEBAPI_TEST_ADMIN_USER_PASSWORD }}
+      TORCH_INSTALL: '1'
 
     steps:
       - uses: actions/checkout@v3

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: DeepPatientLevelPrediction
 Type: Package
 Title: Deep Learning For Patient Level Prediction Using Data In The OMOP Common Data Model
-Version: 1.1.2
+Version: 1.1.3
 Date: 15-12-2022
 Authors@R: c(
     person("Egill", "Fridgeirsson", email = "[email protected]", role = c("aut", "cre")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+DeepPatientLevelPrediction 1.1.3
+======================
+- Fix actions after torch updated to v0.10 (#65)
+
 DeepPatientLevelPrediction 1.1.2
 ======================
 - Fix bug introduced by removing modelType from attributes (#59)

diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
@@ -1,6 +1,6 @@
 library(PatientLevelPrediction)
 
-if(Sys.getenv('GITHUB_ACTIONS') == 'true') {
+if(Sys.getenv('GITHUB_ACTIONS') == 'true' & torch::torch_is_installed() != FALSE) {
   torch::install_torch()
 }