* Upgrade presets for PyTorch 2.2.2 (pull #1489)

bytedeco · Apr 7, 2024 · d45473a · d45473a
1 parent 811d173
commit d45473a
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
  * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481))
  * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472))
  * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475))
- * Upgrade presets for PyTorch 2.2.1 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466))
+ * Upgrade presets for PyTorch 2.2.2 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466))
 
 ### January 29, 2024 version 1.5.10
  * Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463))

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -292,7 +292,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>pytorch-platform</artifactId>
-      <version>2.2.1-${project.version}</version>
+      <version>2.2.2-${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/pytorch/README.md b/pytorch/README.md
@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * PyTorch 2.2.1  https://pytorch.org/
+ * PyTorch 2.2.2  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
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>pytorch-platform</artifactId>
-            <version>2.2.1-1.5.11-SNAPSHOT</version>
+            <version>2.2.2-1.5.11-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies required to use CUDA, cuDNN, and NCCL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>pytorch-platform-gpu</artifactId>
-            <version>2.2.1-1.5.11-SNAPSHOT</version>
+            <version>2.2.2-1.5.11-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA, cuDNN, and NCCL -->

diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh
@@ -35,7 +35,7 @@ if [[ $PLATFORM == windows* ]]; then
     export PYTHON_BIN_PATH=$(which python.exe)
 fi
 
-PYTORCH_VERSION=2.2.1
+PYTORCH_VERSION=2.2.2
 
 export PYTORCH_BUILD_VERSION="$PYTORCH_VERSION"
 export PYTORCH_BUILD_NUMBER=1
@@ -54,7 +54,7 @@ git submodule update --init --recursive
 git submodule foreach --recursive 'git reset --hard'
 
 # Fix version of this submodule to allow compilation on windows.
-# Probably could be removed when we upgrade to next version of PyTorch.
+# Probably could be removed when we upgrade to 2.3
 (cd third_party/pocketfft; git checkout 9d3ab05a7fffbc71a492bc6a17be034e83e8f0fe)
 
 CPYTHON_HOST_PATH="$INSTALL_PATH/../../../cpython/cppbuild/$PLATFORM/host/"

diff --git a/pytorch/platform/gpu/pom.xml b/pytorch/platform/gpu/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>pytorch-platform-gpu</artifactId>
-  <version>2.2.1-${project.parent.version}</version>
+  <version>2.2.2-${project.parent.version}</version>
   <name>JavaCPP Presets Platform GPU for PyTorch</name>
 
   <properties>

diff --git a/pytorch/platform/pom.xml b/pytorch/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>pytorch-platform</artifactId>
-  <version>2.2.1-${project.parent.version}</version>
+  <version>2.2.2-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for PyTorch</name>
 
   <properties>

diff --git a/pytorch/pom.xml b/pytorch/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>pytorch</artifactId>
-  <version>2.2.1-${project.parent.version}</version>
+  <version>2.2.2-${project.parent.version}</version>
   <name>JavaCPP Presets for PyTorch</name>
 
   <dependencies>

diff --git a/pytorch/samples/pom.xml b/pytorch/samples/pom.xml
@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>pytorch-platform</artifactId>
-            <version>2.2.1-1.5.11-SNAPSHOT</version>
+            <version>2.2.2-1.5.11-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies required to use CUDA, cuDNN, and NCCL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>pytorch-platform-gpu</artifactId>
-            <version>2.2.1-1.5.11-SNAPSHOT</version>
+            <version>2.2.2-1.5.11-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled CUDA, cuDNN, and NCCL -->

diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/StrideVaryingShape.java b/pytorch/src/gen/java/org/bytedeco/pytorch/StrideVaryingShape.java
@@ -49,7 +49,7 @@ public class StrideVaryingShape extends Pointer {
 
   public native @Cast("const c10::optional<c10::VaryingShape<c10::Stride>::ListOfOptionalElements>*") @ByRef Pointer sizes();
 
-  public native @ByVal StrideVaryingShape merge(@Const @ByRef StrideVaryingShape other);
+
 
   public native @ByVal StrideVectorOptional concrete_sizes();
 

diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java b/pytorch/src/gen/java/org/bytedeco/pytorch/global/torch.java
@@ -77902,11 +77902,11 @@ scalar_t sf(scalar_t x, scalar_t y)
 public static final int TORCH_VERSION_MINOR = 2;
 
 /** Indicates the patch version of LibTorch. */
-public static final int TORCH_VERSION_PATCH = 1;
+public static final int TORCH_VERSION_PATCH = 2;
 
 /** Indicates the version of LibTorch. */
 public static final String TORCH_VERSION = 
-  "2.2.1";
+  "2.2.2";
 
 
 // Parsed from torch/csrc/autograd/InferenceMode.h

diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java
@@ -61,7 +61,7 @@
             include = {
                 "torch/torch.h",
                 "torch/script.h",
-                // Doesn't compile on Windows. Waiting for 2.2.1.
+                // Doesn't compile on Windows. Waiting for 2.3.
                 //"torch/csrc/inductor/aoti_model_container_runner.h",
 
                 // For inclusion in JNI only, not parsed (compiler needs some complete definitions)
@@ -2510,6 +2510,8 @@ We need either to put an annotation info on each member, or javaName("@NoOffset
 
         infoMap.put(new Info("caffe2::TypeMeta::deleteFn").javaText("public native @NoException(true) PointerConsumer deleteFn();")); // Parser picks up the wrong Delete
 
+        infoMap.put(new Info("c10::VaryingShape<c10::Stride>::merge").skip()); // https://github.com/pytorch/pytorch/issues/123248
+
     }
 
     private static String template(String t, String... args) {

diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch_cuda.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch_cuda.java
@@ -40,7 +40,7 @@
                 "ATen/cudnn/Descriptors.h",
                 "ATen/cudnn/Types.h",
                 "c10/cuda/CUDAGuard.h",
-                // Doesn't compile on Windows. Waiting for 2.2.1
+                // Doesn't compile on Windows. Waiting for 2.3
                 // "torch/csrc/inductor/aoti_model_container_runner_cuda.h",
 
                 // For inclusion in JNI only, not parsed