Add more rules to container version update (#253)

* Add more rules to container version update * Update container versions to 24.06 --------- Signed-off-by: Michał Szołucha <[email protected]>
triton-inference-server · Jul 31, 2024 · 42c461b · 42c461b
1 parent 381d6ff
commit 42c461b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/benchmarks/BM_efficientnet/Dockerfile.torch b/benchmarks/BM_efficientnet/Dockerfile.torch
@@ -1,3 +1,3 @@
-FROM nvcr.io/nvidia/tritonserver:24.05-py3
+FROM nvcr.io/nvidia/tritonserver:24.06-py3
 
 RUN pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu118
diff --git a/benchmarks/BM_efficientnet/benchmark-cpu.sh b/benchmarks/BM_efficientnet/benchmark-cpu.sh
@@ -64,6 +64,6 @@ echo "... should be enough."
 
 popd || exit 1
 
-docker run -t --rm --name ${CLIENT_CONTAINER_NAME} --net host -v $(pwd):/bench -w /bench nvcr.io/nvidia/tritonserver:23.07-py3-sdk bash run-benchmarks-cpu.sh $2
+docker run -t --rm --name ${CLIENT_CONTAINER_NAME} --net host -v $(pwd):/bench -w /bench nvcr.io/nvidia/tritonserver:24.06-py3-sdk bash run-benchmarks-cpu.sh $2
 
 docker kill ${SERVER_CONTAINER_NAME}
diff --git a/benchmarks/BM_efficientnet/benchmark.sh b/benchmarks/BM_efficientnet/benchmark.sh
@@ -49,14 +49,14 @@ MODEL_REPO="$(pwd)/docs/examples/efficientnet/model_repository"
 SERVER_CONTAINER_NAME="efficientnet.server"
 CLIENT_CONTAINER_NAME="efficientnet.client"
 
-docker run -dt --rm $DOCKER_RUN_ARGS --name ${SERVER_CONTAINER_NAME} --shm-size=50g --ulimit memlock=-1 --ulimit stack=67108864 --gpus all -p8000:8000 -p8001:8001 -p8002:8002 --privileged -v $MODEL_REPO:/model_repository nvcr.io/nvidia/tritonserver:23.07-py3 tritonserver --model-repository /model_repository --log-verbose 1 --model-control-mode explicit
+docker run -dt --rm $DOCKER_RUN_ARGS --name ${SERVER_CONTAINER_NAME} --shm-size=50g --ulimit memlock=-1 --ulimit stack=67108864 --gpus all -p8000:8000 -p8001:8001 -p8002:8002 --privileged -v $MODEL_REPO:/model_repository nvcr.io/nvidia/tritonserver:24.06-py3 tritonserver --model-repository /model_repository --log-verbose 1 --model-control-mode explicit
 
 echo "Waiting for tritonserver to wake up..."
 sleep 30
 echo "... should be enough."
 
 popd || exit 1
 
-docker run -t --rm --name ${CLIENT_CONTAINER_NAME} --net host -v $(pwd):/bench -w /bench nvcr.io/nvidia/tritonserver:23.07-py3-sdk bash run-benchmarks.sh $2
+docker run -t --rm --name ${CLIENT_CONTAINER_NAME} --net host -v $(pwd):/bench -w /bench nvcr.io/nvidia/tritonserver:24.06-py3-sdk bash run-benchmarks.sh $2
 
 docker kill ${SERVER_CONTAINER_NAME}
diff --git a/docker/Dockerfile.devel b/docker/Dockerfile.devel
@@ -25,7 +25,7 @@
 # backend together with tritonserver, start from here
 # -------------------------------------------------- #
 
-ARG TRITON_VERSION=24.05
+ARG TRITON_VERSION=24.06
 ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:${TRITON_VERSION}-py3
 FROM ${BASE_IMAGE} as builder
 

diff --git a/docker/Dockerfile.release b/docker/Dockerfile.release
@@ -26,7 +26,7 @@
 # the whole tritonserver, start from here.
 # -------------------------------------------------- #
 
-ARG TRITON_VERSION=24.05
+ARG TRITON_VERSION=24.06
 ARG BASE_IMAGE=nvcr.io/nvidia/tritonserver:${TRITON_VERSION}-py3
 FROM ${BASE_IMAGE} as builder
 

diff --git a/docs/examples/efficientnet/0001-Update-requirements-and-add-Dockerfile.bench.patch b/docs/examples/efficientnet/0001-Update-requirements-and-add-Dockerfile.bench.patch
@@ -19,7 +19,7 @@ index 00000000..4c180272
 --- /dev/null
 +++ b/Dockerfile.bench
 @@ -0,0 +1,6 @@
-+ARG FROM_IMAGE_NAME=nvcr.io/nvidia/pytorch:24.05-py3
++ARG FROM_IMAGE_NAME=nvcr.io/nvidia/pytorch:24.06-py3
 +FROM ${FROM_IMAGE_NAME}
 +
 +ADD . /DeepLearningExamples

diff --git a/tools/update_container_version.sh b/tools/update_container_version.sh
@@ -50,3 +50,5 @@ sed -i "s|ARG TRITON_VERSION=${version_pattern}|ARG TRITON_VERSION=$1|g" docker/
 # Efficientnet example
 sed -i "s|+ARG FROM_IMAGE_NAME=nvcr.io/nvidia/pytorch:${version_pattern}-py3|+ARG FROM_IMAGE_NAME=nvcr.io/nvidia/pytorch:$1-py3|g" docs/examples/efficientnet/0001-Update-requirements-and-add-Dockerfile.bench.patch
 sed -i "s|FROM nvcr.io/nvidia/tritonserver:${version_pattern}-py3|FROM nvcr.io/nvidia/tritonserver:$1-py3|g" benchmarks/BM_efficientnet/Dockerfile.torch
+sed -i "s|nvcr.io/nvidia/tritonserver:${version_pattern}-py3|nvcr.io/nvidia/tritonserver:$1-py3|g" benchmarks/BM_efficientnet/benchmark-cpu.sh
+sed -i "s|nvcr.io/nvidia/tritonserver:${version_pattern}-py3|nvcr.io/nvidia/tritonserver:$1-py3|g" benchmarks/BM_efficientnet/benchmark.sh