Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename deaustralia collections and fix multicores with torch model #1184

Merged
merged 2 commits into from
Jul 29, 2024
Merged

rename deaustralia collections and fix multicores with torch model #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
061a438
source: rename deaustralia collections
M3nin0 Jul 29, 2024
790b947
fix multicores when using the torch model
M3nin0 Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ S3method(.source_items_fid,stac_cube)
S3method(.source_items_new,"aws_cube_landsat-c2-l2")
S3method(.source_items_new,"deafrica_cube_sentinel-1-rtc")
S3method(.source_items_new,"deafrica_cube_sentinel-2-l2a")
S3method(.source_items_new,"deaustralia_cube_sentinel-2a")
S3method(.source_items_new,"deaustralia_cube_sentinel-2b")
S3method(.source_items_new,"mpc_cube_cop-dem-glo-30")
S3method(.source_items_new,"mpc_cube_landsat-c2-l2")
S3method(.source_items_new,"mpc_cube_sentinel-1-grd")
Expand All @@ -199,6 +197,8 @@ S3method(.source_items_new,bdc_cube)
S3method(.source_items_new,cdse_cube)
S3method(.source_items_new,deafrica_cube)
S3method(.source_items_new,deaustralia_cube)
S3method(.source_items_new,deaustralia_cube_ga_s2am_ard_3)
S3method(.source_items_new,deaustralia_cube_ga_s2bm_ard_3)
S3method(.source_items_new,hls_cube)
S3method(.source_items_new,mpc_cube)
S3method(.source_items_new,sdc_cube)
Expand Down
4 changes: 2 additions & 2 deletions R/api_source_deaustralia.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
#' @keywords internal
#' @noRd
#' @export
`.source_items_new.deaustralia_cube_sentinel-2a` <- function(source, ...,
`.source_items_new.deaustralia_cube_ga_s2am_ard_3` <- function(source, ...,
collection,
stac_query,
tiles = NULL) {
Expand All @@ -100,7 +100,7 @@
#' @keywords internal
#' @noRd
#' @export
`.source_items_new.deaustralia_cube_sentinel-2b` <- function(source, ...,
`.source_items_new.deaustralia_cube_ga_s2bm_ard_3` <- function(source, ...,
collection,
stac_query,
tiles = NULL) {
Expand Down
4 changes: 3 additions & 1 deletion R/sits_classify.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,9 @@ sits_classify.raster_cube <- function(data,
proc_bloat = proc_bloat
)
# Update multicores parameter
if ("xgb_model" %in% .ml_class(ml_model) || .is_torch_model(ml_model))
if ("xgb_model" %in% .ml_class(ml_model))
multicores <- 1
else if (.torch_mps_enabled(ml_model) || .torch_cuda_enabled(ml_model))
multicores <- 1
else
# Update multicores parameter
Expand Down
Loading
Loading