Skip to content

Commit

Permalink
Merge pull request #763 from n1hility/launch-perf
Browse files Browse the repository at this point in the history
Fix long container startup times
  • Loading branch information
rhatdan authored Aug 19, 2024
2 parents b9aaba6 + 2f2d608 commit f604294
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
11 changes: 10 additions & 1 deletion training/ilab-wrapper/ilab
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ check_insights

# Template values replaced by container build
CONTAINER_DEVICE="__REPLACE_CONTAINER_DEVICE__"
IMAGE_NAME="__REPLACE_IMAGE_NAME__"
SOURCE_IMAGE="__REPLACE_IMAGE_NAME__"
IMAGE_NAME="localhost/instructlab:__REPLACE_IMAGE_TAG__"

ENTRYPOINT="ilab"
PARAMS=("$@")
Expand Down Expand Up @@ -144,4 +145,12 @@ PODMAN_COMMAND=("sudo" "--preserve-env=$PRESERVE_ENV" "podman" "run" "--rm" "-it
"--env" "HF_TOKEN"
"${IMAGE_NAME}")

sudo podman image exists "$IMAGE_NAME"
if [ "$?" != "0" ]; then
echo "Initializing ilab container..."
id=$(sudo podman create "$SOURCE_IMAGE")
sudo podman commit "$id" "$IMAGE_NAME"
sudo podman rm "$id"
fi

exec "${PODMAN_COMMAND[@]}" "${PARAMS[@]}"
4 changes: 3 additions & 1 deletion training/nvidia-bootc/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,12 @@ RUN chmod +x /usr/bin/ilab
ARG INSTRUCTLAB_IMAGE="quay.io/ai-lab/instructlab-nvidia:latest"
ARG INSTRUCTLAB_IMAGE_PULL_SECRET="instructlab-nvidia-pull"

RUN for i in /usr/bin/ilab*; do \
RUN export INSTRUCTLAB_TAG=$(echo ${INSTRUCTLAB_IMAGE} | cut -f 2 -d ':') && \
for i in /usr/bin/ilab*; do \
sed -i 's/__REPLACE_TRAIN_DEVICE__/cuda/' $i; \
sed -i 's/__REPLACE_CONTAINER_DEVICE__/nvidia.com\/gpu=all/' $i; \
sed -i "s%__REPLACE_IMAGE_NAME__%${INSTRUCTLAB_IMAGE}%" $i; \
sed -i "s%__REPLACE_IMAGE_TAG__%${INSTRUCTLAB_TAG}%" $i; \
done

# Added for running as an OCI Container to prevent Overlay on Overlay issues.
Expand Down
11 changes: 10 additions & 1 deletion training/nvidia-bootc/duplicated/ilab-wrapper/ilab
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ check_insights

# Template values replaced by container build
CONTAINER_DEVICE="__REPLACE_CONTAINER_DEVICE__"
IMAGE_NAME="__REPLACE_IMAGE_NAME__"
SOURCE_IMAGE="__REPLACE_IMAGE_NAME__"
IMAGE_NAME="localhost/instructlab:__REPLACE_IMAGE_TAG__"

ENTRYPOINT="ilab"
PARAMS=("$@")
Expand Down Expand Up @@ -144,4 +145,12 @@ PODMAN_COMMAND=("sudo" "--preserve-env=$PRESERVE_ENV" "podman" "run" "--rm" "-it
"--env" "HF_TOKEN"
"${IMAGE_NAME}")

sudo podman image exists "$IMAGE_NAME"
if [ "$?" != "0" ]; then
echo "Initializing ilab container..."
id=$(sudo podman create "$SOURCE_IMAGE")
sudo podman commit "$id" "$IMAGE_NAME"
sudo podman rm "$id"
fi

exec "${PODMAN_COMMAND[@]}" "${PARAMS[@]}"

0 comments on commit f604294

Please sign in to comment.