xmanager-slurm 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

xm_slurm/executables.py

@@ -14,6 +14,7 @@ class Dockerfile(xm.ExecutableSpec):
         dockerfile: The path to the Dockerfile.
         context: The path to the Docker context.
         target: The Docker build target.
+        ssh: A list of docker SSH sockets/keys.
         build_args: Build arguments to docker.
         cache_from: Where to pull the BuildKit cache from. See `--cache-from` in `docker build`.
         workdir: The working directory in container.
@@ -29,6 +30,9 @@ class Dockerfile(xm.ExecutableSpec):
     # Docker build target
     target: str | None = None
 
+    # SSH sockets/keys for the docker build step.
+    ssh: list[str] = dataclasses.field(default_factory=list)
+
     # Build arguments to docker
     build_args: Mapping[str, str] = dataclasses.field(default_factory=dict)
 
@@ -56,6 +60,7 @@ class Dockerfile(xm.ExecutableSpec):
             self.dockerfile,
             self.context,
             self.target,
+            tuple(sorted(self.ssh)),
             tuple(sorted(self.build_args.items())),
             tuple(sorted(self.cache_from)),
             self.workdir,

xm_slurm/packageables.py

@@ -40,6 +40,7 @@ def docker_container(
     dockerfile: pathlib.Path | None = None,
     context: pathlib.Path | None = None,
     target: str | None = None,
+    ssh: list[str] | None = None,
     build_args: Mapping[str, str] = immutabledict.immutabledict(),
     cache_from: str | Sequence[str] | None = None,
     labels: Mapping[str, str] = immutabledict.immutabledict(),
@@ -54,6 +55,7 @@ def docker_container(
         dockerfile: The path to the dockerfile.
         context: The path to the docker context.
         target: The docker build target.
+        ssh: A list of SSH sockets/keys for the docker build step.
         build_args: Build arguments to docker.
         cache_from: Where to pull the BuildKit cache from. See `--cache-from` in `docker build`.
         labels: The container labels.
@@ -69,6 +71,8 @@ def docker_container(
     if dockerfile is None:
         dockerfile = context / "Dockerfile"
     dockerfile = dockerfile.resolve()
+    if ssh is None:
+        ssh = []
     if cache_from is None and isinstance(executor_spec, SlurmSpec):
         cache_from = executor_spec.tag
     if cache_from is None:
@@ -82,6 +86,7 @@ def docker_container(
             dockerfile=dockerfile,
             context=context,
             target=target,
+            ssh=ssh,
             build_args=build_args,
             cache_from=cache_from,
             workdir=workdir,

xm_slurm/templates/docker/docker-bake.hcl.j2

@@ -4,6 +4,13 @@ target "{{ hash(executable) }}" {
 {{ executable.dockerfile.read_text() }}
 EOF
     context = "{{ executable.context }}"
+    {% if executable.ssh %}
+    ssh = [
+        {% for ssh_val in executable.ssh %}
+        "{{ ssh_val }}"{% if not loop.last %},{% endif %}
+        {% endfor %}
+    ]
+    {% endif %}
     {% if executable.target %}
     target = "{{ executable.target }}"
     {% endif %}

xm_slurm/templates/slurm/runtimes/apptainer.bash.j2

@@ -77,7 +77,7 @@ exec ${CONTAINER_RUNTIME} run \
   --containall \
 {% if cluster.mounts %}
 {% for source, dest in cluster.mounts.items() %}
-  --mount type=bind,src={{ source }},dst={{ dest }} \
+  --bind {{ source }}:{{ dest }} \
 {% endfor %}
 {% endif %}
   --workdir "$SLURM_TMPDIR"/container-workdir \

{xmanager_slurm-0.3.0.dist-info → xmanager_slurm-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xmanager-slurm
-Version: 0.3.0
+Version: 0.3.2
 Summary: Slurm backend for XManager.
 Author-Email: Jesse Farebrother <jfarebro@cs.mcgill.ca>
 License: MIT

{xmanager_slurm-0.3.0.dist-info → xmanager_slurm-0.3.2.dist-info}/RECORD

@@ -5,12 +5,12 @@ xm_slurm/config.py,sha256=St2bdp2m2pajGxivmsRkmZrKd-inBKF7Hn6oezTT9zM,4955
 xm_slurm/console.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 xm_slurm/contrib/clusters/__init__.py,sha256=BM9W2iJE3616uwAUdj1uqcXF70zunXlxWHEXgLdH2xs,1600
 xm_slurm/contrib/clusters/drac.py,sha256=Tl4Cv0DOHssJcnTU5c60w0Ye3dwlDZE4AkPtmew6-lQ,5201
-xm_slurm/executables.py,sha256=4SVn6obIvOKh54RXYccixUx993Xma0rLGanD3TfXNS4,5762
+xm_slurm/executables.py,sha256=G62nACUyki7Jwif3w6c6h3t88ebiv_w9ISYWeeAUVFo,5959
 xm_slurm/execution.py,sha256=EDckbWYtBoMAc0yWU-BitFWGPOkA-AxoQRFv7XdUNcA,17998
 xm_slurm/executors.py,sha256=vilogTjlxHLfZDms4aYOZWUW8w-2IdxU7xh-9vcW1Y0,4723
 xm_slurm/experiment.py,sha256=y5K-kZgavRk022IGXw5bg7beX4cnU1JtUOeP9824sRA,25578
 xm_slurm/job_blocks.py,sha256=1H1eZ5gbEGEoDYcoSh8S_gvp04MLXP7G128crDJlMYo,482
-xm_slurm/packageables.py,sha256=nzmkREacDPJXmo6D1mk4bKjUrLTjHj3rue-PoO_EATk,11216
+xm_slurm/packageables.py,sha256=mHG2ackEKh1Qg0HdIP72uDZt-9j4qvsW-l_WScdWMes,11375
 xm_slurm/packaging/__init__.py,sha256=dh307yLpUT9KN7rJ1e9fYC6hegGKfZcGboUq9nGpDVQ,233
 xm_slurm/packaging/docker/__init__.py,sha256=SQxaDtomYc4NwZ5lSoCiMoy2S2lRmc0sgwVMbENIatU,2474
 xm_slurm/packaging/docker/abc.py,sha256=f8XvUA_FusIpXI45PR5isA2msxM003ycW5mWbAyiKfk,3830
@@ -21,7 +21,7 @@ xm_slurm/packaging/router.py,sha256=6qjtsy4BoYgSaQzC_pQSHVHeWcphG_xWVsWgW6ALC7U,
 xm_slurm/packaging/utils.py,sha256=dCWAuUXT5COXGe1BQEW8luo5patxTeLSAGOWPR63iY8,6219
 xm_slurm/resources.py,sha256=FqAULBhchu6z66On3SRDOJvXfs0sLGfBvcMGUUB3jxU,4835
 xm_slurm/status.py,sha256=4BUBm-qwVWH_RJGzRxO8Eom5d92_cp8jydQVwqH8v6U,6653
-xm_slurm/templates/docker/docker-bake.hcl.j2,sha256=Ur9t9Yk_LfLPLvJvur47ZKFZmY07H-pJ76edQzAgYfU,1313
+xm_slurm/templates/docker/docker-bake.hcl.j2,sha256=ClsFpj91Mr1VfA8L6eqBG3HQz0Z8VenF6mEfmAhQgUo,1498
 xm_slurm/templates/docker/mamba.Dockerfile,sha256=vsOYkm-T33C2RanwbdjJIUjhPJ_H1NDBeEACguQJZ8c,716
 xm_slurm/templates/docker/pdm.Dockerfile,sha256=Yg5-lOXkNVJr0OER_yOnRvn9NlFLnt3RfdYfq4f0ilg,748
 xm_slurm/templates/docker/python.Dockerfile,sha256=O6lHesmsLz7cX-efVQpsafEVYmbHPyV73xA9WbBKGKg,738
@@ -30,9 +30,9 @@ xm_slurm/templates/slurm/fragments/proxy.bash.j2,sha256=VJLglZo-Nvx9R-qe3rHTxr07
 xm_slurm/templates/slurm/job-array.bash.j2,sha256=d4twfV1PATGQwTIleFBUIGmMAIHH-F7RjBsdfaAIQko,599
 xm_slurm/templates/slurm/job-group.bash.j2,sha256=UkjfBE7jg9mepcUWaHZEAjkiXsIM1j_sLxLzxkteD-Y,1120
 xm_slurm/templates/slurm/job.bash.j2,sha256=EUeq3P2xqTIqlHi2SVhFBT7NL4lUj8okYUa3GnlaIIc,1852
-xm_slurm/templates/slurm/runtimes/apptainer.bash.j2,sha256=Z8Mc4wbmOJW_n9V0hcKsPNEnveZFqsASg8Z3dICaETk,3241
+xm_slurm/templates/slurm/runtimes/apptainer.bash.j2,sha256=dMntzelhs8DqKyIpO9S6wzMfH2PDevmgvyjCW8Xc2dY,3222
 xm_slurm/templates/slurm/runtimes/podman.bash.j2,sha256=xKXYFvQvazMx0PgvmlRXR6eecoiBUl8y52dIzQtWkBE,1469
 xm_slurm/utils.py,sha256=PNd0vTn33UKm5LpC41TdO9QIFe21V5A0RbYEhQIMjrA,1930
-xmanager_slurm-0.3.0.dist-info/METADATA,sha256=Cjiev-9s_DlKicsDWSgja-m3fYRcnG8UOEXaWTdxyI0,909
-xmanager_slurm-0.3.0.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
-xmanager_slurm-0.3.0.dist-info/RECORD,,
+xmanager_slurm-0.3.2.dist-info/METADATA,sha256=wQy1L_EjWG6foDa1iClRQT0-_iC6LMMh5E30_GHEePc,909
+xmanager_slurm-0.3.2.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
+xmanager_slurm-0.3.2.dist-info/RECORD,,