* Upgrade presets for NVIDIA Video Codec SDK 12.0.16, TensorRT 8.6.0…

….12, Triton Inference Server 2.32.0
bytedeco · Apr 6, 2023 · 14ab1d6 · 14ab1d6
1 parent 3b6fda4
commit 14ab1d6
Show file tree

Hide file tree

Showing 369 changed files with 5,887 additions and 1,210 deletions.
diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml
@@ -113,15 +113,15 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
           echo Installing NVIDIA Video Codec SDK
-          python3 -m gdown.cli https://drive.google.com/uc?id=1dh3P5JLUUe9EXE0GSJj6VDWYlr7W89dO
-          unzip Video_Codec_SDK_11.1.5.zip -d /usr/local
+          python3 -m gdown.cli https://drive.google.com/uc?id=1ner_cjzhKhdlrP2VzHGZvyEnW3UQ4uOy
+          unzip Video_Codec_SDK_12.0.16.zip -d /usr/local
           ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
         fi
 
         if [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then
           echo Installing TensorRT
-          python3 -m gdown.cli https://drive.google.com/uc?id=1UZLOE_RylYGMC80LzJ7m7iiKrTzYF_Qy
-          tar -hxvf TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-11.6.cudnn8.4.tar.gz -C /usr/local/
+          python3 -m gdown.cli https://drive.google.com/uc?id=10H_HJUHy2c6w8AlrFbxvySFaNwhrmmuj
+          tar -hxvf TensorRT-8.6.0.12.Linux.x86_64-gnu.cuda-12.0.tar.gz -C /usr/local/
           ln -sf /usr/local/TensorRT* /usr/local/tensorrt
         fi
 

diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -146,15 +146,15 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
           echo Installing NVIDIA Video Codec SDK
-          python3 -m gdown.cli https://drive.google.com/uc?id=1dh3P5JLUUe9EXE0GSJj6VDWYlr7W89dO
-          unzip Video_Codec_SDK_11.1.5.zip -d /usr/local
+          python3 -m gdown.cli https://drive.google.com/uc?id=1ner_cjzhKhdlrP2VzHGZvyEnW3UQ4uOy
+          unzip Video_Codec_SDK_12.0.16.zip -d /usr/local
           ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
         fi
 
         if [[ "$CI_DEPLOY_MODULE" == "tensorrt" ]]; then
           echo Installing TensorRT
-          python3 -m gdown.cli https://drive.google.com/uc?id=1uU-O7nF6Bc1lXKVTZfZz3xBTjr6RISHT
-          tar -hxvf TensorRT-8.4.3.1.Ubuntu-20.04.aarch64-gnu.cuda-11.6.cudnn8.4.tar.gz -C /usr/local/
+          python3 -m gdown.cli https://drive.google.com/uc?id=1aWz5V9ZlRWj-vaSIKMRahORPMqILQzKe
+          tar -hxvf TensorRT-8.6.0.12.Ubuntu-20.04.aarch64-gnu.cuda-12.0.tar.gz -C /usr/local/
           ln -sf /usr/local/TensorRT* /usr/local/tensorrt
         fi
 

diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
@@ -114,16 +114,16 @@ runs:
 
         if "%CI_DEPLOY_MODULE%"=="nvcodec" (
           echo Installing NVIDIA Video Codec SDK
-          python -m gdown.cli https://drive.google.com/uc?id=1dh3P5JLUUe9EXE0GSJj6VDWYlr7W89dO
-          unzip Video_Codec_SDK_11.1.5.zip
-          move Video_Codec_SDK_11.1.5 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK"
+          python -m gdown.cli https://drive.google.com/uc?id=1ner_cjzhKhdlrP2VzHGZvyEnW3UQ4uOy
+          unzip Video_Codec_SDK_12.0.16.zip
+          move Video_Codec_SDK_12.0.16 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK"
         )
 
         if "%CI_DEPLOY_MODULE%"=="tensorrt" (
           echo Installing TensorRT
-          python -m gdown.cli https://drive.google.com/uc?id=1mOqxIW-mzGNnnIiZx2DEPLdvFgmM2vT7
-          unzip TensorRT-8.4.3.1.Windows10.x86_64.cuda-11.6.cudnn8.4.zip
-          move TensorRT-8.4.3.1 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\TensorRT"
+          python -m gdown.cli https://drive.google.com/uc?id=1MTNEhrOC2rTT1itn_Z-SUK_Ck_XRxLbR
+          unzip TensorRT-8.6.0.12.Windows10.x86_64.cuda-12.0.zip
+          move TensorRT-8.6.0.12 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\TensorRT"
         )
 
         if "%CI_DEPLOY_MODULE%"=="mkl" (

diff --git 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:22.09-py3
+    container: nvcr.io/nvidia/tritonserver:23.03-py3
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,7 +19,7 @@
  * Map `c10::impl::GenericDict` as returned by `c10::IValue::toGenericDict()` in presets for PyTorch
  * Introduce `linux-armhf` and `linux-x86` builds to presets for TensorFlow Lite ([pull #1268](https://github.com/bytedeco/javacpp-presets/pull/1268))
  * Add presets for LibRaw 0.20.2 ([pull #1211](https://github.com/bytedeco/javacpp-presets/pull/1211))
- * Upgrade presets for OpenCV 4.7.0, FFmpeg 6.0 ([issue bytedeco/javacv#1693](https://github.com/bytedeco/javacv/issues/1693)), HDF5 1.14.0, Hyperscan 5.4.1 ([issue #1308](https://github.com/bytedeco/javacpp-presets/issues/1308)), Spinnaker 3.0.0.118 ([pull #1313](https://github.com/bytedeco/javacpp-presets/pull/1313)), librealsense2 2.53.1 ([pull #1305](https://github.com/bytedeco/javacpp-presets/pull/1305)), DNNL 2.7.3, OpenBLAS 0.3.23, ARPACK-NG 3.9.0, CPython 3.11.2, NumPy 1.24.2, SciPy 1.10.1, LLVM 16.0.0, Leptonica 1.83.0, Tesseract 5.3.1, CUDA 12.0.0, cuDNN 8.7.0, NCCL 2.16.2, PyTorch 1.13.1, TensorFlow Lite 2.12.0, DepthAI 2.19.1, ONNX Runtime 1.14.1, TVM 0.11.1, Bullet Physics SDK 3.25, and their dependencies
+ * Upgrade presets for OpenCV 4.7.0, FFmpeg 6.0 ([issue bytedeco/javacv#1693](https://github.com/bytedeco/javacv/issues/1693)), HDF5 1.14.0, Hyperscan 5.4.1 ([issue #1308](https://github.com/bytedeco/javacpp-presets/issues/1308)), Spinnaker 3.0.0.118 ([pull #1313](https://github.com/bytedeco/javacpp-presets/pull/1313)), librealsense2 2.53.1 ([pull #1305](https://github.com/bytedeco/javacpp-presets/pull/1305)), DNNL 2.7.3, OpenBLAS 0.3.23, ARPACK-NG 3.9.0, CPython 3.11.2, NumPy 1.24.2, SciPy 1.10.1, LLVM 16.0.0, Leptonica 1.83.0, Tesseract 5.3.1, CUDA 12.0.0, cuDNN 8.7.0, NCCL 2.16.2, NVIDIA Video Codec SDK 12.0.16, PyTorch 1.13.1, TensorFlow Lite 2.12.0, TensorRT 8.6.0.12, Triton Inference Server 2.32.0, DepthAI 2.19.1, ONNX Runtime 1.14.1, TVM 0.11.1, Bullet Physics SDK 3.25, and their dependencies
 
 ### November 2, 2022 version 1.5.8
  * Fix mapping of `torch::ExpandingArrayWithOptionalElem` in presets for PyTorch ([issue #1250](https://github.com/bytedeco/javacpp-presets/issues/1250))

diff --git a/README.md b/README.md
@@ -218,14 +218,14 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * CUDA 12.0.x  https://developer.nvidia.com/cuda-downloads
    * cuDNN 8.7.x  https://developer.nvidia.com/cudnn
    * NCCL 2.16.x  https://developer.nvidia.com/nccl
- * NVIDIA Video Codec SDK 11.1.x  https://developer.nvidia.com/nvidia-video-codec-sdk
+ * NVIDIA Video Codec SDK 12.0.x  https://developer.nvidia.com/nvidia-video-codec-sdk
  * OpenCL 3.0.x  https://github.com/KhronosGroup/OpenCL-ICD-Loader
  * MXNet 1.9.x  https://github.com/apache/incubator-mxnet
  * PyTorch 1.13.x  https://github.com/pytorch/pytorch
  * TensorFlow 1.15.x  https://github.com/tensorflow/tensorflow
  * TensorFlow Lite 2.12.x  https://github.com/tensorflow/tensorflow
  * TensorRT 8.x  https://developer.nvidia.com/tensorrt
- * Triton Inference Server 2.24.x  https://developer.nvidia.com/nvidia-triton-inference-server
+ * Triton Inference Server 2.32.x  https://developer.nvidia.com/nvidia-triton-inference-server
  * The Arcade Learning Environment 0.8.x  https://github.com/mgbellemare/Arcade-Learning-Environment
  * DepthAI 2.19.x  https://github.com/luxonis/depthai-core
  * ONNX 1.12.x  https://github.com/onnx/onnx

diff --git a/nvcodec/README.md b/nvcodec/README.md
@@ -17,7 +17,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * NVIDIA Video Codec SDK 11.1.5  https://developer.nvidia.com/nvidia-video-codec-sdk
+ * NVIDIA Video Codec SDK 12.0.16  https://developer.nvidia.com/nvidia-video-codec-sdk
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -31,7 +31,7 @@ Java API documentation is available here:
 
 Sample Usage
 ------------
-Here is a simple example ported to Java from C code based on `Samples/AppEncode/AppEncCuda` and `Samples/AppDecode/AppDec` included in `Video_Codec_SDK_11.1.5.zip` available at:
+Here is a simple example ported to Java from C code based on `Samples/AppEncode/AppEncCuda` and `Samples/AppDecode/AppDec` included in `Video_Codec_SDK_12.0.16.zip` available at:
 
  * https://developer.nvidia.com/nvidia-video-codec-sdk/download
 
@@ -47,22 +47,22 @@ You can find more encoder and decoder samples in the [`samples`](samples) subdir
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.nvcodec</groupId>
     <artifactId>sampleencodedecode</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
     <properties>
         <exec.mainClass>SampleEncodeDecode</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>nvcodec-platform</artifactId>
-            <version>11.1.5-1.5.8</version>
+            <version>12.0.16-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda-platform-redist</artifactId>
-            <version>11.8-8.6-1.5.8</version>
+            <version>12.0-8.7-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/nvcodec/platform/pom.xml b/nvcodec/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>nvcodec-platform</artifactId>
-  <version>11.1.5-${project.parent.version}</version>
+  <version>12.0.16-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for NVIDIA Video Codec SDK</name>
 
   <properties>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>cuda-platform</artifactId>
-      <version>11.8-8.6-${project.parent.version}</version>
+      <version>12.0-8.7-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/nvcodec/pom.xml b/nvcodec/pom.xml
@@ -11,14 +11,14 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>nvcodec</artifactId>
-  <version>11.1.5-${project.parent.version}</version>
+  <version>12.0.16-${project.parent.version}</version>
   <name>JavaCPP Presets for NVIDIA Video Codec SDK</name>
 
   <dependencies>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>cuda</artifactId>
-      <version>11.8-8.6-${project.parent.version}</version>
+      <version>12.0-8.7-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -44,7 +44,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda</artifactId>
-            <version>11.8-8.6-${project.parent.version}</version>
+            <version>12.0-8.7-${project.parent.version}</version>
           </dependency>
         </dependencies>
         <executions>

diff --git a/nvcodec/samples/pom.xml b/nvcodec/samples/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.nvcodec</groupId>
     <artifactId>samplenvcodec</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -16,14 +16,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>nvcodec-platform</artifactId>
-            <version>11.1.5-1.5.8</version>
+            <version>12.0.16-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda-platform-redist</artifactId>
-            <version>11.8-8.6-1.5.8</version>
+            <version>12.0-8.7-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nvcodec/samples/simple/pom.xml b/nvcodec/samples/simple/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.nvcodec</groupId>
     <artifactId>sampleencodedecode</artifactId>
-    <version>1.5.8</version>
+    <version>1.5.9-SNAPSHOT</version>
     <properties>
         <exec.mainClass>SampleEncodeDecode</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>nvcodec-platform</artifactId>
-            <version>11.1.5-1.5.8</version>
+            <version>12.0.16-1.5.9-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda-platform-redist</artifactId>
-            <version>11.8-8.6-1.5.8</version>
+            <version>12.0-8.7-1.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/nvcodec/src/gen/java/org/bytedeco/nvcodec/global/nvcuvid.java b/nvcodec/src/gen/java/org/bytedeco/nvcodec/global/nvcuvid.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.nvcodec.global;
 
@@ -20,7 +20,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /*
  * This copyright notice applies to this header file only:
  *
- * Copyright (c) 2010-2021 NVIDIA Corporation
+ * Copyright (c) 2010-2022 NVIDIA Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -339,7 +339,6 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 // #if !defined(__CUVID_DEVPTR64) || defined(__CUVID_INTERNAL)
 // #endif
 
-// #if defined(_WIN64) || defined(__LP64__) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
 /****************************************************************************************************************************/
 /** \fn CUresult CUDAAPI cuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr, 
 /**                                           unsigned int * pPitch, CUVIDPROCPARAMS *pVPP);
@@ -364,7 +363,6 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 
 // #if defined(__CUVID_DEVPTR64) && !defined(__CUVID_INTERNAL)
 // #endif
-// #endif
 
 
 
@@ -426,7 +424,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /*
  * This copyright notice applies to this header file only:
  *
- * Copyright (c) 2010-2021 NVIDIA Corporation
+ * Copyright (c) 2010-2022 NVIDIA Corporation
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
@@ -453,7 +451,7 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 /********************************************************************************************************************/
 /** \file nvcuvid.h
 /**   NVDECODE API provides video decoding interface to NVIDIA GPU devices.
-/** \date 2015-2020
+/** \date 2015-2022
 /**  This file contains the interface constants, structure definitions and function prototypes.
 /********************************************************************************************************************/
 
@@ -463,6 +461,12 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 // #include "cuviddec.h"
 
 // #if defined(__cplusplus)
+// #endif /* __cplusplus */
+
+
+//!
+//!
+public static final int MAX_CLOCK_TS = 3;
 // Targeting ../nvcuvid/CUvideosource.java
 
 
@@ -504,12 +508,24 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
     cudaAudioCodec_LPCM = 4,
     /** AAC Audio                  */
     cudaAudioCodec_AAC = 5;
+// Targeting ../nvcuvid/HEVCTIMECODESET.java
+
+
+// Targeting ../nvcuvid/HEVCSEITIMECODE.java
+
+
+// Targeting ../nvcuvid/CUSEIMESSAGE.java
+
+
 // Targeting ../nvcuvid/CUVIDEOFORMAT.java
 
 
 // Targeting ../nvcuvid/CUVIDOPERATINGPOINTINFO.java
 
 
+// Targeting ../nvcuvid/CUVIDSEIMESSAGEINFO.java
+
+
 // Targeting ../nvcuvid/CUVIDAV1SEQHDR.java
 
 
@@ -640,6 +656,9 @@ public class nvcuvid extends org.bytedeco.nvcodec.presets.nvcuvid {
 // Targeting ../nvcuvid/PFNVIDOPPOINTCALLBACK.java
 
 
+// Targeting ../nvcuvid/PFNVIDSEIMSGCALLBACK.java
+
+
 // Targeting ../nvcuvid/CUVIDPARSERPARAMS.java