Merge pull request #2 from csoneson/add-fallback

Add testload to basiliskRun()
lgatto · Oct 15, 2023 · 5b52dd1 · 5b52dd1
2 parents f7e02fa + 7c79ade
commit 5b52dd1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/R/drQuality.R b/R/drQuality.R
@@ -160,7 +160,8 @@ drQuality <- function(object, dimred = reducedDimNames(object),
         res <- basiliskRun(env = fmsneenv,
                            fun = .run_eval_dr_quality_from_list,
                            x = x,
-                           y = ys)
+                           y = ys,
+                           testload = "numba")
 
     } else {
         Kup <- as.integer(Kup)
@@ -174,7 +175,8 @@ drQuality <- function(object, dimred = reducedDimNames(object),
                         fun = .run_eval_red_rnx_auc_from_data,
                         x = x,
                         y = y,
-                        Kup = Kup)
+                        Kup = Kup,
+                        testload = "numba")
         }, BPPARAM = BPPARAM)
     }
     ## Convert list output to a data.frame

diff --git a/R/fmssne.R b/R/fmssne.R
@@ -36,7 +36,8 @@
                        maxcor = maxcor,
                        fit_U = fit_U,
                        bht = bht,
-                       fseed = fseed)
+                       fseed = fseed,
+                       testload = "numba")
     rownames(ans) <- rownames(x)
     colnames(ans) <- paste0("FMSSNE", seq_len(ncomponents))
     ans

diff --git a/R/fmstsne.R b/R/fmstsne.R
@@ -37,7 +37,8 @@
                        maxls = maxls,
                        maxcor = maxcor,
                        bht = bht,
-                       fseed = fseed)
+                       fseed = fseed,
+                       testload = "numba")
     rownames(ans) <- rownames(x)
     colnames(ans) <- paste0("FMSTSNE", seq_len(ncomponents))
     ans

diff --git a/R/internal.R b/R/internal.R
@@ -23,7 +23,8 @@
 ##' @importFrom reticulate import
 ##' @importFrom basilisk basiliskStart basiliskRun basiliskStop
 fmsnePythonNames <- function() {
-    cl <- basiliskStart(fmsneenv)
+    cl <- basiliskStart(fmsneenv,
+                        testload = "numba")
     fmsne.names <- basiliskRun(cl, function() {
         X <- reticulate::import("fmsne")
         names(X)
@@ -37,5 +38,6 @@ fmsnePythonVersion <- function() {
                 fun = function() {
                     fmsne <- reticulate::import("fmsne")
                     fmsne$`__version__`
-                })
+                },
+                testload = "numba")
 }
diff --git a/R/mssne.R b/R/mssne.R
@@ -30,7 +30,8 @@
                        ftol = ftol,
                        maxls = maxls,
                        maxcor = maxcor,
-                       fit_U = fit_U)
+                       fit_U = fit_U,
+                       testload = "numba")
     rownames(ans) <- rownames(x)
     colnames(ans) <- paste0("MSSNE", seq_len(ncomponents))
     ans

diff --git a/R/mstnse.R b/R/mstnse.R
@@ -29,7 +29,8 @@
                        gtol = gtol,
                        ftol = ftol,
                        maxls = maxls,
-                       maxcor = maxcor)
+                       maxcor = maxcor,
+                       testload = "numba")
     rownames(ans) <- rownames(x)
     colnames(ans) <- paste0("MSTSNE", seq_len(ncomponents))
     ans