fix M3 chip torch bug

M3nin0 · May 22, 2024 · abb39b5 · abb39b5
1 parent 7e98e88
commit abb39b5
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 1 deletion.
diff --git a/R/sits_lighttae.R b/R/sits_lighttae.R
@@ -267,6 +267,11 @@ sits_lighttae <- function(samples = NULL,
  return(out)
  }
  )
+ # torch 12.0 not working with Apple MPS
+ if (torch::backends_mps_is_available())
+ cpu_train <- TRUE
+ else
+ cpu_train <- FALSE
  # Train the model using luz
  torch_model <-
  luz::setup(
@@ -300,6 +305,7 @@ sits_lighttae <- function(samples = NULL,
  gamma = lr_decay_rate
  )
  ),
+ accelerator = luz::accelerator(cpu = cpu_train),
  dataloader_options = list(batch_size = batch_size),
  verbose = verbose
  )

diff --git a/R/sits_mlp.R b/R/sits_mlp.R
@@ -237,6 +237,11 @@ sits_mlp <- function(samples = NULL,
  self$model(x)
  }
  )
+ # torch 12.0 not working with Apple MPS
+ if (torch::backends_mps_is_available())
+ cpu_train <- TRUE
+ else
+ cpu_train <- FALSE
  # Train the model using luz
  torch_model <-
  luz::setup(
@@ -262,6 +267,8 @@ sits_mlp <- function(samples = NULL,
  patience = patience,
  min_delta = min_delta
  )),
+ dataloader_options = list(batch_size = batch_size),
+ accelerator = luz::accelerator(cpu = cpu_train),
  verbose = verbose
  )
  # Serialize model

diff --git a/R/sits_resnet.R b/R/sits_resnet.R
@@ -319,6 +319,11 @@ sits_resnet <- function(samples = NULL,
  self$softmax()
  }
  )
+ # torch 12.0 not working with Apple MPS
+ if (torch::backends_mps_is_available())
+ cpu_train <- TRUE
+ else
+ cpu_train <- FALSE
  # train the model using luz
  torch_model <-
  luz::setup(
@@ -354,6 +359,7 @@ sits_resnet <- function(samples = NULL,
  gamma = lr_decay_rate
  )
  ),
+ accelerator = luz::accelerator(cpu = cpu_train),
  dataloader_options = list(batch_size = batch_size),
  verbose = verbose
  )

diff --git a/R/sits_tae.R b/R/sits_tae.R
@@ -240,6 +240,11 @@ sits_tae <- function(samples = NULL,
  return(x)
  }
  )
+ # torch 12.0 not working with Apple MPS
+ if (torch::backends_mps_is_available())
+ cpu_train <- TRUE
+ else
+ cpu_train <- FALSE
  # train the model using luz
  torch_model <-
  luz::setup(
@@ -273,6 +278,7 @@ sits_tae <- function(samples = NULL,
  gamma = lr_decay_rate
  )
  ),
+ accelerator = luz::accelerator(cpu = cpu_train),
  dataloader_options = list(batch_size = batch_size),
  verbose = verbose
  )

diff --git a/R/sits_tempcnn.R b/R/sits_tempcnn.R
@@ -59,7 +59,8 @@
 #' @examples
 #' if (sits_run_examples()) {
 #' # create a TempCNN model
-#' torch_model <- sits_train(samples_modis_ndvi, sits_tempcnn())
+#' torch_model <- sits_train(samples_modis_ndvi,
+#' sits_tempcnn(verbose = TRUE))
 #' # plot the model
 #' plot(torch_model)
 #' # create a data cube from local files
@@ -285,6 +286,11 @@ sits_tempcnn <- function(samples = NULL,
  self$softmax()
  }
  )
+ # torch 12.0 not working with Apple MPS
+ if (torch::backends_mps_is_available())
+ cpu_train <- TRUE
+ else
+ cpu_train <- FALSE
  # Train the model using luz
  torch_model <-
  luz::setup(
@@ -323,6 +329,7 @@ sits_tempcnn <- function(samples = NULL,
  gamma = lr_decay_rate
  )
  ),
+ accelerator = luz::accelerator(cpu = cpu_train),
  dataloader_options = list(batch_size = batch_size),
  verbose = verbose
  )

diff --git a/mnist-cnn.pt b/mnist-cnn.pt
diff --git a/mnist/mnist/processed/test.rds b/mnist/mnist/processed/test.rds
diff --git a/mnist/mnist/processed/training.rds b/mnist/mnist/processed/training.rds
diff --git a/mnist/mnist/raw/t10k-images-idx3-ubyte.gz b/mnist/mnist/raw/t10k-images-idx3-ubyte.gz
diff --git a/mnist/mnist/raw/t10k-labels-idx1-ubyte.gz b/mnist/mnist/raw/t10k-labels-idx1-ubyte.gz
diff --git a/mnist/mnist/raw/train-images-idx3-ubyte.gz b/mnist/mnist/raw/train-images-idx3-ubyte.gz
diff --git a/mnist/mnist/raw/train-labels-idx1-ubyte.gz b/mnist/mnist/raw/train-labels-idx1-ubyte.gz