* Upgrade presets for OpenBLAS 0.3.15, DNNL 2.2.2, CPython 3.9.5, Nu…

…mPy 1.20.3, SciPy 1.6.3, cuDNN 8.2.0
dyastremsky · May 11, 2021 · fc40ada · fc40ada
1 parent 7db6eb8
commit fc40ada
Show file tree

Hide file tree

Showing 880 changed files with 1,216 additions and 1,158 deletions.
diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml
@@ -63,14 +63,14 @@ runs:
         if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then
           echo Installing CUDA, cuDNN, etc
           curl -LO https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda-repo-rhel7-11-3-local-11.3.0_465.19.01-1.x86_64.rpm
-          curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz
+          curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.0/cudnn-11.3-linux-x64-v8.2.0.53.tgz
           curl -LO https://developer.download.nvidia.com/compute/redist/nccl/v2.9/nccl_2.9.6-1+cuda11.3_x86_64.txz
 
           rpm -i --force --ignorearch --nodeps cuda-repo-rhel7-11-3-local-11.3.0_465.19.01-1.x86_64.rpm
           pushd /var/cuda-repo-rhel7-11-3-local/; rpm -i --force --ignorearch --nodeps cuda*.rpm libc*.rpm libn*.rpm; rm *.rpm; popd
           ln -sf /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/libcuda.so
           ln -sf /usr/local/cuda/lib64/stubs/libnvidia-ml.so /usr/local/cuda/lib64/libnvidia-ml.so
-          tar -hxvf cudnn-11.2-linux-x64-v8.1.1.33.tgz -C /usr/local/
+          tar -hxvf cudnn-11.3-linux-x64-v8.2.0.53.tgz -C /usr/local/
           tar -hxvf nccl_2.9.6-1+cuda11.3_x86_64.txz --strip-components=1 -C /usr/local/cuda/
           mv /usr/local/cuda/lib/* /usr/local/cuda/lib64/
 

diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml
@@ -26,12 +26,12 @@ runs:
           sudo install_name_tool -add_rpath /usr/local/lib/gcc/7/ -add_rpath @loader_path/. -id @rpath/libgfortran.4.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib
           sudo install_name_tool -add_rpath /usr/local/lib/gcc/7/ -add_rpath @loader_path/. -id @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libquadmath.0.dylib
           sudo install_name_tool -add_rpath /usr/local/lib/gcc/7/ -add_rpath @loader_path/. -id @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libgcc_s.1.dylib
-          sudo install_name_tool -change /usr/local/Cellar/gcc@7/7.5.0_2/lib/gcc/7/libquadmath.0.dylib @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib
-          sudo install_name_tool -change /usr/local/Cellar/gcc@7/7.5.0_3/lib/gcc/7/libquadmath.0.dylib @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib
+          sudo install_name_tool -change $(otool -L /usr/local/lib/gcc/7/libgfortran.4.dylib | grep /usr/local/Cellar/gcc@7/ | cut -f1 -d ' ') @rpath/libquadmath.0.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib
           sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libgomp.1.dylib
           sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libstdc++.6.dylib
           sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libgfortran.4.dylib
           sudo install_name_tool -change /usr/local/lib/gcc/7/libgcc_s.1.dylib @rpath/libgcc_s.1.dylib /usr/local/lib/gcc/7/libquadmath.0.dylib
+          otool -L /usr/local/lib/gcc/7/*.dylib
         fi
 
         sudo install_name_tool -add_rpath @loader_path/. -id @rpath/libomp.dylib /usr/local/opt/libomp/lib/libomp.dylib

diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -14,13 +14,13 @@ runs:
           export ARCH=arm64
           export PREFIX=aarch64-linux-gnu
           export CUDA=cuda-repo-rhel8-11-3-local-11.3.0_465.19.01-1.aarch64.rpm
-          export CUDNN=cudnn-11.2-linux-aarch64sbsa-v8.1.1.33.tgz
+          export CUDNN=cudnn-11.3-linux-aarch64sbsa-v8.2.0.53.tgz
           export NCCL=nccl_2.9.6-1+cuda11.3_aarch64.txz
         elif [[ "$CI_DEPLOY_PLATFORM" == "linux-ppc64le" ]]; then
           export ARCH=ppc64el
           export PREFIX=powerpc64le-linux-gnu
           export CUDA=cuda-repo-rhel8-11-3-local-11.3.0_465.19.01-1.ppc64le.rpm
-          export CUDNN=cudnn-11.2-linux-ppc64le-v8.1.1.33.tgz
+          export CUDNN=cudnn-11.3-linux-ppc64le-v8.2.0.53.tgz
           export NCCL=nccl_2.9.6-1+cuda11.3_ppc64le.txz
         fi
         echo "ARCH=$ARCH" >> $GITHUB_ENV
@@ -85,7 +85,7 @@ runs:
         if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] || [[ "$CI_DEPLOY_PLATFORM" == "linux-ppc64le" ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then
           echo Installing CUDA, cuDNN, etc
           curl -LO https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/$CUDA
-          curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/$CUDNN
+          curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.0/$CUDNN
           curl -LO https://developer.download.nvidia.com/compute/redist/nccl/v2.9/$NCCL
 
           rpm -i --force --ignorearch --nodeps $CUDA

diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
@@ -69,9 +69,9 @@ runs:
         if "%CI_DEPLOY_PLATFORM%"=="windows-x86_64" if not "%CI_DEPLOY_NEED_CUDA%"=="" (
           echo Installing CUDA, cuDNN, etc
           curl -LO https://developer.download.nvidia.com/compute/cuda/11.3.0/local_installers/cuda_11.3.0_465.89_win10.exe
-          curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-windows-x64-v8.1.1.33.zip
+          curl -LO https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.0/cudnn-11.3-windows-x64-v8.2.0.53.zip
           cuda_11.3.0_465.89_win10.exe -s
-          unzip cudnn-11.2-windows-x64-v8.1.1.33.zip
+          unzip cudnn-11.3-windows-x64-v8.2.0.53.zip
           move cuda\bin\*.dll "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v11.3\bin"
           move cuda\include\*.h "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v11.3\include"
           move cuda\lib\x64\*.lib "%ProgramFiles%\NVIDIA GPU Computing Toolkit\CUDA\v11.3\lib\x64"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@
  * Map `std::vector<cv::Range>` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607))
  * Include `genericaliasobject.h`, `context.h`, `tracemalloc.h`, and `datetime.h` for CPython ([issue #1017](https://github.com/bytedeco/javacpp-presets/issues/1017))
  * Add samples using LLVM modules to deal with bitcode and object files ([pull #1016](https://github.com/bytedeco/javacpp-presets/pull/1016))
- * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Spinnaker 2.4.0.143 ([pull #1040](https://github.com/bytedeco/javacpp-presets/pull/1040)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), Arrow 4.0.0, MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2.1, CPython 3.9.4, NumPy 1.20.2, SciPy 1.6.2, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, NCCL 2.9.6, ONNX 1.9.0
+ * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Spinnaker 2.4.0.143 ([pull #1040](https://github.com/bytedeco/javacpp-presets/pull/1040)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), Arrow 4.0.0, MKL 2021.2, OpenBLAS 0.3.15, DNNL 2.2.2, CPython 3.9.5, NumPy 1.20.3, SciPy 1.6.3, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, cuDNN 8.2.0, NCCL 2.9.6, ONNX 1.9.0
 
 ### March 8, 2021 version 1.5.5
  * Bundle LLD executable in presets for LLVM as required by TVM on Windows

diff --git a/README.md b/README.md
@@ -185,7 +185,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * MKL 2021.x  https://software.intel.com/mkl
  * MKL-DNN 0.21.x  https://github.com/oneapi-src/oneDNN
  * DNNL 2.2.x  https://github.com/oneapi-src/oneDNN
- * OpenBLAS 0.3.14  http://www.openblas.net/
+ * OpenBLAS 0.3.15  http://www.openblas.net/
  * ARPACK-NG 3.8.0  https://github.com/opencollab/arpack-ng
  * CMINPACK 1.3.8  https://github.com/devernay/cminpack
  * FFTW 3.3.9  http://www.fftw.org/download.html
@@ -201,7 +201,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * Caffe 1.0  https://github.com/BVLC/caffe
  * OpenPose 1.7.0  https://github.com/CMU-Perceptual-Computing-Lab/openpose
  * CUDA 11.3.x  https://developer.nvidia.com/cuda-downloads
-   * cuDNN 8.1.x  https://developer.nvidia.com/cudnn
+   * cuDNN 8.2.x  https://developer.nvidia.com/cudnn
    * NCCL 2.9.x  https://developer.nvidia.com/nccl
  * NVIDIA Video Codec SDK 11.0.x  https://developer.nvidia.com/nvidia-video-codec-sdk
  * OpenCL 3.0  https://github.com/KhronosGroup/OpenCL-ICD-Loader

diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -45,12 +45,12 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/caffe/README.md b/caffe/README.md
@@ -60,7 +60,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda-platform-redist</artifactId>
-            <version>11.3-8.1-1.5.6-SNAPSHOT</version>
+            <version>11.3-8.2-1.5.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

diff --git a/caffe/platform/gpu/pom.xml b/caffe/platform/gpu/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -61,7 +61,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -78,7 +78,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/caffe/samples/pom.xml b/caffe/samples/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cuda-platform-redist</artifactId>
-            <version>11.3-8.1-1.5.6-SNAPSHOT</version>
+            <version>11.3-8.2-1.5.6-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

diff --git a/chilitags/pom.xml b/chilitags/pom.xml
@@ -41,7 +41,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -51,7 +51,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
           <dependency>

diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/cminpack/pom.xml b/cminpack/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.14-${project.parent.version}</version>
+      <version>0.3.15-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -41,12 +41,12 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.14-${project.parent.version}</version>
+            <version>0.3.15-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/cpython/README.md b/cpython/README.md
@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.9.4  https://www.python.org/
+ * CPython 3.9.5  https://www.python.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -54,7 +54,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.9.4-1.5.6-SNAPSHOT</version>
+            <version>3.9.5-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/cpython/cppbuild.sh b/cpython/cppbuild.sh
@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 OPENSSL=openssl-1.1.1k
-CPYTHON_VERSION=3.9.4
+CPYTHON_VERSION=3.9.5
 download https://www.openssl.org/source/$OPENSSL.tar.gz $OPENSSL.tar.gz
 download https://www.python.org/ftp/python/$CPYTHON_VERSION/Python-$CPYTHON_VERSION.tgz Python-$CPYTHON_VERSION.tgz
 

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

diff --git a/cpython/pom.xml b/cpython/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpython</artifactId>
-  <version>3.9.4-${project.parent.version}</version>
+  <version>3.9.5-${project.parent.version}</version>
   <name>JavaCPP Presets for CPython</name>
 
   <dependencies>

diff --git a/cpython/samples/pom.xml b/cpython/samples/pom.xml
@@ -12,10 +12,10 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpython-platform</artifactId>
-            <version>3.9.4-1.5.6-SNAPSHOT</version>
+            <version>3.9.5-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>.</sourceDirectory>
+        <sourceDirectory>${basedir}</sourceDirectory>
     </build>
 </project>
diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyASCIIObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyASCIIObject.java
@@ -32,7 +32,7 @@ public class PyASCIIObject extends Pointer {
         return (PyASCIIObject)super.position(position);
     }
     @Override public PyASCIIObject getPointer(long i) {
-        return new PyASCIIObject((Pointer)this).position(position + i);
+        return new PyASCIIObject((Pointer)this).offsetAddress(i);
     }
 
     /* There are 4 forms of Unicode strings:

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyAddrPair.java b/cpython/src/gen/java/org/bytedeco/cpython/PyAddrPair.java
@@ -27,7 +27,7 @@ public class PyAddrPair extends Pointer {
         return (PyAddrPair)super.position(position);
     }
     @Override public PyAddrPair getPointer(long i) {
-        return new PyAddrPair((Pointer)this).position(position + i);
+        return new PyAddrPair((Pointer)this).offsetAddress(i);
     }
 
         public native int ap_lower(); public native PyAddrPair ap_lower(int setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncGenObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncGenObject.java
@@ -28,7 +28,7 @@ public class PyAsyncGenObject extends Pointer {
         return (PyAsyncGenObject)super.position(position);
     }
     @Override public PyAsyncGenObject getPointer(long i) {
-        return new PyAsyncGenObject((Pointer)this).position(position + i);
+        return new PyAsyncGenObject((Pointer)this).offsetAddress(i);
     }
 
     public native @ByRef PyObject ob_base(); public native PyAsyncGenObject ob_base(PyObject setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncMethods.java b/cpython/src/gen/java/org/bytedeco/cpython/PyAsyncMethods.java
@@ -26,7 +26,7 @@ public class PyAsyncMethods extends Pointer {
         return (PyAsyncMethods)super.position(position);
     }
     @Override public PyAsyncMethods getPointer(long i) {
-        return new PyAsyncMethods((Pointer)this).position(position + i);
+        return new PyAsyncMethods((Pointer)this).offsetAddress(i);
     }
 
     public native unaryfunc am_await(); public native PyAsyncMethods am_await(unaryfunc setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyBaseExceptionObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyBaseExceptionObject.java
@@ -26,7 +26,7 @@ public class PyBaseExceptionObject extends Pointer {
         return (PyBaseExceptionObject)super.position(position);
     }
     @Override public PyBaseExceptionObject getPointer(long i) {
-        return new PyBaseExceptionObject((Pointer)this).position(position + i);
+        return new PyBaseExceptionObject((Pointer)this).offsetAddress(i);
     }
 
     public native @ByRef PyObject ob_base(); public native PyBaseExceptionObject ob_base(PyObject setter); public native PyObject dict(); public native PyBaseExceptionObject dict(PyObject setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyBufferProcs.java b/cpython/src/gen/java/org/bytedeco/cpython/PyBufferProcs.java
@@ -26,7 +26,7 @@ public class PyBufferProcs extends Pointer {
         return (PyBufferProcs)super.position(position);
     }
     @Override public PyBufferProcs getPointer(long i) {
-        return new PyBufferProcs((Pointer)this).position(position + i);
+        return new PyBufferProcs((Pointer)this).offsetAddress(i);
     }
 
      public native getbufferproc bf_getbuffer(); public native PyBufferProcs bf_getbuffer(getbufferproc setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyByteArrayObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyByteArrayObject.java
@@ -28,7 +28,7 @@ public class PyByteArrayObject extends Pointer {
         return (PyByteArrayObject)super.position(position);
     }
     @Override public PyByteArrayObject getPointer(long i) {
-        return new PyByteArrayObject((Pointer)this).position(position + i);
+        return new PyByteArrayObject((Pointer)this).offsetAddress(i);
     }
 
     public native @ByRef PyVarObject ob_base(); public native PyByteArrayObject ob_base(PyVarObject setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyBytesObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyBytesObject.java
@@ -27,7 +27,7 @@ public class PyBytesObject extends Pointer {
         return (PyBytesObject)super.position(position);
     }
     @Override public PyBytesObject getPointer(long i) {
-        return new PyBytesObject((Pointer)this).position(position + i);
+        return new PyBytesObject((Pointer)this).offsetAddress(i);
     }
 
     public native @ByRef PyVarObject ob_base(); public native PyBytesObject ob_base(PyVarObject setter);

diff --git a/cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionObject.java b/cpython/src/gen/java/org/bytedeco/cpython/PyCFunctionObject.java
@@ -26,7 +26,7 @@ public class PyCFunctionObject extends Pointer {
         return (PyCFunctionObject)super.position(position);
     }
     @Override public PyCFunctionObject getPointer(long i) {
-        return new PyCFunctionObject((Pointer)this).position(position + i);
+        return new PyCFunctionObject((Pointer)this).offsetAddress(i);
     }
 
     public native @ByRef PyObject ob_base(); public native PyCFunctionObject ob_base(PyObject setter);