hpc-runner 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

hpc_runner/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.3.0'
+__version_tuple__ = version_tuple = (0, 3, 0)
 
 __commit_id__ = commit_id = None

hpc_runner/schedulers/local/scheduler.py

@@ -9,6 +9,7 @@ from datetime import datetime
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from hpc_runner.core.config import get_config
 from hpc_runner.core.exceptions import AccountingNotAvailable, JobNotFoundError
 from hpc_runner.core.job_info import JobInfo
 from hpc_runner.core.result import ArrayJobResult, JobResult, JobStatus
@@ -26,6 +27,14 @@ class LocalScheduler(BaseScheduler):
     name = "local"
 
     _job_counter: int = 0
+
+    def __init__(self) -> None:
+        """Initialize local scheduler with config-driven settings."""
+        config = get_config()
+        local_config = config.get_scheduler_config("local")
+
+        self.module_init_script = local_config.get("module_init_script", "")
+        
     _processes: dict[str, subprocess.Popen] = {}  # type: ignore[type-arg]
     _exit_codes: dict[str, int] = {}
     _output_paths: dict[str, dict[str, Path]] = {}
@@ -37,8 +46,9 @@ class LocalScheduler(BaseScheduler):
         LocalScheduler._job_counter += 1
         job_id = f"local_{LocalScheduler._job_counter}_{datetime.now().strftime('%Y%m%d%H%M%S')}"
 
-        # Set up environment with modules (modules not actually loaded locally)
+        # Set up environment
         env = os.environ.copy() if job.inherit_env else {}
+        env.update(job.env_vars)
 
         # Generate and write script
         script = self.generate_script(job)
@@ -48,69 +58,87 @@ class LocalScheduler(BaseScheduler):
 
         workdir = Path(job.workdir) if job.workdir else Path.cwd()
 
-        # Determine output paths
-        stdout_file = job.stdout or f"{job.name}.{job_id}.out"
-        stdout_path = workdir / stdout_file
-        if job.merge_output:
-            stderr_path = stdout_path  # Merge stderr into stdout
-        else:
-            stderr_file = job.stderr or f"{job.name}.{job_id}.err"
-            stderr_path = workdir / stderr_file
+        # Check if output should pass through to console (no redirection)
+        passthrough = job.stdout is None and job.stderr is None
+
+        if not passthrough:
+            # Determine output paths
+            stdout_file = job.stdout or f"{job.name}.{job_id}.out"
+            stdout_path = workdir / stdout_file
+            if job.merge_output:
+                stderr_path = stdout_path  # Merge stderr into stdout
+            else:
+                stderr_file = job.stderr or f"{job.name}.{job_id}.err"
+                stderr_path = workdir / stderr_file
 
-        # Store output paths
-        LocalScheduler._output_paths[job_id] = {
-            "stdout": stdout_path,
-            "stderr": stderr_path,
-        }
+            # Store output paths
+            LocalScheduler._output_paths[job_id] = {
+                "stdout": stdout_path,
+                "stderr": stderr_path,
+            }
 
         if interactive:
             # Blocking execution
-            with open(stdout_path, "w") as stdout_f:
-                if job.merge_output:
-                    result = subprocess.run(
-                        [str(script_path)],
-                        cwd=workdir,
-                        env=env,
-                        stdout=stdout_f,
-                        stderr=subprocess.STDOUT,
-                    )
-                else:
-                    with open(stderr_path, "w") as stderr_f:
+            if passthrough:
+                result = subprocess.run(
+                    [str(script_path)],
+                    cwd=workdir,
+                    env=env,
+                )
+            else:
+                with open(stdout_path, "w") as stdout_f:
+                    if job.merge_output:
                         result = subprocess.run(
                             [str(script_path)],
                             cwd=workdir,
                             env=env,
                             stdout=stdout_f,
-                            stderr=stderr_f,
+                            stderr=subprocess.STDOUT,
                         )
+                    else:
+                        with open(stderr_path, "w") as stderr_f:
+                            result = subprocess.run(
+                                [str(script_path)],
+                                cwd=workdir,
+                                env=env,
+                                stdout=stdout_f,
+                                stderr=stderr_f,
+                            )
             LocalScheduler._exit_codes[job_id] = result.returncode
             script_path.unlink(missing_ok=True)
         else:
             # Background execution
-            stdout_f = open(stdout_path, "w")
-            if job.merge_output:
+            if passthrough:
                 proc = subprocess.Popen(
                     [str(script_path)],
                     cwd=workdir,
                     env=env,
-                    stdout=stdout_f,
-                    stderr=subprocess.STDOUT,
                 )
             else:
-                stderr_f = open(stderr_path, "w")
-                proc = subprocess.Popen(
-                    [str(script_path)],
-                    cwd=workdir,
-                    env=env,
-                    stdout=stdout_f,
-                    stderr=stderr_f,
-                )
+                stdout_f = open(stdout_path, "w")
+                if job.merge_output:
+                    proc = subprocess.Popen(
+                        [str(script_path)],
+                        cwd=workdir,
+                        env=env,
+                        stdout=stdout_f,
+                        stderr=subprocess.STDOUT,
+                    )
+                else:
+                    stderr_f = open(stderr_path, "w")
+                    proc = subprocess.Popen(
+                        [str(script_path)],
+                        cwd=workdir,
+                        env=env,
+                        stdout=stdout_f,
+                        stderr=stderr_f,
+                    )
+                proc._stdout_file = stdout_f  # type: ignore[attr-defined]
+                if not job.merge_output:
+                    proc._stderr_file = stderr_f  # type: ignore[attr-defined]
             LocalScheduler._processes[job_id] = proc
             # Store script path for cleanup
             proc._script_path = script_path  # type: ignore[attr-defined]
-            proc._stdout_file = stdout_f  # type: ignore[attr-defined]
-            if not job.merge_output:
-                proc._stderr_file = stderr_f  # type: ignore[attr-defined]
 
         return JobResult(job_id=job_id, scheduler=self, job=job)
 
@@ -137,6 +165,7 @@ class LocalScheduler(BaseScheduler):
     def _submit_array_task(self, job: "Job", job_id: str, index: int) -> None:
         """Submit a single array task."""
         env = os.environ.copy() if job.inherit_env else {}
+        env.update(job.env_vars)
         env["HPC_ARRAY_TASK_ID"] = str(index)
 
         script = self.generate_script(job)

hpc_runner/schedulers/local/templates/job.sh.j2

@@ -5,20 +5,38 @@
 # Exit on error
 set -e
 
+# Module system initialization
+{% if scheduler.module_init_script %}
+. {{ scheduler.module_init_script }}
+{% else %}
+if [ -f /etc/profile.d/modules.sh ]; then
+    . /etc/profile.d/modules.sh
+elif [ -f /usr/share/Modules/init/bash ]; then
+    . /usr/share/Modules/init/bash
+elif [ -f /etc/modules/init/bash ]; then
+    . /etc/modules/init/bash
+fi
+{% endif %}
+
 {% if job.modules_path %}
-# Additional module paths (simulated for local)
+# Additional module paths
 {% for path in job.modules_path %}
-# module use {{ path }}
+module use {{ path }}
 {% endfor %}
 {% endif %}
 
 {% if job.modules %}
-# Modules (simulated for local - not actually loaded)
+# Load modules
 {% for mod in job.modules %}
-# module load {{ mod }}
+module load {{ mod }}
 {% endfor %}
 {% endif %}
 
+{% if job.venv %}
+# Activate virtual environment
+source {{ job.venv }}/bin/activate
+{% endif %}
+
 {% if job.env_prepend %}
 # Prepend to environment variables
 {% for key, value in job.env_prepend.items() %}

{hpc_runner-0.2.2.dist-info → hpc_runner-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hpc-runner
-Version: 0.2.2
+Version: 0.3.0
 Summary: Unified HPC job submission across multiple schedulers
 Project-URL: Homepage, https://github.com/sjalloq/hpc-runner
 Project-URL: Repository, https://github.com/sjalloq/hpc-runner

{hpc_runner-0.2.2.dist-info → hpc_runner-0.3.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 hpc_runner/__init__.py,sha256=1xnewzCt8FVqseOG5PRmLbiMz0I8V8_TrTyIjW0Q8_A,1414
-hpc_runner/_version.py,sha256=o3ZTescp-19Z9cvBGq9dQnbppljgzdUYUf98Nov0spY,704
+hpc_runner/_version.py,sha256=5zTqm8rgXsWYBpB2M3Zw_K1D-aV8wP7NsBLrmMKkrAQ,704
 hpc_runner/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hpc_runner/cli/__init__.py,sha256=qF_2phBjYZc_rHCyJeZevCvbOCfXQbLCwb-DY5mJNUo,26
 hpc_runner/cli/cancel.py,sha256=8qRkPjlSGs6OGs7-_ilwpUlWpGQe7ch8aB_rEWiiLAI,901
@@ -23,8 +23,8 @@ hpc_runner/schedulers/__init__.py,sha256=v55_DYgiigiFjXJhI7_XFtvxHoyDFWOntWRB9-H
 hpc_runner/schedulers/base.py,sha256=vhugT9lFrSZb8BMDO_x-h4nSF2oLg2nOvd347g3qfUY,6223
 hpc_runner/schedulers/detection.py,sha256=b5_qdyroMQsvIf_DYY_RDoje6ozKLA3RS-fWWNR9qUU,1467
 hpc_runner/schedulers/local/__init__.py,sha256=bM0RT5SBxs7TsGDUeUi--Z_vlVt9dgokJcftX92VE58,147
-hpc_runner/schedulers/local/scheduler.py,sha256=tTq_5uZEIYCjK3PmPjI_iBAPijwUlTmSaLNoy4_AB5c,13310
-hpc_runner/schedulers/local/templates/job.sh.j2,sha256=HDXgj-1hOvSQmR1sBCtES-sqIdqkBDQzql-espxE4g4,1092
+hpc_runner/schedulers/local/scheduler.py,sha256=aNfA9XnF8MGWxjhGturO_mzy9MQLVTt0ZN3NzSexGgs,14440
+hpc_runner/schedulers/local/templates/job.sh.j2,sha256=MwQnjW6p6XNHSJ9EbcC0H3H4USHhZbMel1dmvOJj-2Y,1483
 hpc_runner/schedulers/sge/__init__.py,sha256=aR_jJD-YA0HOYPaBwW_CEwi3PASXY2x9sOfmrj6-cjM,144
 hpc_runner/schedulers/sge/args.py,sha256=LBRj4UUDJ5jR8tEoCVF4ivjEKjqDI6LMvFsFzTgtOwk,6553
 hpc_runner/schedulers/sge/parser.py,sha256=P6bG7II2icqSrnzgxGanPITV12X1zMvWYV04L6RIH2c,8381
@@ -51,7 +51,7 @@ hpc_runner/tui/styles/monitor.tcss,sha256=-XJ_mF02AlaEuX81N6tkYKhKYDcBKYTDKXejJO
 hpc_runner/workflow/__init__.py,sha256=Y5h7wfnlWcav_f2USZaP6r5m7I5KFam8eEJGo4UqJ0w,221
 hpc_runner/workflow/dependency.py,sha256=PjhgCurnlfcKYO_arlUDLCKOpwqq324l09Sj0v-iwOU,639
 hpc_runner/workflow/pipeline.py,sha256=MYV95Kp-5m2YVxYDk_zIYUsyt31ctl7jnVA10F2OJgg,5540
-hpc_runner-0.2.2.dist-info/METADATA,sha256=_ZecSWdP7JpNPJQZKBxZm_NdQ3hN0dSByf1t9eF28mg,7157
-hpc_runner-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hpc_runner-0.2.2.dist-info/entry_points.txt,sha256=_IpvKqwtDP7R-jxj2p4D8ijKAIJp8eG9lmDZkVtrOkc,84
-hpc_runner-0.2.2.dist-info/RECORD,,
+hpc_runner-0.3.0.dist-info/METADATA,sha256=2-0_jdDuVnmszJzaJDpDOBW_Zfuasem_vr4vXvXJS9Q,7157
+hpc_runner-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hpc_runner-0.3.0.dist-info/entry_points.txt,sha256=_IpvKqwtDP7R-jxj2p4D8ijKAIJp8eG9lmDZkVtrOkc,84
+hpc_runner-0.3.0.dist-info/RECORD,,