diff --git a/README.md b/README.md index 68a667e95924547abe048f850a158c8118777cfc..8567ffff81ed12f817e4e4d5f57301b837ad15a3 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ bash tests/test_integration_workflow_with_conda/test.slurm.sh > **NOTE:** Depending on the configuration of your Slurm installation or if > using a different workload manager, you may need to adapt file `cluster.json` -> and the arguments to options `--config` and `--cores` in the file +> and the arguments to options `--config`, `--cores` and `--jobs` in the file > `test.slurm.sh`, both located in directory `tests/test_integration_workflow`. > Consult the manual of your workload manager as well as the section of the > Snakemake manual dealing with [cluster execution]. @@ -210,6 +210,7 @@ your run. --cluster-config="cluster.json" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cores=256 \ + --jobs=256 \ --printshellcmds \ --rerun-incomplete \ --use-singularity \ diff --git a/install/environment.yml b/install/environment.yml index 8fcba7a48080b33b67fbb45454e1a52aacf3783a..e28326d0faaf643a0f78d80910990b9fa5f373d4 100644 --- a/install/environment.yml +++ b/install/environment.yml @@ -12,5 +12,4 @@ dependencies: - python=3.7.4 - pip: - pandas==1.0.1 - - snakemake==5.19.2 - + - snakemake==6.5.5 \ No newline at end of file diff --git a/tests/test_integration_workflow/test.slurm.sh b/tests/test_integration_workflow/test.slurm.sh index 6c40abba6ba761899bd224c3a87a8f02ebf0df3c..22f2f5231c8ce9942a42990d11146139e87b3818 100755 --- a/tests/test_integration_workflow/test.slurm.sh +++ b/tests/test_integration_workflow/test.slurm.sh @@ -31,6 +31,7 @@ snakemake \ --cluster-config="../input_files/cluster.json" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cores=256 \ + --jobs=256 \ --printshellcmds \ --rerun-incomplete \ --use-singularity \ diff --git a/tests/test_integration_workflow_multiple_lanes/test.slurm.sh b/tests/test_integration_workflow_multiple_lanes/test.slurm.sh index 10a2752b9531e36c2d23d07ba1950b2a4607f066..c16a757846afc2fb2149323de6b2c0017306e991 100755 --- a/tests/test_integration_workflow_multiple_lanes/test.slurm.sh +++ b/tests/test_integration_workflow_multiple_lanes/test.slurm.sh @@ -31,6 +31,7 @@ snakemake \ --cluster-config="../input_files/cluster.json" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cores=256 \ + --jobs=256 \ --printshellcmds \ --rerun-incomplete \ --use-singularity \ diff --git a/tests/test_integration_workflow_with_conda/test.slurm.sh b/tests/test_integration_workflow_with_conda/test.slurm.sh index 873f17bafcc6bdf9f7a9718793fea3d97ef8eed4..3fe2491dc7a34fabaebf094a7ab7abc4148d6aed 100755 --- a/tests/test_integration_workflow_with_conda/test.slurm.sh +++ b/tests/test_integration_workflow_with_conda/test.slurm.sh @@ -31,6 +31,7 @@ snakemake \ --cluster-config="../input_files/cluster.json" \ --cluster="sbatch --cpus-per-task={cluster.threads} --mem={cluster.mem} --qos={cluster.queue} --time={cluster.time} --job-name={cluster.name} -o {cluster.out} -p scicore" \ --cores=256 \ + --jobs=256 \ --printshellcmds \ --rerun-incomplete \ --use-conda \