From 27d7ada8dd17142f3a322c05deab71b1b0b92dfc Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Tue, 4 Feb 2025 10:06:47 +0100 Subject: [PATCH] feat(l4t): add support for extras images Signed-off-by: Ettore Di Giacinto --- Dockerfile | 2 ++ backend/python/autogptq/requirements-l4t.txt | 2 ++ backend/python/bark/requirements-l4t.txt | 5 +++++ backend/python/common/libbackend.sh | 21 ++++++++++++++----- backend/python/coqui/requirements-l4t.txt | 6 ++++++ backend/python/diffusers/requirements-l4t.txt | 10 +++++++++ backend/python/exllama2/requirements-l4t.txt | 4 ++++ .../faster-whisper/requirements-l4t.txt | 9 ++++++++ backend/python/kokoro/requirements-l4t.txt | 3 +++ backend/python/rerankers/requirements-l4t.txt | 5 +++++ .../python/transformers/requirements-l4t.txt | 9 ++++++++ backend/python/vllm/requirements-after.txt | 1 - backend/python/vllm/requirements-cpu.txt | 3 ++- backend/python/vllm/requirements-cublas11.txt | 3 ++- backend/python/vllm/requirements-cublas12.txt | 3 ++- backend/python/vllm/requirements-hipblas.txt | 3 ++- backend/python/vllm/requirements-intel.txt | 3 ++- backend/python/vllm/requirements-l4t.txt | 7 +++++++ 18 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 backend/python/autogptq/requirements-l4t.txt create mode 100644 backend/python/bark/requirements-l4t.txt create mode 100644 backend/python/coqui/requirements-l4t.txt create mode 100644 backend/python/diffusers/requirements-l4t.txt create mode 100644 backend/python/exllama2/requirements-l4t.txt create mode 100644 backend/python/faster-whisper/requirements-l4t.txt create mode 100644 backend/python/kokoro/requirements-l4t.txt create mode 100644 backend/python/rerankers/requirements-l4t.txt create mode 100644 backend/python/transformers/requirements-l4t.txt delete mode 100644 backend/python/vllm/requirements-after.txt create mode 100644 backend/python/vllm/requirements-l4t.txt diff --git a/Dockerfile b/Dockerfile index 2f2bcafa..7a846031 100644 --- a/Dockerfile +++ b/Dockerfile @@ -354,12 +354,14 @@ FROM requirements-drivers ARG FFMPEG ARG BUILD_TYPE +ARG BUILD_PLATFORM ARG TARGETARCH ARG IMAGE_TYPE=extras ARG EXTRA_BACKENDS ARG MAKEFLAGS ENV BUILD_TYPE=${BUILD_TYPE} +ENV BUILD_PLATFORM=${BUILD_PLATFORM} ENV REBUILD=false ENV HEALTHCHECK_ENDPOINT=http://localhost:8080/readyz ENV MAKEFLAGS=${MAKEFLAGS} diff --git a/backend/python/autogptq/requirements-l4t.txt b/backend/python/autogptq/requirements-l4t.txt new file mode 100644 index 00000000..5f51243c --- /dev/null +++ b/backend/python/autogptq/requirements-l4t.txt @@ -0,0 +1,2 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch \ No newline at end of file diff --git a/backend/python/bark/requirements-l4t.txt b/backend/python/bark/requirements-l4t.txt new file mode 100644 index 00000000..7a79c60d --- /dev/null +++ b/backend/python/bark/requirements-l4t.txt @@ -0,0 +1,5 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +torchaudio +transformers +accelerate \ No newline at end of file diff --git a/backend/python/common/libbackend.sh b/backend/python/common/libbackend.sh index 6013cf76..126a0855 100644 --- a/backend/python/common/libbackend.sh +++ b/backend/python/common/libbackend.sh @@ -132,11 +132,16 @@ function installRequirements() { declare -a requirementFiles=( "${EDIR}/requirements-install.txt" "${EDIR}/requirements.txt" - "${EDIR}/requirements-${BUILD_TYPE}.txt" ) - if [ "x${BUILD_TYPE}" != "x${BUILD_PROFILE}" ]; then - requirementFiles+=("${EDIR}/requirements-${BUILD_PROFILE}.txt") + if [ -n "${BUILD_PLATFORM}" ]; then + requirementFiles+=("${EDIR}/requirements-${BUILD_PLATFORM}.txt") + else + requirementFiles+=("${EDIR}/requirements-${BUILD_TYPE}.txt") + + if [ "x${BUILD_TYPE}" != "x${BUILD_PROFILE}" ]; then + requirementFiles+=("${EDIR}/requirements-${BUILD_PROFILE}.txt") + fi fi # if BUILD_TYPE is empty, we are a CPU build, so we should try to install the CPU requirements @@ -146,8 +151,14 @@ function installRequirements() { requirementFiles+=("${EDIR}/requirements-after.txt") - if [ "x${BUILD_TYPE}" != "x${BUILD_PROFILE}" ]; then - requirementFiles+=("${EDIR}/requirements-${BUILD_PROFILE}-after.txt") + if [ -n "${BUILD_PLATFORM}" ]; then + requirementFiles+=("${EDIR}/requirements-${BUILD_PLATFORM}-after.txt") + else + if [ "x${BUILD_TYPE}" != "x${BUILD_PROFILE}" ]; then + requirementFiles+=("${EDIR}/requirements-${BUILD_PROFILE}-after.txt") + else + requirementFiles+=("${EDIR}/requirements-${BUILD_TYPE}-after.txt") + fi fi for reqFile in ${requirementFiles[@]}; do diff --git a/backend/python/coqui/requirements-l4t.txt b/backend/python/coqui/requirements-l4t.txt new file mode 100644 index 00000000..94479d42 --- /dev/null +++ b/backend/python/coqui/requirements-l4t.txt @@ -0,0 +1,6 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +torchaudio +transformers +accelerate +coqui-tts \ No newline at end of file diff --git a/backend/python/diffusers/requirements-l4t.txt b/backend/python/diffusers/requirements-l4t.txt new file mode 100644 index 00000000..d9ce11ed --- /dev/null +++ b/backend/python/diffusers/requirements-l4t.txt @@ -0,0 +1,10 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +diffusers +opencv-python +transformers +accelerate +compel +peft +sentencepiece +optimum-quanto \ No newline at end of file diff --git a/backend/python/exllama2/requirements-l4t.txt b/backend/python/exllama2/requirements-l4t.txt new file mode 100644 index 00000000..83529f7e --- /dev/null +++ b/backend/python/exllama2/requirements-l4t.txt @@ -0,0 +1,4 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +transformers +accelerate \ No newline at end of file diff --git a/backend/python/faster-whisper/requirements-l4t.txt b/backend/python/faster-whisper/requirements-l4t.txt new file mode 100644 index 00000000..bc655001 --- /dev/null +++ b/backend/python/faster-whisper/requirements-l4t.txt @@ -0,0 +1,9 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +faster-whisper +opencv-python +accelerate +compel +peft +sentencepiece +optimum-quanto \ No newline at end of file diff --git a/backend/python/kokoro/requirements-l4t.txt b/backend/python/kokoro/requirements-l4t.txt new file mode 100644 index 00000000..27f343f3 --- /dev/null +++ b/backend/python/kokoro/requirements-l4t.txt @@ -0,0 +1,3 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +transformers \ No newline at end of file diff --git a/backend/python/rerankers/requirements-l4t.txt b/backend/python/rerankers/requirements-l4t.txt new file mode 100644 index 00000000..58e5ec37 --- /dev/null +++ b/backend/python/rerankers/requirements-l4t.txt @@ -0,0 +1,5 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +transformers +accelerate +torch +rerankers[transformers] \ No newline at end of file diff --git a/backend/python/transformers/requirements-l4t.txt b/backend/python/transformers/requirements-l4t.txt new file mode 100644 index 00000000..46aa7a6d --- /dev/null +++ b/backend/python/transformers/requirements-l4t.txt @@ -0,0 +1,9 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +torch +accelerate +llvmlite==0.43.0 +numba==0.60.0 +transformers +bitsandbytes +outetts +sentence-transformers==3.4.1 \ No newline at end of file diff --git a/backend/python/vllm/requirements-after.txt b/backend/python/vllm/requirements-after.txt deleted file mode 100644 index 76f11f15..00000000 --- a/backend/python/vllm/requirements-after.txt +++ /dev/null @@ -1 +0,0 @@ -vllm \ No newline at end of file diff --git a/backend/python/vllm/requirements-cpu.txt b/backend/python/vllm/requirements-cpu.txt index 84058901..90ce3952 100644 --- a/backend/python/vllm/requirements-cpu.txt +++ b/backend/python/vllm/requirements-cpu.txt @@ -1,3 +1,4 @@ accelerate torch==2.4.1 -transformers \ No newline at end of file +transformers +vllm \ No newline at end of file diff --git a/backend/python/vllm/requirements-cublas11.txt b/backend/python/vllm/requirements-cublas11.txt index a6e49c1f..5d7e7641 100644 --- a/backend/python/vllm/requirements-cublas11.txt +++ b/backend/python/vllm/requirements-cublas11.txt @@ -2,4 +2,5 @@ accelerate torch==2.4.1+cu118 transformers -bitsandbytes \ No newline at end of file +bitsandbytes +vllm \ No newline at end of file diff --git a/backend/python/vllm/requirements-cublas12.txt b/backend/python/vllm/requirements-cublas12.txt index 2dfc28f9..a4c1cb39 100644 --- a/backend/python/vllm/requirements-cublas12.txt +++ b/backend/python/vllm/requirements-cublas12.txt @@ -1,4 +1,5 @@ accelerate torch==2.4.1 transformers -bitsandbytes \ No newline at end of file +bitsandbytes +vllm \ No newline at end of file diff --git a/backend/python/vllm/requirements-hipblas.txt b/backend/python/vllm/requirements-hipblas.txt index f580314a..ae20060f 100644 --- a/backend/python/vllm/requirements-hipblas.txt +++ b/backend/python/vllm/requirements-hipblas.txt @@ -2,4 +2,5 @@ accelerate torch==2.4.1+rocm6.0 transformers -bitsandbytes \ No newline at end of file +bitsandbytes +vllm \ No newline at end of file diff --git a/backend/python/vllm/requirements-intel.txt b/backend/python/vllm/requirements-intel.txt index 8955165a..a678cd6e 100644 --- a/backend/python/vllm/requirements-intel.txt +++ b/backend/python/vllm/requirements-intel.txt @@ -6,4 +6,5 @@ transformers optimum[openvino] setuptools bitsandbytes -oneccl_bind_pt==2.3.100+xpu \ No newline at end of file +oneccl_bind_pt==2.3.100+xpu +vllm \ No newline at end of file diff --git a/backend/python/vllm/requirements-l4t.txt b/backend/python/vllm/requirements-l4t.txt new file mode 100644 index 00000000..d7c43c7f --- /dev/null +++ b/backend/python/vllm/requirements-l4t.txt @@ -0,0 +1,7 @@ +--index-url https://pypi.jetson-ai-lab.dev/jp6/cu126/ +accelerate +torch +vllm +transformers +bitsandbytes +flash-attn \ No newline at end of file