Fix Gradle dependency issues for TRT-LLM release (#2850)

Co-authored-by: Ubuntu <[email protected]>
Co-authored-by: Suma Kasa <[email protected]>

Author: 3 people

.github/workflows/docker-nightly-publish.yml

@@ -130,6 +130,7 @@ jobs:
             export BUILD_VERSION_ARG_DJL="${DJL_VERSION}-SNAPSHOT"
             export BUILD_VERSION_ARG_SERVING="${SERVING_VERSION}-SNAPSHOT"
           else
+            ./gradlew --refresh-dependencies :serving:dockerDeb -Psnapshot
             rm -rf serving/docker/distributions
             export BUILD_VERSION_ARG_DJL="${DJL_VERSION}"
             export BUILD_VERSION_ARG_SERVING="${SERVING_VERSION}"
@@ -173,4 +174,4 @@ jobs:
             instance_id=$(echo $runner_output | jq -r ".[\"$key\"]")
             echo "Key: $key, instance_id: $instance_id"
             ./stop_instance.sh $instance_id
-          done
+          done

.github/workflows/integration.yml

@@ -243,7 +243,7 @@ jobs:
       - name: Test
         working-directory: tests/integration
         env:
-          TEST_DJL_VERSION: ${{ inputs.djl-version }}
+          TEST_DJL_VERSION: '0.33.0'
           IMAGE_TAG_SUFFIX: ${{ inputs.tag-suffix }}
           IMAGE_REPO: ${{ inputs.image-repo }}
         run: |

buildSrc/src/main/kotlin/ai/djl/javaBase.gradle.kts

@@ -14,9 +14,6 @@ val libs = the<LibrariesForLibs>()
 var servingVersion: String? = System.getenv("DJL_VERSION")
 val stagingRepo: String? = System.getenv("DJL_STAGING")
 servingVersion = if (servingVersion == null) libs.versions.serving.get() else servingVersion
-if (!project.hasProperty("staging")) {
-    servingVersion += "-SNAPSHOT"
-}
 
 group = "ai.djl.serving"
 version = servingVersion!!

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-djl = "0.33.0"
+djl = "0.34.0"
 serving = "0.33.0"
 onnxruntime = "1.20.0"
 commonsCli = "1.9.0"

serving/docker/Dockerfile

@@ -71,7 +71,7 @@ COPY scripts scripts/
 RUN scripts/install_python.sh && \
     scripts/install_djl_serving.sh $djl_version $djl_serving_version $torch_version && \
     djl-serving -i ai.djl.pytorch:pytorch-native-cpu:$torch_version:linux-x86_64 && \
-    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:$djl_version && \
+    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:0.33.0 && \
     djl-serving -i com.microsoft.onnxruntime:onnxruntime:$onnx_version && \
     scripts/patch_oss_dlc.sh python && \
     echo "${djl_serving_version} cpufull" > /opt/djl/bin/telemetry && \

serving/docker/lmi.Dockerfile

@@ -17,9 +17,10 @@ ARG djl_serving_version
 ARG python_version=3.12
 ARG djl_torch_version=2.5.1
 ARG djl_onnx_version=1.20.0
+ARG djl_converter_version=0.33.0
 
 # djl converter wheel for text-embedding use case
-ARG djl_converter_wheel="https://publish.djl.ai/djl_converter/djl_converter-${djl_version//-*/}-py3-none-any.whl"
+ARG djl_converter_wheel="https://publish.djl.ai/djl_converter/djl_converter-${djl_converter_version//-*/}-py3-none-any.whl"
 
 EXPOSE 8080
 
@@ -98,7 +99,7 @@ COPY distribution[s]/ ./
 RUN mv *.deb djl-serving_all.deb || true
 
 RUN scripts/install_djl_serving.sh $djl_version $djl_serving_version ${djl_torch_version} \
-    && djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:$djl_version \
+    && djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:0.33.0 \
     && djl-serving -i com.microsoft.onnxruntime:onnxruntime_gpu:$djl_onnx_version
 
 LABEL maintainer="[email protected]"

serving/docker/pytorch-gpu.Dockerfile

@@ -22,7 +22,10 @@ ARG onnx_version=1.20.0
 ARG python_version=3.12
 ARG numpy_version=1.26.4
 ARG pydantic_version=2.8.2
-ARG djl_converter_wheel="https://publish.djl.ai/djl_converter/djl_converter-${djl_version//-*/}-py3-none-any.whl"
+ARG djl_converter_version=0.33.0
+
+# djl converter wheel for text-embedding use case
+ARG djl_converter_wheel="https://publish.djl.ai/djl_converter/djl_converter-${djl_converter_version//-*/}-py3-none-any.whl"
 
 RUN mkdir -p /opt/djl/conf && \
     mkdir -p /opt/ml/model
@@ -58,7 +61,7 @@ SHELL ["/bin/bash", "-c"]
 RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh && \
     scripts/install_djl_serving.sh $djl_version $djl_serving_version && \
     scripts/install_djl_serving.sh $djl_version $djl_serving_version ${torch_version} && \
-    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:$djl_version && \
+    djl-serving -i ai.djl.onnxruntime:onnxruntime-engine:0.33.0 && \
     djl-serving -i com.microsoft.onnxruntime:onnxruntime_gpu:$onnx_version && \
     scripts/install_python.sh ${python_version} && \
     scripts/install_s5cmd.sh x64 && \

serving/docker/scripts/install_djl_serving.sh

@@ -33,6 +33,6 @@ rm djl-serving_all.deb
 
 mkdir -p /opt/djl/plugins
 if [ -n "$PYTORCH_JNI" ]; then
-  djl-serving -i "ai.djl.pytorch:pytorch-jni:${PYTORCH_JNI}-${DJL_VERSION}"
+  djl-serving -i "ai.djl.pytorch:pytorch-jni:${PYTORCH_JNI}-0.33.0"
   rm -rf /opt/djl/logs
 fi