Browse Source

Update callers and config

Thomas 1 day ago
parent
commit
8e7e1df6bc
3 changed files with 9 additions and 9 deletions
  1. 2 2
      pandora-config.example.toml
  2. 3 3
      src/callers/deep_somatic.rs
  3. 4 4
      src/callers/savana.rs

+ 2 - 2
pandora-config.example.toml

@@ -173,7 +173,7 @@ deepvariant_threads = 20
 # DeepVariant singularity image path
 deepvariant_image = "/mnt/beegfs02/scratch/t_steimle/somatic_pipe_tools/deepvariant_latest.sif"
 
-# DeepVariant model type (e.g. ONT_R104).
+# DeepVariant model type (e.g. ONT).
 deepvariant_model_type = "ONT_R104"
 
 # Force DeepVariant recomputation.
@@ -195,7 +195,7 @@ deepsomatic_threads = 20
 deepsomatic_image = "/mnt/beegfs02/scratch/t_steimle/somatic_pipe_tools/deepsomatic_latest.sif"
 
 # DeepSomatic model type.
-deepsomatic_model_type = "ONT_R104"
+deepsomatic_model_type = "ONT"
 
 # Force DeepSomatic recomputation.
 deepsomatic_force = false

+ 3 - 3
src/callers/deep_somatic.rs

@@ -286,7 +286,7 @@ impl SlurmRunner for DeepSomatic {
             job_name: Some(format!("deepsomatic_{}", self.id)),
             cpus_per_task: Some(self.config.deepsomatic_threads as u32),
             mem: Some("60G".into()),
-            partition: Some("batch".into()),
+            partition: Some("shortq".into()),
             gres: None,
         }
         .to_args()
@@ -299,7 +299,7 @@ impl SbatchRunner for DeepSomatic {
             job_name: Some(format!("deepsomatic_{}", self.id)),
             cpus_per_task: Some(self.config.deepsomatic_threads as u32),
             mem: Some("60G".into()),
-            partition: Some("batch".into()),
+            partition: Some("shortq".into()),
             gres: None,
         }
     }
@@ -661,6 +661,6 @@ mod tests {
     fn deepsomatic_run() -> anyhow::Result<()> {
         test_init();
         let config = Config::default();
-        run_deepsomatic_chunked("34528", &config, 30)
+        run_deepsomatic_chunked("DUMCO", &config, 50)
     }
 }

+ 4 - 4
src/callers/savana.rs

@@ -204,8 +204,8 @@ impl SlurmRunner for Savana {
         SlurmParams {
             job_name: Some("savana".into()),
             cpus_per_task: Some(self.config.savana_threads as u32),
-            mem: Some("60G".into()),
-            partition: Some("shortq".into()),
+            mem: Some("80G".into()),
+            partition: Some("mediumq".into()),
             gres: None,
         }
         .to_args()
@@ -216,8 +216,8 @@ impl SbatchRunner for Savana {
         SlurmParams {
             job_name: Some("savana".into()),
             cpus_per_task: Some(self.config.savana_threads as u32),
-            mem: Some("60G".into()),
-            partition: Some("shortq".into()),
+            mem: Some("80G".into()),
+            partition: Some("mediumq".into()),
             gres: None,
         }
     }