gpustack-runner 0.1.23.post4__tar.gz → 0.1.24__tar.gz

{gpustack_runner-0.1.23.post4 → gpustack_runner-0.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpustack-runner
-Version: 0.1.23.post4
+Version: 0.1.24
 Summary: GPUStack Runner is library for registering runnable accelerated backends and services in GPUStack.
 Project-URL: Homepage, https://github.com/gpustack/runner
 Project-URL: Bug Tracker, https://github.com/gpustack/gpustack/issues
@@ -97,9 +97,15 @@ The following table lists the supported accelerated backends and their correspon
 
 ### Hygon DTK
 
-| DTK Version <br/> (Variant) | vLLM             |
-|-----------------------------|------------------|
-| 25.04                       | `0.9.2`, `0.8.5` |
+| DTK Version <br/> (Variant) | vLLM                       |
+|-----------------------------|----------------------------|
+| 25.04                       | `0.11.0`, `0.9.2`, `0.8.5` |
+
+### THead HGGC
+
+| HGGC Version <br/> (Variant) | vLLM     | SGLang  |
+|------------------------------|----------|---------|
+| 12.3                         | `0.11.1` | `0.5.5` |
 
 ### MetaX MACA
 
@@ -108,6 +114,13 @@ The following table lists the supported accelerated backends and their correspon
 | 3.2                          | `0.10.2` |
 | 3.0                          | `0.9.1`  |
 
+### MThreads MUSA
+
+| MUSA Version <br/> (Variant) | vLLM    | SGLang  |
+|------------------------------|---------|---------|
+| 4.3.2                        |         | `0.5.2` |
+| 4.1.0                        | `0.9.2` |         |
+
 ### AMD ROCm
 
 > [!CAUTION]
@@ -171,6 +184,7 @@ ARG PYTHON_VERSION=...                                 # REQUIRED
 ARG CMAKE_MAX_JOBS=...                                 # REQUIRED
 ARG {OTHERS}                                           # OPTIONAL
 ARG {BACKEND}_VERSION=...                              # REQUIRED
+ARG {BACKEND}_VERSION_EXTRA=...                        # OPTIONAL
 ARG {BACKEND}_ARCHS=...                                # REQUIRED
 ARG {BACKEND}_{OTHERS}=...                             # OPTIONAL
 ARG {SERVICE}_BASE_IMAGE=...                           # REQUIRED
@@ -243,7 +257,7 @@ To add support for a new accelerated backend:
 
 1. Create a new directory under `pack/` named with the new backend.
 2. Add a `Dockerfile` in the new directory following the [Dockerfile Convention](#dockerfile-convention).
-3. Update [pack.yml](.github/workflows/pack.yml) to include the new backend in the build matrix.
+3. Update [pack.yml](.github/workflows/pack.yml), [discard.yml](.github/workflows/discard.yml) and [prune.yml](.github/workflows/prune.yml) to include the new backend in the build matrix.
 4. Update [matrix.yml](pack/matrix.yaml) to include the new backend and its variants.
 5. Update `_RE_DOCKER_IMAGE` in [runner.py](gpustack_runner/runner.py) to recognize the new backend.
 6. [Optional] Update [tests](tests/gpustack_runner) if necessary.

{gpustack_runner-0.1.23.post4 → gpustack_runner-0.1.24}/README.md

@@ -77,9 +77,15 @@ The following table lists the supported accelerated backends and their correspon
 
 ### Hygon DTK
 
-| DTK Version <br/> (Variant) | vLLM             |
-|-----------------------------|------------------|
-| 25.04                       | `0.9.2`, `0.8.5` |
+| DTK Version <br/> (Variant) | vLLM                       |
+|-----------------------------|----------------------------|
+| 25.04                       | `0.11.0`, `0.9.2`, `0.8.5` |
+
+### THead HGGC
+
+| HGGC Version <br/> (Variant) | vLLM     | SGLang  |
+|------------------------------|----------|---------|
+| 12.3                         | `0.11.1` | `0.5.5` |
 
 ### MetaX MACA
 
@@ -88,6 +94,13 @@ The following table lists the supported accelerated backends and their correspon
 | 3.2                          | `0.10.2` |
 | 3.0                          | `0.9.1`  |
 
+### MThreads MUSA
+
+| MUSA Version <br/> (Variant) | vLLM    | SGLang  |
+|------------------------------|---------|---------|
+| 4.3.2                        |         | `0.5.2` |
+| 4.1.0                        | `0.9.2` |         |
+
 ### AMD ROCm
 
 > [!CAUTION]
@@ -151,6 +164,7 @@ ARG PYTHON_VERSION=...                                 # REQUIRED
 ARG CMAKE_MAX_JOBS=...                                 # REQUIRED
 ARG {OTHERS}                                           # OPTIONAL
 ARG {BACKEND}_VERSION=...                              # REQUIRED
+ARG {BACKEND}_VERSION_EXTRA=...                        # OPTIONAL
 ARG {BACKEND}_ARCHS=...                                # REQUIRED
 ARG {BACKEND}_{OTHERS}=...                             # OPTIONAL
 ARG {SERVICE}_BASE_IMAGE=...                           # REQUIRED
@@ -223,7 +237,7 @@ To add support for a new accelerated backend:
 
 1. Create a new directory under `pack/` named with the new backend.
 2. Add a `Dockerfile` in the new directory following the [Dockerfile Convention](#dockerfile-convention).
-3. Update [pack.yml](.github/workflows/pack.yml) to include the new backend in the build matrix.
+3. Update [pack.yml](.github/workflows/pack.yml), [discard.yml](.github/workflows/discard.yml) and [prune.yml](.github/workflows/prune.yml) to include the new backend in the build matrix.
 4. Update [matrix.yml](pack/matrix.yaml) to include the new backend and its variants.
 5. Update `_RE_DOCKER_IMAGE` in [runner.py](gpustack_runner/runner.py) to recognize the new backend.
 6. [Optional] Update [tests](tests/gpustack_runner) if necessary.

{gpustack_runner-0.1.23.post4 → gpustack_runner-0.1.24}/gpustack_runner/__init__.py

@@ -1,5 +1,11 @@
 from __future__ import annotations
 
+from .__utils__ import (
+    merge_image,
+    parse_image,
+    replace_image_with,
+    split_image,
+)
 from ._version import commit_id, version, version_tuple
 from .runner import (
     BackendRunners,
@@ -21,7 +27,11 @@ __all__ = [
     "list_backend_runners",
     "list_runners",
     "list_service_runners",
+    "merge_image",
+    "parse_image",
+    "replace_image_with",
     "set_re_docker_image",
+    "split_image",
     "version",
     "version_tuple",
 ]

{gpustack_runner-0.1.23.post4 → gpustack_runner-0.1.24}/gpustack_runner/__main__.py

@@ -11,6 +11,7 @@ from .cmds import (
     CompareImagesSubCommand,
     CopyImagesSubCommand,
     ListImagesSubCommand,
+    LoadImagesSubCommand,
     SaveImagesSubCommand,
 )
 
@@ -35,6 +36,7 @@ def main():
     SaveImagesSubCommand.register(subcommand_parser)
     CopyImagesSubCommand.register(subcommand_parser)
     CompareImagesSubCommand.register(subcommand_parser)
+    LoadImagesSubCommand.register(subcommand_parser)
 
     # Autocomplete
     argcomplete.autocomplete(parser)

gpustack_runner-0.1.24/gpustack_runner/__utils__.py

@@ -0,0 +1,155 @@
+from __future__ import annotations
+
+_BLANK_TAG = "latest"
+
+
+def split_image(image: str, fill_blank_tag: bool = False) -> tuple:
+    """
+    Split the Docker completed image string into its image_name([registry/][namespace/]repository) and image_tag.
+
+    Args:
+        image:
+            The Docker completed image string to split.
+        fill_blank_tag:
+            If True, fill the blank tag with `latest`.
+
+    Returns:
+        A tuple of (image_name, image_tag).
+
+    """
+    parts = image.rsplit("@", maxsplit=1)
+    if len(parts) == 2:
+        return tuple(parts)
+    parts = image.rsplit(":", maxsplit=1)
+    if len(parts) == 2 and "/" not in parts[1]:
+        if fill_blank_tag:
+            parts[1] = parts[1] or _BLANK_TAG
+        return tuple(parts)
+    return image, _BLANK_TAG if fill_blank_tag else None
+
+
+def merge_image(image_name: str, image_tag: str | None = None) -> str:
+    """
+    Merge the Docker image and image_tag into a single string.
+
+    Args:
+        image_name:
+            The Docker image name, in form of [registry/][namespace/]repository.
+        image_tag:
+            The Docker image tag.
+
+    Returns:
+        The completed Docker image string.
+
+    """
+    if not image_tag:
+        return image_name
+    if image_tag.startswith("sha256:"):
+        return f"{image_name}@{image_tag}"
+    return f"{image_name}:{image_tag}"
+
+
+def parse_image(
+    image: str,
+    fill_blank_tag: bool = False,
+) -> tuple[str | None, str | None, str, str | None] | None:
+    """
+    Parse the Docker image string into its components:
+    registry, namespace, repository, and tag.
+
+    Args:
+        image:
+            The Docker image string to parse.
+        fill_blank_tag:
+            If True, fill the blank tag with `latest`.
+
+    Returns:
+        A tuple of (registry, namespace, repository, tag).
+        Registry, namespace, and tag can be None if not present.
+        If the image string is invalid, return None.
+
+    """
+    image_reg, image_ns, image_repo, image_tag = (
+        None,
+        None,
+        None,
+        None,
+    )
+    image_rest = image.strip()
+
+    # Get tag.
+    image_rest, image_tag = split_image(image_rest, fill_blank_tag=fill_blank_tag)
+    if not image_rest:
+        return None
+
+    # Get repository.
+    parts = image_rest.rsplit("/", maxsplit=1)
+    if len(parts) == 2:
+        image_rest, image_repo = parts
+    else:
+        image_rest, image_repo = None, image_rest
+
+    # Get namespace.
+    if image_rest:
+        parts = image_rest.rsplit("/", maxsplit=1)
+        if len(parts) == 2:
+            image_reg, image_ns = parts
+        else:
+            image_reg, image_ns = None, image_rest
+
+    return image_reg, image_ns, image_repo, image_tag
+
+
+def replace_image_with(
+    image: str,
+    registry: str | None = None,
+    namespace: str | None = None,
+    repository: str | None = None,
+) -> str:
+    """
+    Replace the registry, namespace, and repository of a Docker image string.
+
+    The given image string is parsed into its components (registry, namespace, repository, tag),
+    and the specified components are replaced with the provided values.
+
+    The format of a Docker image string is:
+    [registry/][namespace/]repository[:tag|@digest]
+
+    Args:
+        image:
+            The original Docker image string.
+        registry:
+            The new registry to use. If None, keep the original registry.
+        namespace:
+            The new namespace to use. If None, keep the original namespace.
+        repository:
+            The new repository to use. If None, keep the original repository.
+
+    Returns:
+        The modified Docker image string.
+
+    """
+    if not image or (not registry and not namespace and not repository):
+        return image
+
+    registry = registry.strip() if registry else None
+    namespace = namespace.strip() if namespace else None
+    repository = repository.strip() if repository else None
+
+    image_reg, image_ns, image_repo, image_tag = parse_image(image)
+
+    registry = registry or image_reg
+    namespace = namespace or image_ns
+    repository = repository or image_repo
+
+    image_name = ""
+    if registry:
+        image_name += f"{registry}/"
+    if namespace:
+        image_name += f"{namespace}/"
+    elif registry:
+        image_name += "library/"
+    image_name += repository
+
+    image = merge_image(image_name, image_tag)
+    return image

{gpustack_runner-0.1.23.post4 → gpustack_runner-0.1.24}/gpustack_runner/_version.py

@@ -27,8 +27,8 @@ version_tuple: VERSION_TUPLE
 __commit_id__: COMMIT_ID
 commit_id: COMMIT_ID
 
-__version__ = version = '0.1.23.post4'
-__version_tuple__ = version_tuple = (0, 1, 23, 'post4')
+__version__ = version = '0.1.24'
+__version_tuple__ = version_tuple = (0, 1, 24)
 try:
     from ._version_appendix import git_commit
     __commit_id__ = commit_id = git_commit

gpustack_runner-0.1.24/gpustack_runner/_version_appendix.py

@@ -0,0 +1 @@
+git_commit = "c2b7172"

{gpustack_runner-0.1.23.post4 → gpustack_runner-0.1.24}/gpustack_runner/cmds/__init__.py

@@ -4,6 +4,7 @@ from .images import (
     CompareImagesSubCommand,
     CopyImagesSubCommand,
     ListImagesSubCommand,
+    LoadImagesSubCommand,
     PlatformedImage,
     SaveImagesSubCommand,
     append_images,
@@ -14,6 +15,7 @@ __all__ = [
     "CompareImagesSubCommand",
     "CopyImagesSubCommand",
     "ListImagesSubCommand",
+    "LoadImagesSubCommand",
     "PlatformedImage",
     "SaveImagesSubCommand",
     "append_images",