Fix builds for OpenCV, PyTorch, and TensorFlow Lite

bytedeco · Jul 9, 2023 · 31ee8a2 · 31ee8a2
1 parent b9d4b08
commit 31ee8a2
Show file tree

Hide file tree

Showing 16 changed files with 149 additions and 1,274 deletions.
diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh
@@ -74,7 +74,7 @@ cd opencv_contrib-$OPENCV_VERSION
 patch -Np1 < ../../../opencv_contrib.patch
 
 cd ../opencv-$OPENCV_VERSION
-patch -Np1 < ../../../opencv.patch || true
+patch -Np1 < ../../../opencv.patch
 #patch -Np1 < ../../../opencv-cudnn8.patch
 patch -Np1 < ../../../opencv-linux-ppc64le.patch
 

diff --git a/opencv/opencv.patch b/opencv/opencv.patch
diff --git a/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java b/pytorch/src/main/java/org/bytedeco/pytorch/presets/torch.java
@@ -3006,15 +3006,15 @@ public void map(InfoMap infoMap) {
                              "std::function<void(Module&)>").pointerTypes("ModuleFunction"))
                .put(new Info("std::function<void(std::vector<c10::IValue>&)>",
                              "std::function<void(std::vector<IValue>&)>").pointerTypes("IValueCallback"))
-               .put(new Info("std::function<bool(std::ostream&,const IValue&v)>").pointerTypes("CustomFormatter"))
-               .put(new Info("std::function<bool(const IValue&)>").pointerTypes("IValueVisitor"))
+               .put(new Info("std::function<bool(std::ostream&,const c10::IValue&)>").pointerTypes("CustomFormatter"))
+               .put(new Info("std::function<bool(const c10::IValue&)>").pointerTypes("IValueVisitor"))
                .put(new Info("std::function<size_t(char*,size_t)>").pointerTypes("Reader"))
                .put(new Info("std::function<at::DataPtr(const std::string&)>").pointerTypes("RecordReader"))
                .put(new Info("std::function<void(const char*data_start,size_tdata_len)>",
                              "std::function<void(const char*,size_t)>").pointerTypes("Writer"))
                .put(new Info("std::function<std::string(const at::Tensor&)>").pointerTypes("TensorIdGetter"))
-               .put(new Info("std::function<c10::QualifiedName(const c10::ClassTypePtr&)>").pointerTypes("TypeRenamer"))
-               .put(new Info("std::function<size_t(uint64_tpos,void*buf,size_tnbytes)>").pointerTypes("ReadFunction"))
+               .put(new Info("std::function<c10::QualifiedName(const std::shared_ptr<c10::ClassType>&)>").pointerTypes("TypeRenamer"))
+               .put(new Info("std::function<size_t(uint64_t,void*,size_t)>").pointerTypes("ReadFunction"))
                .put(new Info("std::function<size_t(const void*,size_t)>").pointerTypes("WriteFunction"))
                .put(new Info("std::function<size_t(void)>").pointerTypes("SizeFunction"))
                .put(new Info("std::function<Tensor()>").pointerTypes("LossClosure"))

diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/AsyncSignatureRunner.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/AsyncSignatureRunner.java
diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/AsyncSignatureRunnerTest.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/AsyncSignatureRunnerTest.java
diff --git a/...n/java/org/bytedeco/tensorflowlite/Async_kernel_TfLiteOpaqueContext_TfLiteOpaqueNode.java b/...n/java/org/bytedeco/tensorflowlite/Async_kernel_TfLiteOpaqueContext_TfLiteOpaqueNode.java
diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/Interpreter.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/Interpreter.java
@@ -549,10 +549,6 @@ public class Interpreter extends Pointer {
    *  part of the graph identified by a SignatureDef. The nullptr is returned if
    *  the given signature key is not valid.
    *  The async delegate should be applied before calling this function. */
-  public native AsyncSignatureRunner GetAsyncSignatureRunner(
-        @Cast("const char*") BytePointer signature_key);
-  public native AsyncSignatureRunner GetAsyncSignatureRunner(
-        String signature_key);
 
   /** \warning Experimental interface, subject to change. \n
    *  \brief Return the subgraph index that corresponds to a SignatureDef,

diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteAsyncKernel.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteAsyncKernel.java
diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteAsyncSignatureRunner.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteAsyncSignatureRunner.java
diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteAttributeMap.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteAttributeMap.java
diff --git a/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteBackendBuffer.java b/tensorflow-lite/src/gen/java/org/bytedeco/tensorflowlite/TfLiteBackendBuffer.java