phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-07-29 07:14:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added platform for docker image

Browse source
This commit is contained in:
picografix 2024-10-17 12:32:07 +05:30
parent c4d5d6bb91
commit 0c75f2cf31
4 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
llama_stack/cli/stack/build.py
View file

@ -77,6 +77,11 @@ class StackBuild(Subcommand):
help="Image Type to use for the build. This can be either conda or docker. If not specified, will use the image type from the template config.", help="Image Type to use for the build. This can be either conda or docker. If not specified, will use the image type from the template config.",
choices=["conda", "docker"], choices=["conda", "docker"],
) )
self.parser.add_argument(
"--platform",
type=str,
help="Platform to use for the build. Required when using docker as image type, defaults to host if no platform is specified",
)
def _get_build_config_from_name(self, args: argparse.Namespace) -> Optional[Path]: def _get_build_config_from_name(self, args: argparse.Namespace) -> Optional[Path]:
if os.getenv("CONDA_PREFIX", ""): if os.getenv("CONDA_PREFIX", ""):
@ -205,6 +210,8 @@ class StackBuild(Subcommand):
build_config.name = args.name build_config.name = args.name
if args.image_type: if args.image_type:
build_config.image_type = args.image_type build_config.image_type = args.image_type
if args.platform: # Add platform to build_config if provided
build_config.platform = args.platform
self._run_stack_build_command_from_build_config(build_config) self._run_stack_build_command_from_build_config(build_config)
return return
@ -287,6 +294,8 @@ class StackBuild(Subcommand):
build_config = BuildConfig( build_config = BuildConfig(
name=name, image_type=image_type, distribution_spec=distribution_spec name=name, image_type=image_type, distribution_spec=distribution_spec
) )
if args.platform: # Add platform to build_config if provided
build_config.platform = args.platform
self._run_stack_build_command_from_build_config(build_config) self._run_stack_build_command_from_build_config(build_config)
return return

6
llama_stack/distribution/build.py
View file

@ -35,7 +35,6 @@ class ImageType(Enum):
docker = "docker" docker = "docker"
conda = "conda" conda = "conda"
class Dependencies(BaseModel): class Dependencies(BaseModel):
pip_packages: List[str] pip_packages: List[str]
docker_image: Optional[str] = None docker_image: Optional[str] = None
@ -91,10 +90,12 @@ def build_image(build_config: BuildConfig, build_file_path: Path):
script = pkg_resources.resource_filename( script = pkg_resources.resource_filename(
"llama_stack", "distribution/build_container.sh" "llama_stack", "distribution/build_container.sh"
) )
args = [ args = [
script, script,
build_config.name, build_config.name,
package_deps.docker_image, package_deps.docker_image,
build_config.platform,
str(build_file_path), str(build_file_path),
str(BUILDS_BASE_DIR / ImageType.docker.value), str(BUILDS_BASE_DIR / ImageType.docker.value),
" ".join(deps), " ".join(deps),
@ -107,8 +108,9 @@ def build_image(build_config: BuildConfig, build_file_path: Path):
script, script,
build_config.name, build_config.name,
str(build_file_path), str(build_file_path),
" ".join(deps), " ".join(deps)
] ]
if special_deps: if special_deps:
args.append("#".join(special_deps)) args.append("#".join(special_deps))

11
llama_stack/distribution/build_container.sh
View file

@ -5,7 +5,7 @@ LLAMA_STACK_DIR=${LLAMA_STACK_DIR:-}
TEST_PYPI_VERSION=${TEST_PYPI_VERSION:-} TEST_PYPI_VERSION=${TEST_PYPI_VERSION:-}
if [ "$#" -lt 4 ]; then if [ "$#" -lt 4 ]; then
echo "Usage: $0 <build_name> <docker_base> <pip_dependencies> [<special_pip_deps>]" >&2 echo "Usage: $0 <build_name> <docker_base> <platform> <pip_dependencies> [<special_pip_deps>]" >&2
echo "Example: $0 my-fastapi-app python:3.9-slim 'fastapi uvicorn' " >&2 echo "Example: $0 my-fastapi-app python:3.9-slim 'fastapi uvicorn' " >&2
exit 1 exit 1
fi fi
@ -17,9 +17,10 @@ set -euo pipefail
build_name="$1" build_name="$1"
image_name="llamastack-$build_name" image_name="llamastack-$build_name"
docker_base=$2 docker_base=$2
build_file_path=$3 platform=$3
host_build_dir=$4 build_file_path=$4
pip_dependencies=$5 host_build_dir=$5
pip_dependencies=$6
# Define color codes # Define color codes
RED='\033[0;31m' RED='\033[0;31m'
@ -133,7 +134,7 @@ if command -v selinuxenabled &> /dev/null && selinuxenabled; then
fi fi
set -x set -x
$DOCKER_BINARY build $DOCKER_OPTS -t $image_name -f "$TEMP_DIR/Dockerfile" "$REPO_DIR" $mounts $DOCKER_BINARY build --platform "$platform" $DOCKER_OPTS -t $image_name -f "$TEMP_DIR/Dockerfile" "$REPO_DIR" $mounts
# clean up tmp/configs # clean up tmp/configs
rm -rf $REPO_CONFIGS_DIR rm -rf $REPO_CONFIGS_DIR

6
llama_stack/distribution/datatypes.py
View file

@ -21,7 +21,7 @@ from llama_stack.apis.safety import Safety
LLAMA_STACK_BUILD_CONFIG_VERSION = "2" LLAMA_STACK_BUILD_CONFIG_VERSION = "2"
LLAMA_STACK_RUN_CONFIG_VERSION = "2" LLAMA_STACK_RUN_CONFIG_VERSION = "2"
LLAMA_STACK_DEFAULT_PLATFORM = "linux/arm64"
RoutingKey = Union[str, List[str]] RoutingKey = Union[str, List[str]]
@ -130,6 +130,10 @@ can be instantiated multiple times (with different configs) if necessary.
class BuildConfig(BaseModel): class BuildConfig(BaseModel):
version: str = LLAMA_STACK_BUILD_CONFIG_VERSION version: str = LLAMA_STACK_BUILD_CONFIG_VERSION
name: str name: str
platform: str = Field(
default=LLAMA_STACK_DEFAULT_PLATFORM,
description="The platform to build for (cpu | gpu)",
)
distribution_spec: DistributionSpec = Field( distribution_spec: DistributionSpec = Field(
description="The distribution spec to build including API providers. " description="The distribution spec to build including API providers. "
) )