From f72724bbb59252ef874c44ca2df7b4a5f7289e06 Mon Sep 17 00:00:00 2001
From: Samuel Audet <samuel.audet@gmail.com>
Date: Tue, 3 Aug 2021 17:19:51 +0900
Subject: [PATCH 1/2] Upgrade JavaCPP to just released version 1.5.6

---
 tensorflow-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorflow-core/pom.xml b/tensorflow-core/pom.xml
index d36b91776c0..6f61fc92e83 100644
--- a/tensorflow-core/pom.xml
+++ b/tensorflow-core/pom.xml
@@ -61,7 +61,7 @@
     <javacpp.platform.macosx-x86_64.extension>macosx-x86_64${javacpp.platform.extension}</javacpp.platform.macosx-x86_64.extension>
     <javacpp.platform.windows-x86.extension>windows-x86${javacpp.platform.extension}</javacpp.platform.windows-x86.extension>
     <javacpp.platform.windows-x86_64.extension>windows-x86_64${javacpp.platform.extension}</javacpp.platform.windows-x86_64.extension>
-    <javacpp.version>1.5.4</javacpp.version>
+    <javacpp.version>1.5.6</javacpp.version>
   </properties>
 
   <profiles>

From 682dc139efe48e64d600d373be93ba16fa89cf79 Mon Sep 17 00:00:00 2001
From: Samuel Audet <samuel.audet@gmail.com>
Date: Wed, 4 Aug 2021 11:26:17 +0900
Subject: [PATCH 2/2] Update files generated by JavaCPP

---
 .../c_api/Compute_func_Pointer_TF_OpKernelContext.java        | 2 +-
 .../internal/c_api/Create_func_TF_OpKernelConstruction.java   | 2 +-
 .../internal/c_api/Deallocator_Pointer_long_Pointer.java      | 2 +-
 .../org/tensorflow/internal/c_api/Delete_func_Pointer.java    | 2 +-
 .../org/tensorflow/internal/c_api/Listener_BytePointer.java   | 2 +-
 .../java/org/tensorflow/internal/c_api/Listener_String.java   | 2 +-
 ...ape_inference_func_TF_ShapeInferenceContext_TF_Status.java | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TFE_Context.java   | 2 +-
 .../org/tensorflow/internal/c_api/TFE_ContextOptions.java     | 2 +-
 .../src/gen/java/org/tensorflow/internal/c_api/TFE_Op.java    | 2 +-
 .../org/tensorflow/internal/c_api/TFE_TensorDebugInfo.java    | 2 +-
 .../java/org/tensorflow/internal/c_api/TFE_TensorHandle.java  | 2 +-
 .../org/tensorflow/internal/c_api/TF_AllocatorAttributes.java | 4 ++--
 .../gen/java/org/tensorflow/internal/c_api/TF_ApiDefMap.java  | 2 +-
 .../java/org/tensorflow/internal/c_api/TF_AttrMetadata.java   | 4 ++--
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Buffer.java | 4 ++--
 .../org/tensorflow/internal/c_api/TF_DeprecatedSession.java   | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TF_DeviceList.java | 2 +-
 .../org/tensorflow/internal/c_api/TF_DimensionHandle.java     | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TF_Function.java   | 2 +-
 .../org/tensorflow/internal/c_api/TF_FunctionOptions.java     | 2 +-
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Graph.java  | 2 +-
 .../tensorflow/internal/c_api/TF_ImportGraphDefOptions.java   | 2 +-
 .../tensorflow/internal/c_api/TF_ImportGraphDefResults.java   | 2 +-
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Input.java  | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_KernelBuilder.java  | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TF_Library.java    | 2 +-
 .../org/tensorflow/internal/c_api/TF_OpDefinitionBuilder.java | 2 +-
 .../tensorflow/internal/c_api/TF_OpKernelConstruction.java    | 2 +-
 .../org/tensorflow/internal/c_api/TF_OpKernelContext.java     | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TF_Operation.java  | 2 +-
 .../tensorflow/internal/c_api/TF_OperationDescription.java    | 2 +-
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Output.java | 4 ++--
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Server.java | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TF_Session.java    | 2 +-
 .../java/org/tensorflow/internal/c_api/TF_SessionOptions.java | 2 +-
 .../java/org/tensorflow/internal/c_api/TF_ShapeHandle.java    | 2 +-
 .../tensorflow/internal/c_api/TF_ShapeInferenceContext.java   | 2 +-
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Status.java | 2 +-
 .../gen/java/org/tensorflow/internal/c_api/TF_StringView.java | 4 ++--
 .../gen/java/org/tensorflow/internal/c_api/TF_TString.java    | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_TString_Large.java  | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_TString_Offset.java | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_TString_Raw.java    | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_TString_Small.java  | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_TString_Union.java  | 4 ++--
 .../java/org/tensorflow/internal/c_api/TF_TString_View.java   | 4 ++--
 .../src/gen/java/org/tensorflow/internal/c_api/TF_Tensor.java | 2 +-
 .../java/org/tensorflow/internal/c_api/TF_WhileParams.java    | 2 +-
 .../src/gen/java/org/tensorflow/internal/c_api/Tensor.java    | 2 +-
 .../java/org/tensorflow/internal/c_api/global/tensorflow.java | 2 +-
 51 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Compute_func_Pointer_TF_OpKernelContext.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Compute_func_Pointer_TF_OpKernelContext.java
index fd70471e100..0bb944eed82 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Compute_func_Pointer_TF_OpKernelContext.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Compute_func_Pointer_TF_OpKernelContext.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Create_func_TF_OpKernelConstruction.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Create_func_TF_OpKernelConstruction.java
index 8f951ea6a73..01c6b8b9cd8 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Create_func_TF_OpKernelConstruction.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Create_func_TF_OpKernelConstruction.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Deallocator_Pointer_long_Pointer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Deallocator_Pointer_long_Pointer.java
index 168135a5b14..245b3e2018a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Deallocator_Pointer_long_Pointer.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Deallocator_Pointer_long_Pointer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Delete_func_Pointer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Delete_func_Pointer.java
index 734040f20f4..2e3b079ae0a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Delete_func_Pointer.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Delete_func_Pointer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_BytePointer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_BytePointer.java
index f1775998256..b01b2c229ea 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_BytePointer.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_BytePointer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_String.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_String.java
index a4114f23dbe..2ea782928ac 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_String.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Listener_String.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Shape_inference_func_TF_ShapeInferenceContext_TF_Status.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Shape_inference_func_TF_ShapeInferenceContext_TF_Status.java
index 56e99923a0b..b2168d8a48c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Shape_inference_func_TF_ShapeInferenceContext_TF_Status.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Shape_inference_func_TF_ShapeInferenceContext_TF_Status.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Context.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Context.java
index 886782d2e0b..f3309ed7530 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Context.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Context.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_ContextOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_ContextOptions.java
index 7d986372863..93223d33e0c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_ContextOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_ContextOptions.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Op.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Op.java
index b960617ab40..9c68d0d9920 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Op.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_Op.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorDebugInfo.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorDebugInfo.java
index e42ebf581b8..fcdf2858a91 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorDebugInfo.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorDebugInfo.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorHandle.java
index 00fab08ff54..7fa3f7ec6cb 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TFE_TensorHandle.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AllocatorAttributes.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AllocatorAttributes.java
index 4a7968111e1..4f622e33714 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AllocatorAttributes.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AllocatorAttributes.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -26,7 +26,7 @@ public class TF_AllocatorAttributes extends Pointer {
         return (TF_AllocatorAttributes)super.position(position);
     }
     @Override public TF_AllocatorAttributes getPointer(long i) {
-        return new TF_AllocatorAttributes(this).position(position + i);
+        return new TF_AllocatorAttributes((Pointer)this).offsetAddress(i);
     }
 
   public native @Cast("size_t") long struct_size(); public native TF_AllocatorAttributes struct_size(long setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ApiDefMap.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ApiDefMap.java
index cfe167e125a..8da3d79e7f7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ApiDefMap.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ApiDefMap.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AttrMetadata.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AttrMetadata.java
index 50d82309003..0b83058a276 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AttrMetadata.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_AttrMetadata.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -25,7 +25,7 @@ public class TF_AttrMetadata extends Pointer {
         return (TF_AttrMetadata)super.position(position);
     }
     @Override public TF_AttrMetadata getPointer(long i) {
-        return new TF_AttrMetadata(this).position(position + i);
+        return new TF_AttrMetadata((Pointer)this).offsetAddress(i);
     }
 
   // A boolean: 1 if the attribute value is a list, 0 otherwise.
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Buffer.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Buffer.java
index a3d80f3b50e..a8653a2049f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Buffer.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Buffer.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -32,7 +32,7 @@ public class TF_Buffer extends org.tensorflow.internal.c_api.AbstractTF_Buffer {
         return (TF_Buffer)super.position(position);
     }
     @Override public TF_Buffer getPointer(long i) {
-        return new TF_Buffer(this).position(position + i);
+        return new TF_Buffer((Pointer)this).offsetAddress(i);
     }
 
   public native @Const Pointer data(); public native TF_Buffer data(Pointer data);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeprecatedSession.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeprecatedSession.java
index fdaab8327a9..c2923086177 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeprecatedSession.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeprecatedSession.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeviceList.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeviceList.java
index e56d93340c1..bc86ab8a823 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeviceList.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DeviceList.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DimensionHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DimensionHandle.java
index 2eb78c52b75..e4bb017db8c 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DimensionHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_DimensionHandle.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Function.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Function.java
index 829d1cede3c..29d075cafc1 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Function.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Function.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_FunctionOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_FunctionOptions.java
index 5610e784a6f..fc12f275678 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_FunctionOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_FunctionOptions.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Graph.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Graph.java
index 0a287cd5642..f4521d36625 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Graph.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Graph.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefOptions.java
index 442488d561d..69ccb1f83ff 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefOptions.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefResults.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefResults.java
index ac800f534e1..269a1b07f17 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefResults.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ImportGraphDefResults.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Input.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Input.java
index aa03e503d3a..9e73e8dbf78 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Input.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Input.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -25,7 +25,7 @@ public class TF_Input extends Pointer {
         return (TF_Input)super.position(position);
     }
     @Override public TF_Input getPointer(long i) {
-        return new TF_Input(this).position(position + i);
+        return new TF_Input((Pointer)this).offsetAddress(i);
     }
 
   public native TF_Operation oper(); public native TF_Input oper(TF_Operation setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_KernelBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_KernelBuilder.java
index 796bfa5aefc..e36b7b206bf 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_KernelBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_KernelBuilder.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Library.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Library.java
index 128efd99025..6be7fcbec8d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Library.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Library.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpDefinitionBuilder.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpDefinitionBuilder.java
index ef8a6b7d7f1..9949307e8e9 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpDefinitionBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpDefinitionBuilder.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelConstruction.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelConstruction.java
index 6a984f2a25d..0ee6afaae99 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelConstruction.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelConstruction.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelContext.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelContext.java
index 9c145e89bdf..24c0373404d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelContext.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OpKernelContext.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Operation.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Operation.java
index 0cd1c90ecae..4daad4f8a2a 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Operation.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Operation.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OperationDescription.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OperationDescription.java
index 64a577c28de..490ca238753 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OperationDescription.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_OperationDescription.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Output.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Output.java
index b990302d373..bd36144620d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Output.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Output.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -25,7 +25,7 @@ public class TF_Output extends Pointer {
         return (TF_Output)super.position(position);
     }
     @Override public TF_Output getPointer(long i) {
-        return new TF_Output(this).position(position + i);
+        return new TF_Output((Pointer)this).offsetAddress(i);
     }
 
   public native TF_Operation oper(); public native TF_Output oper(TF_Operation setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Server.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Server.java
index c34d6dd2eab..aceb639f7af 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Server.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Server.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Session.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Session.java
index 10818f6b59f..a034dd7f647 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Session.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Session.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_SessionOptions.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_SessionOptions.java
index c96017ab554..749655f6209 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_SessionOptions.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_SessionOptions.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeHandle.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeHandle.java
index 7fc4dd37276..2721dcac4b6 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeHandle.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeHandle.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeInferenceContext.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeInferenceContext.java
index 4d2bd0c7441..15f0b1dc8b7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeInferenceContext.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_ShapeInferenceContext.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Status.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Status.java
index 0ea4e3415c3..7a70dc56e95 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Status.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Status.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_StringView.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_StringView.java
index 3300f6416b1..85ac4ee877f 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_StringView.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_StringView.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -27,7 +27,7 @@ public class TF_StringView extends Pointer {
         return (TF_StringView)super.position(position);
     }
     @Override public TF_StringView getPointer(long i) {
-        return new TF_StringView(this).position(position + i);
+        return new TF_StringView((Pointer)this).offsetAddress(i);
     }
 
   public native @Cast("const char*") BytePointer data(); public native TF_StringView data(BytePointer setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString.java
index 1952ad9267d..7b4c3ad59a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString extends Pointer {
         return (TF_TString)super.position(position);
     }
     @Override public TF_TString getPointer(long i) {
-        return new TF_TString(this).position(position + i);
+        return new TF_TString((Pointer)this).offsetAddress(i);
     }
   // NOLINT
     // small conflicts with '#define small char' in RpcNdr.h for MSVC, so we use
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Large.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Large.java
index 2edcc0e3808..e9031c07e18 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Large.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Large.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString_Large extends Pointer {
         return (TF_TString_Large)super.position(position);
     }
     @Override public TF_TString_Large getPointer(long i) {
-        return new TF_TString_Large(this).position(position + i);
+        return new TF_TString_Large((Pointer)this).offsetAddress(i);
     }
   // NOLINT
   public native @Cast("size_t") long size(); public native TF_TString_Large size(long setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Offset.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Offset.java
index d46c62ec004..19f06db9224 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Offset.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Offset.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString_Offset extends Pointer {
         return (TF_TString_Offset)super.position(position);
     }
     @Override public TF_TString_Offset getPointer(long i) {
-        return new TF_TString_Offset(this).position(position + i);
+        return new TF_TString_Offset((Pointer)this).offsetAddress(i);
     }
   // NOLINT
   public native @Cast("uint32_t") int size(); public native TF_TString_Offset size(int setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Raw.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Raw.java
index ffe3b6b087a..c9dca734aa0 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Raw.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Raw.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString_Raw extends Pointer {
         return (TF_TString_Raw)super.position(position);
     }
     @Override public TF_TString_Raw getPointer(long i) {
-        return new TF_TString_Raw(this).position(position + i);
+        return new TF_TString_Raw((Pointer)this).offsetAddress(i);
     }
   // NOLINT
   public native @Cast("uint8_t") byte raw(int i); public native TF_TString_Raw raw(int i, byte setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Small.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Small.java
index 7ce9d5f9caf..8efeeb5176d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Small.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Small.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString_Small extends Pointer {
         return (TF_TString_Small)super.position(position);
     }
     @Override public TF_TString_Small getPointer(long i) {
-        return new TF_TString_Small(this).position(position + i);
+        return new TF_TString_Small((Pointer)this).offsetAddress(i);
     }
   // NOLINT
   public native @Cast("uint8_t") byte size(); public native TF_TString_Small size(byte setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Union.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Union.java
index ffa3cfeb5db..d7ba9e1baa4 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Union.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_Union.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString_Union extends Pointer {
         return (TF_TString_Union)super.position(position);
     }
     @Override public TF_TString_Union getPointer(long i) {
-        return new TF_TString_Union(this).position(position + i);
+        return new TF_TString_Union((Pointer)this).offsetAddress(i);
     }
   // NOLINT
   public native @ByRef TF_TString_Large large(); public native TF_TString_Union large(TF_TString_Large setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java
index bec84468a53..b6c3278403d 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_TString_View.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
@@ -24,7 +24,7 @@ public class TF_TString_View extends Pointer {
         return (TF_TString_View)super.position(position);
     }
     @Override public TF_TString_View getPointer(long i) {
-        return new TF_TString_View(this).position(position + i);
+        return new TF_TString_View((Pointer)this).offsetAddress(i);
     }
   // NOLINT
   public native @Cast("size_t") long size(); public native TF_TString_View size(long setter);
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Tensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Tensor.java
index d96c2757dc6..9966d1cbfe3 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Tensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_Tensor.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_WhileParams.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_WhileParams.java
index 4c6dc486d52..1777d9a4d35 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_WhileParams.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/TF_WhileParams.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Tensor.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Tensor.java
index 0a9efa65762..3a4952d5b63 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Tensor.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/Tensor.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java
index b345ab4dad2..ef9f8c7ebc7 100644
--- a/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java
+++ b/tensorflow-core/tensorflow-core-api/src/gen/java/org/tensorflow/internal/c_api/global/tensorflow.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
 
 package org.tensorflow.internal.c_api.global;