snakemake-executor-plugin-slurm 0.3.2__tar.gz → 0.4.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of snakemake-executor-plugin-slurm might be problematic. Click here for more details.

Files changed (5) hide show
  1. {snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/PKG-INFO +1 -1
  2. {snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/pyproject.toml +1 -1
  3. {snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/snakemake_executor_plugin_slurm/__init__.py +12 -3
  4. {snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/LICENSE +0 -0
  5. {snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/README.md +0 -0
{snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: snakemake-executor-plugin-slurm
3
- Version: 0.3.2
3
+ Version: 0.4.1
4
4
  Summary: A Snakemake executor plugin for submitting jobs to a SLURM cluster.
5
5
  Home-page: https://github.com/snakemake/snakemake-executor-plugin-slurm
6
6
  License: MIT
{snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/pyproject.toml RENAMED
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "snakemake-executor-plugin-slurm"
3
- version = "0.3.2"
3
+ version = "0.4.1"
4
4
  description = "A Snakemake executor plugin for submitting jobs to a SLURM cluster."
5
5
  authors = [
6
6
  "Christian Meesters <meesters@uni-mainz.de>",
{snakemake_executor_plugin_slurm-0.3.2 → snakemake_executor_plugin_slurm-0.4.1}/snakemake_executor_plugin_slurm/__init__.py RENAMED
@@ -67,7 +67,14 @@ class Executor(RemoteExecutor):
67
67
 
68
68
  log_folder = f"group_{job.name}" if job.is_group() else f"rule_{job.name}"
69
69
 
70
- slurm_logfile = os.path.abspath(f".snakemake/slurm_logs/{log_folder}/%j.log")
70
+ try:
71
+ wildcard_str = f"_{'_'.join(job.wildcards)}" if job.wildcards else ""
72
+ except AttributeError:
73
+ wildcard_str = ""
74
+
75
+ slurm_logfile = os.path.abspath(
76
+ f".snakemake/slurm_logs/{log_folder}/%j{wildcard_str}.log"
77
+ )
71
78
  os.makedirs(os.path.dirname(slurm_logfile), exist_ok=True)
72
79
 
73
80
  # generic part of a submission string:
@@ -107,8 +114,10 @@ class Executor(RemoteExecutor):
107
114
  if job.resources.get("mpi", False):
108
115
  if job.resources.get("nodes", False):
109
116
  call += f" --nodes={job.resources.get('nodes', 1)}"
110
- if job.resources.get("tasks", False):
111
- call += f" --ntasks={job.resources.get('tasks', 1)}"
117
+
118
+ # fixes #40 - set ntasks regarlless of mpi, because
119
+ # SLURM v22.05 will require it for all jobs
120
+ call += f" --ntasks={job.resources.get('tasks', 1)}"
112
121
 
113
122
  cpus_per_task = job.threads
114
123
  if job.resources.get("cpus_per_task"):