From f4da5f7b6d296aabd00c2ed068cab4d3605ff80e Mon Sep 17 00:00:00 2001
From: PHILO-HE <feilong.he@intel.com>
Date: Fri, 16 Aug 2024 01:03:01 +0800
Subject: [PATCH] [Misc] Update dockerfile for CPU to cover protobuf
 installation (#7182)

---
 .buildkite/run-cpu-test.sh | 2 +-
 Dockerfile.cpu             | 2 +-
 requirements-common.txt    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.buildkite/run-cpu-test.sh b/.buildkite/run-cpu-test.sh
index 968b212b..c23b37db 100644
--- a/.buildkite/run-cpu-test.sh
+++ b/.buildkite/run-cpu-test.sh
@@ -22,7 +22,7 @@ docker exec cpu-test-avx2 bash -c "python3 examples/offline_inference.py"
 
 # Run basic model test
 docker exec cpu-test bash -c "
-  pip install pytest Pillow protobuf
+  pip install pytest
   pytest -v -s tests/models -m \"not vlm\" --ignore=tests/models/test_embedding.py --ignore=tests/models/test_oot_registration.py --ignore=tests/models/test_registry.py --ignore=tests/models/test_jamba.py --ignore=tests/models/test_danube3_4b.py" # Mamba and Danube3-4B on CPU is not supported
 
 # online inference
diff --git a/Dockerfile.cpu b/Dockerfile.cpu
index 35ce5dde..9a570f98 100644
--- a/Dockerfile.cpu
+++ b/Dockerfile.cpu
@@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
 RUN --mount=type=cache,target=/root/.cache/pip \
     pip install intel-openmp
 
-ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libtcmalloc_minimal.so.4:/usr/local/lib/libiomp5.so:$LD_PRELOAD"
+ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libtcmalloc_minimal.so.4:/usr/local/lib/libiomp5.so"
 
 RUN echo 'ulimit -c 0' >> ~/.bashrc
 
diff --git a/requirements-common.txt b/requirements-common.txt
index 6ace082a..e17ff063 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -6,6 +6,7 @@ tqdm
 py-cpuinfo
 transformers >= 4.43.2  # Required for Chameleon and Llama 3.1 hotfox.
 tokenizers >= 0.19.1  # Required for Llama 3.
+protobuf # Required by LlamaTokenizer.
 fastapi
 aiohttp
 openai