update db build steps

stemangiola · Dec 6, 2024 · 0fa42be · 0fa42be
1 parent a98a820
commit 0fa42be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 39 deletions.
diff --git a/dev/2_execute_hpcell_on_census_and_defining_data_tranformation.R b/dev/2_execute_hpcell_on_census_and_defining_data_tranformation.R
@@ -106,49 +106,23 @@ job::job({
       store = "/vast/projects/mangiola_immune_map/PostDoc/immuneHealthyBodyMap/census_hpcell_oct_2024/target_store/",
       gene_nomenclature = "ensembl",
       data_container_type = "anndata",
-      tier = tiers,
+      # tier = tiers, # WE DON"T NEED AS WE HAVE ELASTIC RESOURCES NOW
       computing_resources = list(
-        crew_controller_slurm(
-          name = "tier_1", 
-          script_lines = "#SBATCH --mem 8G",
-          slurm_cpus_per_task = 1, 
-          workers = 300, 
-          tasks_max = 10,
-          verbose = T,
-          launch_max = 10, 
-          seconds_idle = 30
-        ),
 
         crew_controller_slurm(
-          name = "tier_2",
-          script_lines = "#SBATCH --mem 10G",
-          slurm_cpus_per_task = 1,
-          workers = 200,
-          tasks_max = 10,
-          verbose = T,
-          launch_max = 10, 
-          seconds_idle = 30
-        ),
-        crew_controller_slurm(
-          name = "tier_3",
-          script_lines = "#SBATCH --mem 15G",
-          slurm_cpus_per_task = 1,
-          workers = 100,
-          tasks_max = 10,
-          verbose = T,
-          launch_max = 5, 
-          seconds_idle = 30
-        ),
-        crew_controller_slurm(
-          name = "tier_4",
-          script_lines = "#SBATCH --mem 200G", # There should be a tier 5 with 12Gb for sample of 40K cells
-          slurm_cpus_per_task = 1,
-          workers = 100,
-          tasks_max = 10,
-          verbose = T,
-          launch_max = 5, 
-          seconds_idle = 30
+          name = "elastic",
+          workers = 300,
+          tasks_max = 20,
+          seconds_idle = 30,
+          crashes_error = 5,
+          options_cluster = crew_options_slurm(
+            memory_gigabytes_required = c(8, 10, 40, 80, 200), 
+            cpus_per_task = 2, 
+            time_minutes = c(60, 60*4, 60*4, 60*24, 60*24),
+            verbose = T
+          )
         )
+
       ),
       verbosity = "summary",
       # debug_step = "annotation_tbl_tier_4",

diff --git a/dev/3_prepare_local_cache_splitting_du_dataset_and_cell_type.R b/dev/3_prepare_local_cache_splitting_du_dataset_and_cell_type.R
@@ -19,6 +19,8 @@ library(arrow)
 library(dplyr)
 library(duckdb)
 
+#
+
 
 # Get Dharmesh metadata consensus
 system("~/bin/rclone copy box_adelaide:/Mangiola_ImmuneAtlas/reannotation_consensus/cell_annotation_new.parquet /vast/projects/cellxgene_curated/metadata_cellxgenedp_Apr_2024/")