Merge pull request #234 from uclahs-cds/sfitz-generic-resources

Sfitz generic resources
uclahs-cds · Sep 27, 2023 · 3771180 · 3771180
2 parents a860454 + 16346a3
commit 3771180
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Add check for MuSE or Mutect2 on F2 node
+
 ### Changed
+- Fix blarchive compression log output directory
 - Delay readcount compression until original file is no longer needed
 
 ## [7.0.0-rc.1] - 2023-08-28

diff --git a/external/pipeline-Nextflow-config b/external/pipeline-Nextflow-config
diff --git a/main.nf b/main.nf
@@ -47,6 +47,17 @@ log.info """\
         tumor_only_mode: ${params.tumor_only_mode}
 """
 
+if (params.max_cpus < 16 || params.max_memory < 30) {
+    if (params.algorithm.contains('muse') || params.algorithm.contains('mutect2')) {
+        error """\
+        ------------------------------------
+        ERROR: Insufficient resources: ${params.max_cpus} CPUs and ${params.max_memory} of memory.
+        ------------------------------------
+        To run Mutect2 or MuSE. this pipeline requires at least 16 CPUs and 32 GB of memory.
+        """
+        }
+    }
+
 include { 
     run_GetSampleName_Mutect2 as run_GetSampleName_Mutect2_normal
     run_GetSampleName_Mutect2 as run_GetSampleName_Mutect2_tumor 

diff --git a/module/common.nf b/module/common.nf
@@ -88,7 +88,7 @@ process compress_file_blarchive {
     set -euo pipefail
     dereferenced_file=\$(readlink -f ${file_to_compress})
     blarchive compress_files --input \$dereferenced_file \
-        --log ${params.work_dir}
+        --log ./
     ln -s \${dereferenced_file}.bz2 ${file_to_compress}.bz2
     """
     }