Magick to base loader (#299)

mlr-org · Nov 8, 2024 · bd80db5 · bd80db5
1 parent 0edcf48
commit bd80db5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -61,7 +61,6 @@ Suggests:
     igraph,
     jsonlite,
     knitr,
-    magick,
     mlr3tuning (>= 1.0.0),
     progress,
     rmarkdown,

diff --git a/R/LearnerTorchImage.R b/R/LearnerTorchImage.R
@@ -31,7 +31,7 @@ LearnerTorchImage = R6Class("LearnerTorchImage",
     #' @description
     #' Creates a new instance of this [R6][R6::R6Class] class.
     initialize = function(id, task_type, param_set = ps(), label, optimizer = NULL, loss = NULL,
-      callbacks = list(), packages = c("torchvision", "magick"), man, properties = NULL,
+      callbacks = list(), packages = "torchvision", man, properties = NULL,
       predict_types = NULL) {
       properties = properties %??% switch(task_type,
         regr = c(),

diff --git a/R/utils.R b/R/utils.R
@@ -178,7 +178,7 @@ dataset_image = dataset("image_dataset",
     self$uris = uris
   },
   .getitem = function(x) {
-    list(x = torchvision::transform_to_tensor(magick::image_read(self$uris[x])))
+    list(x = torchvision::transform_to_tensor(torchvision::base_loader(self$uris[x])))
   },
   .length = function() {
     length(self$uris)

diff --git a/man/mlr_learners.torchvision.Rd b/man/mlr_learners.torchvision.Rd
diff --git a/man/mlr_learners_torch_image.Rd b/man/mlr_learners_torch_image.Rd
diff --git a/man/mlr_pipeops_nn_adaptive_avg_pool1d.Rd b/man/mlr_pipeops_nn_adaptive_avg_pool1d.Rd
diff --git a/tests/testthat/test_LearnerTorchVision.R b/tests/testthat/test_LearnerTorchVision.R
@@ -17,7 +17,6 @@ test_that("LearnerTorchVision basic checks", {
   vgg13$id = "a"
   expect_false(alexnet$phash == vgg13$phash)
   expect_true("torchvision" %in% alexnet$packages)
-  expect_true("magick" %in% alexnet$packages)
 
   alexnet = lrn("classif.alexnet", optimizer = "sgd", loss = "cross_entropy",
     callbacks = t_clbk("checkpoint"), epochs = 0, batch_size = 1