From 2350ff4a5ff0b3f58b839e9d673faeeccff42e9f Mon Sep 17 00:00:00 2001 From: HGuillemet Date: Sun, 26 Nov 2023 14:10:28 +0100 Subject: [PATCH] * Upgrade presets for PyTorch 2.1.1 (pull #1440) --- CHANGELOG.md | 2 +- platform/pom.xml | 2 +- pytorch/README.md | 6 +++--- pytorch/cppbuild.sh | 5 ++++- pytorch/platform/gpu/pom.xml | 2 +- pytorch/platform/pom.xml | 2 +- pytorch/pom.xml | 2 +- pytorch/samples/pom.xml | 4 ++-- pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java | 4 ++-- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6a4e0b523b..1ccd336cac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +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.1, FFmpeg 6.1, HDF5 1.14.3, DNNL 3.3, OpenBLAS 0.3.24, ARPACK-NG 3.9.1, CPython 3.12.0, NumPy 1.26.1, SciPy 1.11.3, LLVM 17.0.4, Leptonica 1.83.1, Tesseract 5.3.3, CUDA 12.3.0, cuDNN 8.9.5, NCCL 2.18.5, PyTorch 2.1.0 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.15.0, ONNX Runtime 1.16.2, TVM 0.14.0, and their dependencies + * Upgrade presets for OpenCV 4.8.1, FFmpeg 6.1, HDF5 1.14.3, DNNL 3.3, OpenBLAS 0.3.24, ARPACK-NG 3.9.1, CPython 3.12.0, NumPy 1.26.1, SciPy 1.11.3, LLVM 17.0.4, Leptonica 1.83.1, Tesseract 5.3.3, CUDA 12.3.0, cuDNN 8.9.5, NCCL 2.18.5, PyTorch 2.1.1 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.14.0, Triton Inference Server 2.38.0, ONNX 1.15.0, ONNX Runtime 1.16.2, TVM 0.14.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/platform/pom.xml b/platform/pom.xml index 19e19b1b199..6b8170c734a 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -292,7 +292,7 @@ org.bytedeco pytorch-platform - 2.1.0-${project.version} + 2.1.1-${project.version} org.bytedeco diff --git a/pytorch/README.md b/pytorch/README.md index ff19dd6eb71..ef7af9f14e2 100644 --- a/pytorch/README.md +++ b/pytorch/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * PyTorch 2.1.0 https://pytorch.org/ + * PyTorch 2.1.1 https://pytorch.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -48,14 +48,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco pytorch-platform - 2.1.0-1.5.10-SNAPSHOT + 2.1.1-1.5.10-SNAPSHOT org.bytedeco pytorch-platform-gpu - 2.1.0-1.5.10-SNAPSHOT + 2.1.1-1.5.10-SNAPSHOT diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh index 8e9d089548b..4ef4ef3cde4 100755 --- a/pytorch/cppbuild.sh +++ b/pytorch/cppbuild.sh @@ -35,7 +35,10 @@ if [[ $PLATFORM == windows* ]]; then export PYTHON_BIN_PATH=$(which python.exe) fi -PYTORCH_VERSION=2.1.0 +PYTORCH_VERSION=2.1.1 + +export PYTORCH_BUILD_VERSION="$PYTORCH_VERSION" +export PYTORCH_BUILD_NUMBER=1 mkdir -p "$PLATFORM$EXTENSION" cd "$PLATFORM$EXTENSION" diff --git a/pytorch/platform/gpu/pom.xml b/pytorch/platform/gpu/pom.xml index d6f24bdfb39..6743c4a989b 100644 --- a/pytorch/platform/gpu/pom.xml +++ b/pytorch/platform/gpu/pom.xml @@ -12,7 +12,7 @@ org.bytedeco pytorch-platform-gpu - 2.1.0-${project.parent.version} + 2.1.1-${project.parent.version} JavaCPP Presets Platform GPU for PyTorch diff --git a/pytorch/platform/pom.xml b/pytorch/platform/pom.xml index 4755c9c317e..f9c13fba158 100644 --- a/pytorch/platform/pom.xml +++ b/pytorch/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco pytorch-platform - 2.1.0-${project.parent.version} + 2.1.1-${project.parent.version} JavaCPP Presets Platform for PyTorch diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 14da0bf4f81..a21da5ad574 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -11,7 +11,7 @@ org.bytedeco pytorch - 2.1.0-${project.parent.version} + 2.1.1-${project.parent.version} JavaCPP Presets for PyTorch diff --git a/pytorch/samples/pom.xml b/pytorch/samples/pom.xml index c4306cfab81..cc995393235 100644 --- a/pytorch/samples/pom.xml +++ b/pytorch/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco pytorch-platform - 2.1.0-1.5.10-SNAPSHOT + 2.1.1-1.5.10-SNAPSHOT org.bytedeco pytorch-platform-gpu - 2.1.0-1.5.10-SNAPSHOT + 2.1.1-1.5.10-SNAPSHOT diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java b/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java index d1d369d7348..69a10faaac4 100644 --- a/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java +++ b/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java @@ -76579,11 +76579,11 @@ scalar_t sf(scalar_t x, scalar_t y) public static final int TORCH_VERSION_MINOR = 1; /** Indicates the patch version of LibTorch. */ -public static final int TORCH_VERSION_PATCH = 0; +public static final int TORCH_VERSION_PATCH = 1; /** Indicates the version of LibTorch. */ public static final String TORCH_VERSION = - "2.1.0"; + "2.1.1"; // Parsed from torch/csrc/autograd/InferenceMode.h