* Upgrade presets for DNNL 2.4.1, OpenBLAS 0.3.18, CPython 3.10.0, A…

…LE 0.7.2, ONNX Runtime 1.9.1

.github/actions/deploy-centos/action.yml

@@ -7,11 +7,11 @@ runs:
       run: |
         cd /root
 
-        SCL_ENABLE="devtoolset-8"
+        SCL_ENABLE="devtoolset-9"
         CENTOS_VERSION=$(rpm --eval '%{centos_ver}')
         if [[ "$CENTOS_VERSION" == "6" ]]; then
           find /etc/yum.repos.d/ -name *.repo | xargs -i sed -i 's/mirror\.centos\.org\/centos/vault.centos.org/g;s/$releasever/6.10/g;s/mirrorlist/#mirrorlist/g;s/#baseurl/baseurl/g' {}
-          SCL_ENABLE="devtoolset-8 rh-python36 python27"
+          SCL_ENABLE="devtoolset-9 rh-python36 python27"
         fi
         echo "SCL_ENABLE=$SCL_ENABLE" >> $GITHUB_ENV
 
@@ -22,7 +22,7 @@ runs:
         fi
         yum -y install $SCL_ENABLE rh-java-common-ant boost-devel ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python36-devel python36-pip swig file which wget unzip tar bzip2 gzip xz patch autoconf-archive automake make libtool bison flex perl nasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel curl-devel expat-devel gettext-devel openssl-devel bzip2-devel zlib-devel SDL-devel libva-devel libxkbcommon-devel libxkbcommon-x11-devel xcb-util* fontconfig-devel libffi-devel ragel ocl-icd-devel GeoIP-devel pcre-devel ssdeep-devel yajl-devel
         # https://gcc.gnu.org/legacy-ml/gcc-patches/2018-01/msg01962.html
-        sed -i 's/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/g' /opt/rh/devtoolset-8/root/usr/lib/gcc/x86_64-redhat-linux/8/include/avx512fintrin.h
+        sed -i 's/_mm512_abs_pd (__m512 __A)/_mm512_abs_pd (__m512d __A)/g' /opt/rh/devtoolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9/include/avx512fintrin.h
         source scl_source enable $SCL_ENABLE || true
 
         curl -LO https://github.com/Kitware/CMake/releases/download/v3.16.6/cmake-3.16.6-Linux-x86_64.tar.gz
@@ -50,7 +50,7 @@ runs:
 
         if [[ $CI_DEPLOY_PLATFORM == "linux-x86" ]]; then
           rpm -qa | sed s/.x86_64$/.i686/ | xargs yum -q -y install
-          wget --no-directories --no-parent -r https://www.repo.cloudlinux.com/cloudlinux/$CENTOS_VERSION/sclo/devtoolset-8/i386/
+          wget --no-directories --no-parent -r https://www.repo.cloudlinux.com/cloudlinux/$CENTOS_VERSION/sclo/devtoolset-9/i386/
           rpm -i --force --nodeps *.rpm
         fi
 

CHANGELOG.md

@@ -4,7 +4,7 @@
  * Map C++ JIT classes and functions of TorchScript in presets for PyTorch ([issue #1068](https://github.com/bytedeco/javacpp-presets/issues/1068))
  * Synchronize `cachePackage()` and prevent repeated package caching in all presets ([pull #1071](https://github.com/bytedeco/javacpp-presets/pull/1071))
  * Build FFmpeg with VA-API enabled and bundle its libraries to avoid loading issues ([issue bytedeco/javacv#1188](https://github.com/bytedeco/javacv/issues/1188))
- * Upgrade presets for Arrow 5.0.0, MKL 2021.4, DNNL 2.3.2, FFTW 3.3.10, CPython 3.9.7, NumPy 1.21.2, SciPy 1.7.1, Gym 0.21.0, LLVM 13.0.0, Leptonica 1.82.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.9.1, TensorFlow Lite 2.6.0, ALE 0.7.1, DepthAI 2.10.0, ONNX 1.10.1, ONNX Runtime 1.9.0, and their dependencies
+ * Upgrade presets for Arrow 5.0.0, MKL 2021.4, DNNL 2.4.1, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.2, SciPy 1.7.1, Gym 0.21.0, LLVM 13.0.0, Leptonica 1.82.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.9.1, TensorFlow Lite 2.6.0, ALE 0.7.2, DepthAI 2.10.0, ONNX 1.10.1, ONNX Runtime 1.9.1, and their dependencies
 
 ### August 2, 2021 version 1.5.6
  * Change `opencv_core.Mat` constructors to create column vectors out of arrays for consistency ([issue #1064](https://github.com/bytedeco/javacpp-presets/issues/1064))

README.md

@@ -187,13 +187,13 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * Hyperscan 5.4.x  https://github.com/intel/hyperscan
  * MKL 2021.x  https://software.intel.com/mkl
  * MKL-DNN 0.21.x  https://github.com/oneapi-src/oneDNN
- * DNNL 2.3.x  https://github.com/oneapi-src/oneDNN
- * OpenBLAS 0.3.17  http://www.openblas.net/
+ * DNNL 2.4.x  https://github.com/oneapi-src/oneDNN
+ * OpenBLAS 0.3.18  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.10  http://www.fftw.org/download.html
  * GSL 2.7  http://www.gnu.org/software/gsl/#downloading
- * CPython 3.9.x  https://www.python.org/downloads/
+ * CPython 3.10.x  https://www.python.org/downloads/
  * NumPy 1.21.x  https://github.com/numpy/numpy
  * SciPy 1.7.x  https://github.com/scipy/scipy
  * Gym 0.21.x  https://github.com/openai/gym

ale/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * The Arcade Learning Environment 0.7.1  https://github.com/mgbellemare/Arcade-Learning-Environment
+ * The Arcade Learning Environment 0.7.2  https://github.com/mgbellemare/Arcade-Learning-Environment
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -46,7 +46,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>ale-platform</artifactId>
-            <version>0.7.1-1.5.7-SNAPSHOT</version>
+            <version>0.7.2-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

ale/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-ALE_VERSION=0.7.1
+ALE_VERSION=0.7.2
 SDL_VERSION=2.0.16
 download https://github.com/mgbellemare/Arcade-Learning-Environment/archive/v$ALE_VERSION.tar.gz ale-v$ALE_VERSION.tar.gz
 download https://github.com/libsdl-org/SDL/archive/refs/tags/release-$SDL_VERSION.tar.gz SDL-release-$SDL_VERSION.tar.gz

ale/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>ale-platform</artifactId>
-  <version>0.7.1-${project.parent.version}</version>
+  <version>0.7.2-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for ALE</name>
 
   <properties>

ale/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>ale</artifactId>
-  <version>0.7.1-${project.parent.version}</version>
+  <version>0.7.2-${project.parent.version}</version>
   <name>JavaCPP Presets for ALE</name>
 
   <dependencies>

ale/samples/pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>ale-platform</artifactId>
-            <version>0.7.1-1.5.7-SNAPSHOT</version>
+            <version>0.7.2-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arpack-ng/README.md

@@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.arpack</groupId>
     <artifactId>icbarpackc</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7-SNAPSHOT</version>
     <properties>
         <exec.mainClass>IcbArpackC</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arpack-ng-platform</artifactId>
-            <version>3.8.0-1.5.6</version>
+            <version>3.8.0-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arpack-ng/platform/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

arpack-ng/pom.xml

@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${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.17-${project.parent.version}</version>
+            <version>0.3.18-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.17-${project.parent.version}</version>
+            <version>0.3.18-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

arpack-ng/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.arpack</groupId>
     <artifactId>icbarpackc</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7-SNAPSHOT</version>
     <properties>
         <exec.mainClass>IcbArpackC</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arpack-ng-platform</artifactId>
-            <version>3.8.0-1.5.6</version>
+            <version>3.8.0-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arpack-ng/src/gen/java/org/bytedeco/arpackng/global/arpack.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.7-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arpackng.global;
 

caffe/platform/gpu/pom.xml

@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

caffe/platform/pom.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

caffe/pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${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.17-${project.parent.version}</version>
+            <version>0.3.18-${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.17-${project.parent.version}</version>
+            <version>0.3.18-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

chilitags/pom.xml

@@ -41,7 +41,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.17-${project.parent.version}</version>
+            <version>0.3.18-${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.17-${project.parent.version}</version>
+            <version>0.3.18-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
           <dependency>

cminpack/README.md

@@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.cminpack</groupId>
     <artifactId>tlmdif1c</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Tlmdif1c</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cminpack-platform</artifactId>
-            <version>1.3.8-1.5.6</version>
+            <version>1.3.8-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cminpack/platform/pom.xml

@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

cminpack/pom.xml

@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.3.17-${project.parent.version}</version>
+      <version>0.3.18-${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.17-${project.parent.version}</version>
+            <version>0.3.18-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.3.17-${project.parent.version}</version>
+            <version>0.3.18-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

cminpack/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.cminpack</groupId>
     <artifactId>tlmdif1c</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7-SNAPSHOT</version>
     <properties>
         <exec.mainClass>Tlmdif1c</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cminpack-platform</artifactId>
-            <version>1.3.8-1.5.6</version>
+            <version>1.3.8-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpack.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.7-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cminpack.global;
 

cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpackl.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.7-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cminpack.global;
 

cminpack/src/gen/java/org/bytedeco/cminpack/global/cminpacks.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.6: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.7-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cminpack.global;
 

cpython/README.md

@@ -14,7 +14,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * CPython 3.9.7  https://www.python.org/
+ * CPython 3.10.0  https://www.python.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -25,7 +25,7 @@ Java API documentation is available here:
 
  * http://bytedeco.org/javacpp-presets/cpython/apidocs/
 
-∗ Call `Py_AddPath(cachePackages())` before calling `Py_Initialize()`.  
+∗ Call `Py_Initialize(cachePackages())` instead of just `Py_Initialize()`.  
 ∗ To satisfy OpenSSL, we might need to set the `SSL_CERT_FILE` environment variable to the full path of `cacert.pem` extracted by default under `~/.javacpp/cache/`.
 
 
@@ -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.7-1.5.7-SNAPSHOT</version>
+            <version>3.10.0-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>
@@ -71,17 +71,15 @@ import static org.bytedeco.cpython.global.python.*;
 
 public class Simple {
     public static void main(String[] args) throws Exception {
-        Py_AddPath(cachePackages());
-
         Pointer program = Py_DecodeLocale(Simple.class.getSimpleName(), null);
         if (program == null) {
-            System.err.println("Fatal error: cannot get class name");
+            System.err.println("Fatal error: cannot decode class name");
             System.exit(1);
         }
         Py_SetProgramName(program);  /* optional but recommended */
-        Py_Initialize();
-        PyRun_SimpleStringFlags("from time import time,ctime\n"
-                              + "print('Today is', ctime(time()))\n", null);
+        Py_Initialize(cachePackages());
+        PyRun_SimpleString("from time import time,ctime\n"
+                         + "print('Today is', ctime(time()))\n");
         if (Py_FinalizeEx() < 0) {
             System.exit(120);
         }

cpython/cppbuild.sh

@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
 fi
 
 OPENSSL=openssl-1.1.1k
-CPYTHON_VERSION=3.9.7
+CPYTHON_VERSION=3.10.0
 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