xmanager-slurm 0.4.6__tar.gz → 0.4.7__tar.gz

{xmanager_slurm-0.4.6 → xmanager_slurm-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmanager-slurm
-Version: 0.4.6
+Version: 0.4.7
 Summary: Slurm backend for XManager.
 Project-URL: GitHub, https://github.com/jessefarebro/xm-slurm
 Author-email: Jesse Farebrother <jfarebro@cs.mcgill.ca>

{xmanager_slurm-0.4.6 → xmanager_slurm-0.4.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "xmanager-slurm"
 description = "Slurm backend for XManager."
-version = "0.4.6"
+version = "0.4.7"
 # readme = "README.md"
 requires-python = ">=3.10"
 license = { text = "MIT" }

{xmanager_slurm-0.4.6 → xmanager_slurm-0.4.7}/uv.lock

@@ -2250,7 +2250,7 @@ wheels = [
 
 [[package]]
 name = "xmanager-slurm"
-version = "0.4.6"
+version = "0.4.7"
 source = { editable = "." }
 dependencies = [
     { name = "aiofile" },

{xmanager_slurm-0.4.6 → xmanager_slurm-0.4.7}/xm_slurm/execution.py

@@ -237,8 +237,8 @@ class SlurmHandle(_BatchedSlurmHandle, tp.Generic[SlurmJobT]):
     async def logs(
         self, *, num_lines: int, block_size: int, wait: bool, follow: bool
     ) -> tp.AsyncGenerator[ConsoleRenderable, None]:
-        statedir = await get_client()._state_dir(self.ssh)
-        file = statedir / f"{self.experiment_id}/slurm-{self.slurm_job.job_id}.out"
+        experiment_dir = await get_client().experiment_dir(self.ssh, self.experiment_id)
+        file = experiment_dir / f"slurm-{self.slurm_job.job_id}.out"
 
         fs = await get_client().fs(self.ssh)
 
@@ -455,9 +455,26 @@ class SlurmExecutionClient:
 
     @functools.cache
     async def _state_dir(self, ssh_config: SlurmSSHConfig) -> pathlib.Path:
-        cmd = await self.run(ssh_config, "printenv HOME", check=True)
-        assert isinstance(cmd.stdout, str)
-        return pathlib.Path(cmd.stdout.strip()) / ".local" / "state" / "xm-slurm"
+        state_dirs = [
+            ("XM_SLURM_STATE_DIR", ""),
+            ("XDG_STATE_HOME", "xm-slurm"),
+            ("HOME", ".local/state/xm-slurm"),
+        ]
+
+        for env_var, subpath in state_dirs:
+            cmd = await self.run(ssh_config, f"printenv {env_var}", check=False)
+            assert isinstance(cmd.stdout, str)
+            if cmd.returncode == 0:
+                return pathlib.Path(cmd.stdout.strip()) / subpath
+
+        raise SlurmExecutionError(
+            "Failed to find a valid state directory for XManager. "
+            "We weren't able to resolve any of the following paths: "
+            f"{', '.join(env_var + ('/' + subpath if subpath else '') for env_var, subpath in state_dirs)}."
+        )
+
+    async def experiment_dir(self, ssh_config: SlurmSSHConfig, experiment_id: int) -> pathlib.Path:
+        return (await self._state_dir(ssh_config)) / f"{experiment_id:08d}"
 
     async def run(
         self,
@@ -646,7 +663,7 @@ class SlurmExecutionClient:
 
         fs = await self.fs(cluster.ssh)
 
-        template_dir = (await self._state_dir(cluster.ssh)) / f"{experiment_id}"
+        template_dir = await self.experiment_dir(cluster.ssh, experiment_id)
 
         await fs.makedirs(template_dir, exist_ok=True)
         await fs.write(template_dir / submission_script_path, submission_script.encode())

{xmanager_slurm-0.4.6 → xmanager_slurm-0.4.7}/xm_slurm/templates/slurm/runtimes/podman.bash.j2

@@ -3,7 +3,6 @@ time podman pull \
 {% if job.executable.credentials %}
   --creds {{ job.executable.credentials.username }}:{{ job.executable.credentials.password }} \
 {% endif %}
-  --retry 3 \
   {{ job.executable.image }}
 
 cat << 'ENTRYPOINT_EOF' > "$SLURM_TMPDIR"/xm-slurm-entrypoint.sh