From 9707d756c12cb843b39cc1a0fa458e0d89fcd3a5 Mon Sep 17 00:00:00 2001
From: qqiao <qqiao@nvidia.com>
Date: Wed, 19 Jul 2023 06:13:04 -0700
Subject: [PATCH 1/2] Fix sok test error due to conflict version of
 tensorflow-metadata

---
 docker/dockerfile.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/dockerfile.tf b/docker/dockerfile.tf
index d69576691..e86129268 100644
--- a/docker/dockerfile.tf
+++ b/docker/dockerfile.tf
@@ -17,8 +17,8 @@ COPY --chown=1000:1000 --from=triton /opt/tritonserver/backends/tensorflow backe
 # Tensorflow dependencies (only)
 # Pinning to pass hugectr sok tests
 # wrapt 1.5.0 introduce hugectr test failures, so downgrade to 1.14.0
-RUN pip install --no-cache-dir tensorflow protobuf==3.20.3 wrapt==1.14.0 \
-    && pip uninstall tensorflow keras -y
+RUN pip install --no-cache-dir tensorflow==2.12.0 protobuf==3.20.3 wrapt==1.14.0 \
+     && pip uninstall tensorflow keras -y
 
 # DLFW Tensorflow packages
 COPY --chown=1000:1000 --from=dlfw /usr/local/lib/python${PYTHON_VERSION}/dist-packages/tensorflow /usr/local/lib/python${PYTHON_VERSION}/dist-packages/tensorflow/

From ee24e55fdcccc942ec0ea2a66499eb64d4622797 Mon Sep 17 00:00:00 2001
From: qqiao <qqiao@nvidia.com>
Date: Thu, 20 Jul 2023 19:14:50 -0700
Subject: [PATCH 2/2] Add missed python path for hugectr

---
 docker/dockerfile.ctr | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/dockerfile.ctr b/docker/dockerfile.ctr
index f79b5ed85..ea459669a 100644
--- a/docker/dockerfile.ctr
+++ b/docker/dockerfile.ctr
@@ -77,6 +77,7 @@ RUN if [[ "${HUGECTR_DEV_MODE}" == "false" ]]; then \
         mv /hugectr/ci ~/hugectr-ci && rm -rf /hugectr && mkdir -p /hugectr && mv ~/hugectr-ci /hugectr/ci \
     ; fi
 
+ENV PYTHONPATH=${PYTHONPATH}:${HUGECTR_HOME}/lib
 ARG _HUGECTR_BACKEND_REPO="github.com/triton-inference-server/hugectr_backend.git"
 ARG TRITON_VERSION
 # Install Triton inference backend.