update to torch v0.12.0 (#19)

* bump version * updgrade ubuntu image * run on self-hosted instead. * improve naming * bump torchvision version
mlverse · Feb 14, 2024 · ad6aca8 · ad6aca8
1 parent 82d4785
commit ad6aca8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -22,16 +22,16 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {runner: macOS-latest,             r_version: release, os: macOS}
-          - {runner: [self-hosted, m1],        r_version: '',      os: macOS}
-          - {runner: windows-2019,             r_version: release, os: windows}
-          - {runner: ubuntu-latest,            r_version: release, os: ubuntu}
-          - {runner: [self-hosted, gce, disk], r_version: release, os: ubuntu, cuda: 11.7, cuda_patch: 0}
-          - {runner: windows-2019,             r_version: release, os: windows, cuda: 11.7, cuda_patch: 0}
+          - {runner: macOS-latest,         r_version: release, os: macOS}
+          - {runner: [self-hosted, m1],    r_version: '',      os: macOS}
+          - {runner: windows-2019,         r_version: release, os: windows}
+          - {runner: ubuntu-latest,        r_version: release, os: ubuntu}
+          - {runner: [self-hosted, linux], r_version: release, os: ubuntu, cuda: 11.7, cuda_patch: 0}
+          - {runner: windows-2019,         r_version: release, os: windows, cuda: 11.7, cuda_patch: 0}
 
         include:
           - config: {os: ubuntu}
-            container: ubuntu:18.04
+            container: ubuntu:20.04
 
     env:
       TORCH_INSTALL: 1
@@ -109,19 +109,19 @@ jobs:
 
 
   R-CMD-check:
-    runs-on: ${{ matrix.config.os }}
+    runs-on: ${{ matrix.config.runner }}
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
     needs: Build-Libs
 
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release', artifact: '+cpu+x86_64-Darwin.zip'}
-          - {os: ['self-hosted', 'm1'], artifact: '+cpu+arm64-Darwin.zip'}
-          - {os: windows-latest, r: 'release', rtools: '42', artifact: '+cpu-win64.zip'}
-          - {os: windows-latest, r: '3.6', artifact: '+cpu-win64.zip'}
-          - {os: ubuntu-20.04,   r: 'release', artifact: '+cpu-Linux.zip'}
+          - {os: mac,     runner: macOS-latest,   r: 'release', artifact: '+cpu+x86_64-Darwin.zip'}
+          - {os: m1mac,   runner: ['self-hosted', 'm1'], artifact: '+cpu+arm64-Darwin.zip'}
+          - {os: windows, runner: windows-latest, r: 'release', rtools: '42', artifact: '+cpu-win64.zip'}
+          - {os: windows, runner: windows-latest, r: '3.6', artifact: '+cpu-win64.zip'}
+          - {os: ubuntu,  runner: ubuntu-20.04,   r: 'release', artifact: '+cpu-Linux.zip'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: torchvisionlib
 Title: Additional Operators for Image Models
-Version: 0.4.0.9000
+Version: 0.4.0.9001
 Authors@R: c(
     person("Daniel", "Falbel", , "daniel@rstudio.com", role = c("aut", "cre")),
     person(family = "RStudio", role = c("cph"))

diff --git a/csrc/CMakeLists.txt b/csrc/CMakeLists.txt
@@ -100,7 +100,7 @@ endif()
 message(STATUS "CMAKE_ARGS: ${TORCHVISION_CMAKE_ARGS}")
 ExternalProject_Add(TorchVision-project
   GIT_REPOSITORY https://github.com/pytorch/vision
-  GIT_TAG v0.14.1
+  GIT_TAG v0.15.2
   DEPENDS ${TORCHVISION_DEPENDS}
   CMAKE_CACHE_ARGS ${TORCHVISION_CMAKE_ARGS}
   PREFIX "${CMAKE_CURRENT_BINARY_DIR}/libtorchvision"