From 4a2444ca357b6f4ff6ec6684645cff06023a1531 Mon Sep 17 00:00:00 2001 From: Katherine Yang Date: Wed, 4 Oct 2023 13:06:12 -0700 Subject: [PATCH 1/6] update true==1 for cppbuild.sh --- tritonserver/cppbuild.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tritonserver/cppbuild.sh b/tritonserver/cppbuild.sh index d4353da8eb2..036553ac7fe 100755 --- a/tritonserver/cppbuild.sh +++ b/tritonserver/cppbuild.sh @@ -7,13 +7,13 @@ if [[ -z "$PLATFORM" ]]; then exit fi -INCLUDE_DEVELOPER_TOOLS_SERVER=${INCLUDE_DEVELOPER_TOOLS_SERVER:=0} +INCLUDE_DEVELOPER_TOOLS_SERVER=${INCLUDE_DEVELOPER_TOOLS_SERVER:=1} -if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrapper.h" ]] && [[ ! -f "/opt/tritonserver/lib/libtritondevelopertoolsserver.so" ]] && [[ ${INCLUDE_DEVELOPER_TOOLS_SERVER} -eq 0 ]]; then +if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrapper.h" ]] && [[ ! -f "/opt/tritonserver/lib/libtritondevelopertoolsserver.so" ]] && [[ ${INCLUDE_DEVELOPER_TOOLS_SERVER} -eq 1 ]]; then TOOLS_BRANCH=${TOOLS_BRANCH:="https://github.com/triton-inference-server/developer_tools.git"} TOOLS_BRANCH_TAG=${TOOLS_BRANCH_TAG:="main"} TRITON_CORE_REPO=${TRITON_CORE_REPO:="https://github.com/triton-inference-server/core.git"} - TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG="r23.05"} + TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG="main"} TRITON_HOME="/opt/tritonserver" BUILD_HOME="$PWD"/tritonbuild mkdir -p ${BUILD_HOME} && cd ${BUILD_HOME} From fb9227bb0e12eeb45a4654512ece2330ff9e09f8 Mon Sep 17 00:00:00 2001 From: Katherine Yang Date: Thu, 5 Oct 2023 09:25:07 -0700 Subject: [PATCH 2/6] address comments --- tritonserver/cppbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tritonserver/cppbuild.sh b/tritonserver/cppbuild.sh index 036553ac7fe..cce34deda12 100755 --- a/tritonserver/cppbuild.sh +++ b/tritonserver/cppbuild.sh @@ -13,7 +13,7 @@ if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrap TOOLS_BRANCH=${TOOLS_BRANCH:="https://github.com/triton-inference-server/developer_tools.git"} TOOLS_BRANCH_TAG=${TOOLS_BRANCH_TAG:="main"} TRITON_CORE_REPO=${TRITON_CORE_REPO:="https://github.com/triton-inference-server/core.git"} - TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG="main"} + TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG="r23.05"} TRITON_HOME="/opt/tritonserver" BUILD_HOME="$PWD"/tritonbuild mkdir -p ${BUILD_HOME} && cd ${BUILD_HOME} From 990d91fee2334cb335c504a5c79b8d5153612a92 Mon Sep 17 00:00:00 2001 From: Katherine Yang Date: Thu, 5 Oct 2023 12:01:25 -0700 Subject: [PATCH 3/6] have true!=0 and false==0 logic --- tritonserver/cppbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tritonserver/cppbuild.sh b/tritonserver/cppbuild.sh index cce34deda12..476975f721a 100755 --- a/tritonserver/cppbuild.sh +++ b/tritonserver/cppbuild.sh @@ -9,7 +9,7 @@ fi INCLUDE_DEVELOPER_TOOLS_SERVER=${INCLUDE_DEVELOPER_TOOLS_SERVER:=1} -if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrapper.h" ]] && [[ ! -f "/opt/tritonserver/lib/libtritondevelopertoolsserver.so" ]] && [[ ${INCLUDE_DEVELOPER_TOOLS_SERVER} -eq 1 ]]; then +if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrapper.h" ]] && [[ ! -f "/opt/tritonserver/lib/libtritondevelopertoolsserver.so" ]] && [[ ${INCLUDE_DEVELOPER_TOOLS_SERVER} -ne 0 ]]; then TOOLS_BRANCH=${TOOLS_BRANCH:="https://github.com/triton-inference-server/developer_tools.git"} TOOLS_BRANCH_TAG=${TOOLS_BRANCH_TAG:="main"} TRITON_CORE_REPO=${TRITON_CORE_REPO:="https://github.com/triton-inference-server/core.git"} From b1a831d045ac97d5499aac82fb66bf428063accd Mon Sep 17 00:00:00 2001 From: Katherine Yang Date: Fri, 6 Oct 2023 10:41:36 -0700 Subject: [PATCH 4/6] try build with 23.09 version of triton --- .github/workflows/tritonserver.yml | 2 +- tritonserver/cppbuild.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tritonserver.yml b/.github/workflows/tritonserver.yml index cfcfcc33b71..347d722faa8 100644 --- a/.github/workflows/tritonserver.yml +++ b/.github/workflows/tritonserver.yml @@ -19,6 +19,6 @@ env: jobs: linux-x86_64: runs-on: ubuntu-20.04 - container: nvcr.io/nvidia/tritonserver:23.05-py3 + container: nvcr.io/nvidia/tritonserver:23.09-py3 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions diff --git a/tritonserver/cppbuild.sh b/tritonserver/cppbuild.sh index 476975f721a..b763b154511 100755 --- a/tritonserver/cppbuild.sh +++ b/tritonserver/cppbuild.sh @@ -11,9 +11,9 @@ INCLUDE_DEVELOPER_TOOLS_SERVER=${INCLUDE_DEVELOPER_TOOLS_SERVER:=1} if [[ ! -f "/opt/tritonserver/include/triton/developer_tools/generic_server_wrapper.h" ]] && [[ ! -f "/opt/tritonserver/lib/libtritondevelopertoolsserver.so" ]] && [[ ${INCLUDE_DEVELOPER_TOOLS_SERVER} -ne 0 ]]; then TOOLS_BRANCH=${TOOLS_BRANCH:="https://github.com/triton-inference-server/developer_tools.git"} - TOOLS_BRANCH_TAG=${TOOLS_BRANCH_TAG:="main"} + TOOLS_BRANCH_TAG=${TOOLS_BRANCH_TAG:="r23.09"} TRITON_CORE_REPO=${TRITON_CORE_REPO:="https://github.com/triton-inference-server/core.git"} - TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG="r23.05"} + TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG="r23.09"} TRITON_HOME="/opt/tritonserver" BUILD_HOME="$PWD"/tritonbuild mkdir -p ${BUILD_HOME} && cd ${BUILD_HOME} From 41b319de14f26efb440f4c024f8ef06e9a8fd0d6 Mon Sep 17 00:00:00 2001 From: Katherine Yang Date: Fri, 6 Oct 2023 13:39:39 -0700 Subject: [PATCH 5/6] update readme and changelong --- CHANGELOG.md | 1 + tritonserver/README.md | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e7a01ee82..ff9b90268e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388)) * Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361)) * Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, TensorFlow Lite 2.14.0, Triton Inference Server 2.34.0, ONNX 1.14.1, ONNX Runtime 1.16.0, TVM 0.13.0, and their dependencies + * Upgrade presets for Triton Inference Server 2.38.0 ### June 6, 2023 version 1.5.9 * Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367)) diff --git a/tritonserver/README.md b/tritonserver/README.md index 4d9b5a44ecf..05322577a01 100644 --- a/tritonserver/README.md +++ b/tritonserver/README.md @@ -23,7 +23,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * Triton Inference Server 2.34.0 https://github.com/triton-inference-server/server + * Triton Inference Server 2.38.0 https://github.com/triton-inference-server/server Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -51,9 +51,9 @@ This sample intends to show how to call the Java-mapped C API of Triton to execu 1. Get the source code of Triton Inference Server to prepare the model repository: ```bash - $ wget https://github.com/triton-inference-server/server/archive/refs/tags/v2.34.0.tar.gz - $ tar zxvf v2.34.0.tar.gz - $ cd server-2.34.0/docs/examples/model_repository + $ wget https://github.com/triton-inference-server/server/archive/refs/tags/v2.38.0.tar.gz + $ tar zxvf v2.38.0.tar.gz + $ cd server-2.38.0/docs/examples/model_repository $ mkdir models $ cd models; cp -a ../simple . ``` From 6c931496bdf42c5a5b46fcf48578b54e2c0e7d91 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sat, 7 Oct 2023 22:32:03 +0900 Subject: [PATCH 6/6] Fix nits --- .github/actions/deploy-ubuntu/action.yml | 2 +- CHANGELOG.md | 3 +-- tritonserver/README.md | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index a4642276bdc..97307bcf597 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -96,7 +96,7 @@ runs: # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776 $SUDO apt-get update $SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH - $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev + $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV diff --git a/CHANGELOG.md b/CHANGELOG.md index ff9b90268e1..ef934aaeabe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,7 @@ * Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360)) * Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388)) * Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361)) - * Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, TensorFlow Lite 2.14.0, Triton Inference Server 2.34.0, ONNX 1.14.1, ONNX Runtime 1.16.0, TVM 0.13.0, and their dependencies - * Upgrade presets for Triton Inference Server 2.38.0 + * Upgrade presets for OpenCV 4.8.0, DNNL 3.2.1, OpenBLAS 0.3.24, CPython 3.11.5, NumPy 1.25.2, SciPy 1.11.2, LLVM 17.0.1, TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.14.1, ONNX Runtime 1.16.0, TVM 0.13.0, and their dependencies ### June 6, 2023 version 1.5.9 * Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367)) diff --git a/tritonserver/README.md b/tritonserver/README.md index 05322577a01..6e5c79c6777 100644 --- a/tritonserver/README.md +++ b/tritonserver/README.md @@ -61,7 +61,7 @@ Now, this `models` directory will be our model repository. 2. Start the Docker container to run the sample (assuming we are under the `models` directory created above): ```bash - $ docker run -it --gpus=all -v $(pwd):/workspace nvcr.io/nvidia/tritonserver:23.05-py3 bash + $ docker run -it --gpus=all -v $(pwd):/workspace nvcr.io/nvidia/tritonserver:23.09-py3 bash $ apt update $ apt install -y openjdk-11-jdk $ wget https://archive.apache.org/dist/maven/maven-3/3.8.4/binaries/apache-maven-3.8.4-bin.tar.gz