Fix presets for PyTorch failing to link with LibTorch on Windows

bytedeco · Dec 23, 2021 · 20f9e68 · 20f9e68
1 parent c96f0a3
commit 20f9e68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh
@@ -136,9 +136,7 @@ sedinplace "s/BUILD_DIR = 'build'/BUILD_DIR = os.environ['BUILD_DIR'] if 'BUILD_
 sedinplace "s/var.startswith(('BUILD_', 'USE_', 'CMAKE_'))/var.startswith(('BUILD_', 'USE_', 'CMAKE_', 'CUDA_'))/g" tools/setup_helpers/cmake.py
 
 # allow resizing std::vector<at::indexing::TensorIndex>
-sedinplace '/TensorIndex(c10::nullopt_t)/i\
-  TensorIndex() : TensorIndex(c10::nullopt) {}\
-' aten/src/ATen/TensorIndexing.h
+sedinplace 's/TensorIndex(c10::nullopt_t)/TensorIndex(c10::nullopt_t none = None)/g' aten/src/ATen/TensorIndexing.h
 
 # add missing declarations
 sedinplace '/^};/a\

diff --git a/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIndex.java b/pytorch/src/gen/java/org/bytedeco/pytorch/TensorIndex.java
@@ -47,12 +47,11 @@ public class TensorIndex extends Pointer {
 
   // Case 1: `at::indexing::None`
   // NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.UninitializedObject)
+  public TensorIndex(@ByVal(nullValue = "c10::nullopt_t(at::indexing::None)") @Cast("c10::nullopt_t*") Pointer none) { super((Pointer)null); allocate(none); }
+  private native void allocate(@ByVal(nullValue = "c10::nullopt_t(at::indexing::None)") @Cast("c10::nullopt_t*") Pointer none);
   public TensorIndex() { super((Pointer)null); allocate(); }
   private native void allocate();
 
-  public TensorIndex(@ByVal @Cast("c10::nullopt_t*") Pointer arg0) { super((Pointer)null); allocate(arg0); }
-  private native void allocate(@ByVal @Cast("c10::nullopt_t*") Pointer arg0);
-
   // Case 2: "..." / `at::indexing::Ellipsis`
   // NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.UninitializedObject)
   public TensorIndex(@ByVal EllipsisIndexType arg0) { super((Pointer)null); allocate(arg0); }