[CPU] Add video inferencing via torchcodec on s390x (#58693)
Signed-off-by: Rehan Khan <Rehan.Khan7@ibm.com> Co-authored-by: Li, Jiang <jiang1.li@intel.com>
This commit is contained in:
co-authored by
Li, Jiang <jiang1.li@intel.com>
parent
1668e5976d
commit
fd2f3fcfa5
@@ -141,6 +141,41 @@ RUN --mount=type=cache,target=/root/.cache/uv \
|
|||||||
sed -i '/#include "internal\/pycore_atomic.h"/i\#include "dynamic_annotations.h"' numba/_dispatcher.cpp; \
|
sed -i '/#include "internal\/pycore_atomic.h"/i\#include "dynamic_annotations.h"' numba/_dispatcher.cpp; \
|
||||||
fi && python setup.py bdist_wheel
|
fi && python setup.py bdist_wheel
|
||||||
|
|
||||||
|
# Shared FFmpeg for torchcodec video decoding (UBI has no ffmpeg package).
|
||||||
|
FROM base AS ffmpeg-build
|
||||||
|
ARG FFMPEG_VERSION=n6.1.2
|
||||||
|
WORKDIR /tmp
|
||||||
|
RUN microdnf install -y pkgconf-pkg-config xz && \
|
||||||
|
curl -LO https://github.com/FFmpeg/FFmpeg/archive/refs/tags/${FFMPEG_VERSION}.tar.gz && \
|
||||||
|
tar -xzf ${FFMPEG_VERSION}.tar.gz && \
|
||||||
|
cd FFmpeg-${FFMPEG_VERSION} && \
|
||||||
|
./configure --prefix=/usr/local --libdir=/usr/local/lib \
|
||||||
|
--enable-shared --disable-static --enable-pic \
|
||||||
|
--disable-doc --disable-debug --disable-ffplay --disable-ffprobe \
|
||||||
|
--extra-cflags="-Wno-incompatible-pointer-types" && \
|
||||||
|
make -j"$(nproc)" && \
|
||||||
|
make install
|
||||||
|
|
||||||
|
# Torchcodec video decoder (no s390x wheels; CPU / FFmpeg only s390x does not support audio decoding).
|
||||||
|
FROM python-install AS torchcodec-builder
|
||||||
|
ARG TORCHCODEC_VERSION=v0.14.0
|
||||||
|
WORKDIR /tmp
|
||||||
|
ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
|
||||||
|
ENV PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
--mount=type=bind,from=ffmpeg-build,source=/usr/local,target=/usr/local \
|
||||||
|
git clone --depth 1 --branch ${TORCHCODEC_VERSION} \
|
||||||
|
https://github.com/pytorch/torchcodec.git && \
|
||||||
|
cd torchcodec && \
|
||||||
|
uv pip install torch==2.13.0 --index-url https://download.pytorch.org/whl/cpu && \
|
||||||
|
uv pip install pybind11 setuptools wheel && \
|
||||||
|
pybind11_DIR="$(python -c 'import pybind11; print(pybind11.get_cmake_dir())')" && \
|
||||||
|
export pybind11_DIR CMAKE_PREFIX_PATH="${pybind11_DIR}:${CMAKE_PREFIX_PATH}" && \
|
||||||
|
export I_CONFIRM_THIS_IS_NOT_A_LICENSE_VIOLATION=1 && \
|
||||||
|
export TORCHCODEC_DISABLE_COMPILE_WARNING_AS_ERROR=1 && \
|
||||||
|
export TORCHCODEC_CMAKE_BUILD_DIR="${PWD}/build" && \
|
||||||
|
python setup.py bdist_wheel
|
||||||
|
|
||||||
# Build OpenCV from source for s390x
|
# Build OpenCV from source for s390x
|
||||||
FROM python-install AS opencv-builder
|
FROM python-install AS opencv-builder
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
@@ -179,6 +214,10 @@ RUN --mount=type=bind,from=gperftools-build,src=/tmp/gperftools-2.16,target=/gpe
|
|||||||
make -C /gperftools install-libLTLIBRARIES && \
|
make -C /gperftools install-libLTLIBRARIES && \
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
RUN --mount=type=bind,from=ffmpeg-build,source=/usr/local,target=/ffmpeg-prefix \
|
||||||
|
cp -a /ffmpeg-prefix/lib/. /usr/local/lib/ && \
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
ENV LD_PRELOAD=/usr/local/lib/libtcmalloc_minimal.so.4
|
ENV LD_PRELOAD=/usr/local/lib/libtcmalloc_minimal.so.4
|
||||||
|
|
||||||
# Install dependencies, including PyTorch and Apache Arrow
|
# Install dependencies, including PyTorch and Apache Arrow
|
||||||
@@ -190,17 +229,20 @@ RUN --mount=type=cache,target=/root/.cache/uv \
|
|||||||
--mount=type=bind,from=numba-builder,source=/tmp/llvmlite/dist,target=/tmp/llvmlite-wheels/ \
|
--mount=type=bind,from=numba-builder,source=/tmp/llvmlite/dist,target=/tmp/llvmlite-wheels/ \
|
||||||
--mount=type=bind,from=numba-builder,source=/tmp/numba/dist,target=/tmp/numba-wheels/ \
|
--mount=type=bind,from=numba-builder,source=/tmp/numba/dist,target=/tmp/numba-wheels/ \
|
||||||
--mount=type=bind,from=opencv-builder,source=/tmp/opencv-python/dist,target=/tmp/opencv-wheels/ \
|
--mount=type=bind,from=opencv-builder,source=/tmp/opencv-python/dist,target=/tmp/opencv-wheels/ \
|
||||||
|
--mount=type=bind,from=torchcodec-builder,source=/tmp/torchcodec/dist,target=/tmp/torchcodec-wheels/ \
|
||||||
VISION_WHL_FILE=$(ls /tmp/vision-wheels/*.whl) && \
|
VISION_WHL_FILE=$(ls /tmp/vision-wheels/*.whl) && \
|
||||||
HF_XET_WHL_FILE=$(ls /tmp/hf-xet-wheels/*.whl) && \
|
HF_XET_WHL_FILE=$(ls /tmp/hf-xet-wheels/*.whl) && \
|
||||||
LLVM_WHL_FILE=$(ls /tmp/llvmlite-wheels/*.whl) && \
|
LLVM_WHL_FILE=$(ls /tmp/llvmlite-wheels/*.whl) && \
|
||||||
NUMBA_WHL_FILE=$(ls /tmp/numba-wheels/*.whl) && \
|
NUMBA_WHL_FILE=$(ls /tmp/numba-wheels/*.whl) && \
|
||||||
OPENCV_WHL_FILE=$(ls /tmp/opencv-wheels/*.whl) && \
|
OPENCV_WHL_FILE=$(ls /tmp/opencv-wheels/*.whl) && \
|
||||||
|
TORCHCODEC_WHL_FILE=$(ls /tmp/torchcodec-wheels/*.whl) && \
|
||||||
uv pip install -v \
|
uv pip install -v \
|
||||||
$VISION_WHL_FILE \
|
$VISION_WHL_FILE \
|
||||||
$HF_XET_WHL_FILE \
|
$HF_XET_WHL_FILE \
|
||||||
$LLVM_WHL_FILE \
|
$LLVM_WHL_FILE \
|
||||||
$NUMBA_WHL_FILE \
|
$NUMBA_WHL_FILE \
|
||||||
$OPENCV_WHL_FILE \
|
$OPENCV_WHL_FILE \
|
||||||
|
$TORCHCODEC_WHL_FILE \
|
||||||
--torch-backend cpu \
|
--torch-backend cpu \
|
||||||
--index-strategy unsafe-best-match \
|
--index-strategy unsafe-best-match \
|
||||||
-r requirements/build/cpu.txt \
|
-r requirements/build/cpu.txt \
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Currently, the CPU implementation for s390x architecture supports FP32, BF16 and
|
|||||||
- OS: `Linux`
|
- OS: `Linux`
|
||||||
- SDK: `gcc/g++ >= 14.0.0` or later with Command Line Tools
|
- SDK: `gcc/g++ >= 14.0.0` or later with Command Line Tools
|
||||||
- Instruction Set Architecture (ISA): VXE support is required. Works with Z15 and above.
|
- Instruction Set Architecture (ISA): VXE support is required. Works with Z15 and above.
|
||||||
- Build from source python packages (no pre-built s390x wheels): `torchvision`, `llvmlite`, `numba`, `opencv-python-headless`, `hf-xet`
|
- Build from source python packages (no pre-built s390x wheels): `torchvision`, `llvmlite`, `numba`, `opencv-python-headless`, `hf-xet`, `torchcodec`
|
||||||
|
|
||||||
--8<-- [end:requirements]
|
--8<-- [end:requirements]
|
||||||
--8<-- [start:set-up-using-python]
|
--8<-- [start:set-up-using-python]
|
||||||
@@ -55,7 +55,8 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y && \
|
|||||||
Execute the following commands to build and install vLLM from source.
|
Execute the following commands to build and install vLLM from source.
|
||||||
|
|
||||||
!!! tip
|
!!! tip
|
||||||
Pre-built wheels are not available for s390x for the following packages. Build them from source before building vLLM: `torchvision`, `llvmlite`, `numba`, `opencv-python-headless`, `hf-xet`.
|
Pre-built wheels are not available for s390x for the following packages. Build them from source before building vLLM: `torchvision`, `llvmlite`, `numba`, `opencv-python-headless`, `hf-xet`, `torchcodec`.
|
||||||
|
`torchcodec` also needs a shared FFmpeg (built in `Dockerfile.s390x`). Video decoding only; there is no s390x NVDEC path.
|
||||||
See `docker/Dockerfile.s390x` for exact versions and build commands used in each multi-stage build.
|
See `docker/Dockerfile.s390x` for exact versions and build commands used in each multi-stage build.
|
||||||
|
|
||||||
!!! note "LLVM 20 required for llvmlite"
|
!!! note "LLVM 20 required for llvmlite"
|
||||||
@@ -94,6 +95,7 @@ uv pip install -v \
|
|||||||
/path/to/numba.whl \
|
/path/to/numba.whl \
|
||||||
/path/to/opencv_python_headless.whl \
|
/path/to/opencv_python_headless.whl \
|
||||||
/path/to/hf_xet.whl \
|
/path/to/hf_xet.whl \
|
||||||
|
/path/to/torchcodec.whl \
|
||||||
-r requirements/build/cpu.txt \
|
-r requirements/build/cpu.txt \
|
||||||
-r requirements/cpu.txt \
|
-r requirements/cpu.txt \
|
||||||
--torch-backend cpu \
|
--torch-backend cpu \
|
||||||
@@ -111,6 +113,7 @@ VLLM_TARGET_DEVICE=cpu VLLM_CPU_MOE_PREPACK=0 python setup.py bdist_wheel && \
|
|||||||
/path/to/numba.whl \
|
/path/to/numba.whl \
|
||||||
/path/to/opencv_python_headless.whl \
|
/path/to/opencv_python_headless.whl \
|
||||||
/path/to/hf_xet.whl \
|
/path/to/hf_xet.whl \
|
||||||
|
/path/to/torchcodec.whl \
|
||||||
-r requirements/build/cpu.txt \
|
-r requirements/build/cpu.txt \
|
||||||
-r requirements/cpu.txt && \
|
-r requirements/cpu.txt && \
|
||||||
VLLM_TARGET_DEVICE=cpu VLLM_CPU_MOE_PREPACK=0 python setup.py bdist_wheel && \
|
VLLM_TARGET_DEVICE=cpu VLLM_CPU_MOE_PREPACK=0 python setup.py bdist_wheel && \
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
setuptools==77.0.3 # this version can reuse CMake build dir
|
setuptools==77.0.3 # this version can reuse CMake build dir
|
||||||
|
|
||||||
numba == 0.65.0; platform_machine != "s390x" # Required for N-gram speculative decoding
|
numba == 0.65.0 # Required for N-gram speculative decoding
|
||||||
|
|
||||||
# Dependencies for CPUs
|
# Dependencies for CPUs
|
||||||
torch==2.13.0+cpu; platform_machine == "x86_64" or platform_machine == "s390x" or platform_machine == "aarch64"
|
torch==2.13.0+cpu; platform_machine == "x86_64" or platform_machine == "s390x" or platform_machine == "aarch64"
|
||||||
@@ -13,10 +13,10 @@ torch==2.13.0; platform_system == "Darwin" or platform_machine == "ppc64le" or p
|
|||||||
torchaudio; platform_machine != "s390x" and platform_machine != "riscv64"
|
torchaudio; platform_machine != "s390x" and platform_machine != "riscv64"
|
||||||
|
|
||||||
# required for the image processor of phi3v, this must be updated alongside torch
|
# required for the image processor of phi3v, this must be updated alongside torch
|
||||||
torchvision; platform_machine != "s390x" and platform_machine != "riscv64"
|
torchvision; platform_machine != "riscv64"
|
||||||
|
|
||||||
# required for the torchcodec video decoding backend
|
# required for the torchcodec video decoding backend
|
||||||
torchcodec >= 0.14; platform_machine != "s390x" and platform_machine != "riscv64" and platform_machine != "ppc64le"
|
torchcodec >= 0.14; platform_machine != "riscv64" and platform_machine != "ppc64le"
|
||||||
|
|
||||||
# Intel Extension for PyTorch, only for x86_64 CPUs
|
# Intel Extension for PyTorch, only for x86_64 CPUs
|
||||||
intel-openmp==2024.2.1; platform_machine == "x86_64"
|
intel-openmp==2024.2.1; platform_machine == "x86_64"
|
||||||
|
|||||||
Reference in New Issue
Block a user