Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
Merge branch 'main' of https://github.com/mlverse/torch into cran/v0.12.0
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information
dfalbel committed Dec 14, 2023
2 parents 323a565 + 23071c1 commit cf9819d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
^\.Rproj\.user$
^.github.*
^.vscode.*
^.cache.*
tools/torchgen/.Rbuildignore
^README\.Rmd$
^_pkgdown\.yml$
Expand All @@ -24,6 +25,8 @@ tools/torchgen/.Rbuildignore
^build\-lantern.*$
^src/Makevars$
^lib/.*lantern
compile_flags.*
mnist-r.*

# remove vignettes from CRAN
# ^vignettes/distributions\.Rmd
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lantern.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- {os: macOS, version: cpu-m1, runner: [self-hosted, m1]}

- {os: ubuntu, version: cpu, runner: ubuntu-latest}
- {os: ubuntu, version: cu11.7, runner: [self-hosted, gce, disk]}
- {os: ubuntu, version: cu11.8, runner: [self-hosted, gce, disk]}
- {os: ubuntu, version: cu11.7, runner: [self-hosted, linux]}
- {os: ubuntu, version: cu11.8, runner: [self-hosted, linux]}

- {os: windows, version: cpu, runner: windows-2019}
- {os: windows, version: cu11.7, runner: windows-2019}
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
- name: Install system dependencies
if: matrix.container != ''
run: |
apt-get update
apt-get install -y curl sudo libxml2-dev wget chrpath rsync git
DEBIAN_FRONTEND="noninteractive" apt-get update
DEBIAN_FRONTEND="noninteractive" apt-get install -y curl sudo libxml2-dev wget chrpath rsync git build-essential
curl -fsSL https://get.docker.com -o get-docker.sh
DRY_RUN=1 sh ./get-docker.sh
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: torch
Type: Package
Title: Tensors and Neural Networks with 'GPU' Acceleration
Version: 0.11.0.9002
Version: 0.12.0
Authors@R: c(
person("Daniel", "Falbel", email = "[email protected]", role = c("aut", "cre", "cph")),
person("Javier", "Luraschi", email = "[email protected]", role = c("aut")),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# torch (development version)
# torch 0.12.0

## Breaking changes

Expand Down
2 changes: 1 addition & 1 deletion R/device.R
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Device <- R7Class(
)

#' @export
as.character.torch_device <- function(x) {
as.character.torch_device <- function(x, ...) {
chr <- x$type
if (!is.null(x$index)) {
chr <- paste0(chr, ":", x$index)
Expand Down

0 comments on commit cf9819d

Please sign in to comment.