Skip to content

Commit

Permalink
* Upgrade presets for HDF5 1.14.1, LLVM 16.0.4, NVIDIA Video Codec S…
Browse files Browse the repository at this point in the history 
…DK 12.1.14, ONNX Runtime 1.15.0
  • Loading branch information
@saudet
saudet committed May 28, 2023
1 parent 7882024 commit da3cbef
Show file tree
Hide file tree
Showing 50 changed files with 1,054 additions and 347 deletions.
4 changes: 2 additions & 2 deletions .github/actions/deploy-centos/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ runs:
if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
echo Installing NVIDIA Video Codec SDK
python3 -m gdown.cli https://drive.google.com/uc?id=1ner_cjzhKhdlrP2VzHGZvyEnW3UQ4uOy
unzip Video_Codec_SDK_12.0.16.zip -d /usr/local
python3 -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
unzip Video_Codec_SDK_12.1.14.zip -d /usr/local
ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
fi
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/deploy-ubuntu/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ runs:
if [[ "$CI_DEPLOY_MODULE" == "nvcodec" ]]; then
echo Installing NVIDIA Video Codec SDK
python3 -m gdown.cli https://drive.google.com/uc?id=1ner_cjzhKhdlrP2VzHGZvyEnW3UQ4uOy
unzip Video_Codec_SDK_12.0.16.zip -d /usr/local
python3 -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
unzip Video_Codec_SDK_12.1.14.zip -d /usr/local
ln -sf /usr/local/Video_Codec_SDK_* /usr/local/videocodecsdk
fi
Expand Down
21 changes: 13 additions & 8 deletions .github/actions/deploy-windows/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,24 @@ runs:
echo Installing CUDA, cuDNN, etc
curl -LO https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_522.06_windows.exe
curl -LO https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_531.14_windows.exe
curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.8.0/local_installers/12.0/cudnn_8.8.0.121_windows.exe
rem curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.8.0/local_installers/12.0/cudnn_8.8.0.121_windows.exe
python -m gdown.cli https://drive.google.com/uc?id=11XXD0D91vd-SnvdlNOMP5C9S_dWyT8Cv
curl -LO http://www.winimage.com/zLibDll/zlib123dllx64.zip
cuda_11.8.0_522.06_windows.exe -s
bash -c "rm -Rf 'C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.8'"
bash -c "mv 'C:/Program Files/NVIDIA Corporation/NvToolsExt' 'C:/Program Files/NVIDIA Corporation/NvToolsExt_old'"
cuda_12.1.1_531.14_windows.exe -s
bash -c "mv 'C:/Program Files/NVIDIA Corporation/NvToolsExt_old' 'C:/Program Files/NVIDIA Corporation/NvToolsExt'"
bash -c "ls 'C:/Program Files/NVIDIA Corporation/NvToolsExt'"
cudnn_8.8.0.121_windows.exe -s
rem cudnn_8.8.0.121_windows.exe -s
unzip cudnn-windows-x86_64-8.9.1.23_cuda12-archive.zip
unzip zlib123dllx64.zip
move "%ProgramFiles%\NVIDIA\CUDNN\v8.8\bin\*.dll" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin"
move "%ProgramFiles%\NVIDIA\CUDNN\v8.8\include\*.h" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\include"
move "%ProgramFiles%\NVIDIA\CUDNN\v8.8\lib\x64\*.lib" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\lib\x64"
rem move "%ProgramFiles%\NVIDIA\CUDNN\v8.8\bin\*.dll" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin"
rem move "%ProgramFiles%\NVIDIA\CUDNN\v8.8\include\*.h" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\include"
rem move "%ProgramFiles%\NVIDIA\CUDNN\v8.8\lib\x64\*.lib" "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\lib\x64"
move cudnn-windows-x86_64-8.9.1.23_cuda12-archive\bin\*.dll "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.0\bin"
move cudnn-windows-x86_64-8.9.1.23_cuda12-archive\include\*.h "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.0\include"
move cudnn-windows-x86_64-8.9.1.23_cuda12-archive\lib\x64\*.lib "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.0\lib\x64"
move dll_x64\zlibwapi.dll "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin"
rem echo Applying hotfix to Visual Studio 2019 for CUDA
Expand All @@ -120,9 +125,9 @@ runs:
if "%CI_DEPLOY_MODULE%"=="nvcodec" (
echo Installing NVIDIA Video Codec SDK
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"
python -m gdown.cli https://drive.google.com/uc?id=13KyYoq8ZOLIA7jugDkdFma34mnyxnz4x
unzip Video_Codec_SDK_12.1.14.zip
move Video_Codec_SDK_12.1.14 "%ProgramFiles%\NVIDIA GPU Computing Toolkit\VideoCodecSDK"
)
if "%CI_DEPLOY_MODULE%"=="tensorrt" (
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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.21.1 ([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.2 ([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)), MKL 2023.1, DNNL 3.1, OpenBLAS 0.3.23, ARPACK-NG 3.9.0, CPython 3.11.3, NumPy 1.24.3, SciPy 1.10.1, LLVM 16.0.3, Leptonica 1.83.0, Tesseract 5.3.1, CUDA 12.1.1, cuDNN 8.9.1, NCCL 2.18.1, OpenCL 3.0.14, NVIDIA Video Codec SDK 12.0.16, PyTorch 2.0.1, TensorFlow Lite 2.12.0, TensorRT 8.6.1.6, Triton Inference Server 2.33.0, DepthAI 2.21.2, ONNX 1.14.0, ONNX Runtime 1.15.0, TVM 0.12.0, 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.1, Hyperscan 5.4.2 ([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)), MKL 2023.1, DNNL 3.1, OpenBLAS 0.3.23, ARPACK-NG 3.9.0, CPython 3.11.3, NumPy 1.24.3, SciPy 1.10.1, LLVM 16.0.4, Leptonica 1.83.0, Tesseract 5.3.1, CUDA 12.1.1, cuDNN 8.9.1, NCCL 2.18.1, OpenCL 3.0.14, NVIDIA Video Codec SDK 12.1.14, PyTorch 2.0.1, TensorFlow Lite 2.12.0, TensorRT 8.6.1.6, Triton Inference Server 2.33.0, DepthAI 2.21.2, ONNX 1.14.0, ONNX Runtime 1.15.0, TVM 0.12.0, 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))
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* CUDA 12.1.x https://developer.nvidia.com/cuda-downloads
* cuDNN 8.9.x https://developer.nvidia.com/cudnn
* NCCL 2.18.x https://developer.nvidia.com/nccl
* NVIDIA Video Codec SDK 12.0.x https://developer.nvidia.com/nvidia-video-codec-sdk
* NVIDIA Video Codec SDK 12.1.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 2.0.x https://github.com/pytorch/pytorch
Expand Down
4 changes: 2 additions & 2 deletions hdf5/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Introduction
------------
This directory contains the JavaCPP Presets module for:

* HDF5 1.14.0 https://support.hdfgroup.org/HDF5/
* HDF5 1.14.1 https://support.hdfgroup.org/HDF5/

Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.

Expand Down Expand Up @@ -48,7 +48,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.14.0-1.5.9-SNAPSHOT</version>
<version>1.14.1-1.5.9-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions hdf5/cppbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ if [[ -z "$PLATFORM" ]]; then
fi

ZLIB=zlib-1.2.13
HDF5_VERSION=1.14.0
HDF5_VERSION=1.14.1-2
AEC_VERSION=1.0.6
download "http://zlib.net/$ZLIB.tar.gz" $ZLIB.tar.gz
download "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-$HDF5_VERSION/src/hdf5-$HDF5_VERSION.tar.bz2" hdf5-$HDF5_VERSION.tar.bz2
download "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.1/src/hdf5-$HDF5_VERSION.tar.bz2" hdf5-$HDF5_VERSION.tar.bz2
# Use Github mirror repo rather than Gitlab repo for download speed
#download "https://gitlab.dkrz.de/k202009/libaec/uploads/45b10e42123edd26ab7b3ad92bcf7be2/libaec-$AEC_VERSION.tar.gz" libaec-$AEC_VERSION.tar.gz
download "https://github.com/MathisRosenhauer/libaec/releases/download/v$AEC_VERSION/libaec-$AEC_VERSION.tar.gz" libaec-$AEC_VERSION.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion hdf5/platform/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.14.0-${project.parent.version}</version>
<version>1.14.1-${project.parent.version}</version>
<name>JavaCPP Presets Platform for HDF5</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion hdf5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>org.bytedeco</groupId>
<artifactId>hdf5</artifactId>
<version>1.14.0-${project.parent.version}</version>
<version>1.14.1-${project.parent.version}</version>
<name>JavaCPP Presets for HDF5</name>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion hdf5/samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>hdf5-platform</artifactId>
<version>1.14.0-1.5.9-SNAPSHOT</version>
<version>1.14.1-1.5.9-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion hdf5/src/gen/java/org/bytedeco/hdf5/H5AC_cache_config_t.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class H5AC_cache_config_t extends Pointer {
/* general configuration fields: */
/** <!-- [H5AC_cache_config_t_general_snip] --> */

/** Integer field indicating the the version of the H5AC_cache_config_t
/** Integer field indicating the version of the H5AC_cache_config_t
* in use. This field should be set to #H5AC__CURR_CACHE_CONFIG_VERSION
* (defined in H5ACpublic.h). */
public native int version(); public native H5AC_cache_config_t version(int setter);
Expand Down
Loading

0 comments on commit da3cbef

Please sign in to comment.