* Upgrade presets for MKL 2021.4, Gym 0.21.0, LLVM 13.0.0, Leptonica…

… 1.82.0, ALE 0.7.1

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

@@ -109,8 +109,8 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "mkl" ]]; then
           echo Installing MKL
-          curl -LO https://registrationcenter-download.intel.com/akdlm/irc_nas/17901/l_onemkl_p_2021.3.0.520_offline.sh
-          bash l_onemkl_p_2021.3.0.520_offline.sh -s -a -s --eula accept
+          curl -LO https://registrationcenter-download.intel.com/akdlm/irc_nas/18222/l_onemkl_p_2021.4.0.640_offline.sh
+          bash l_onemkl_p_2021.4.0.640_offline.sh -s -a -s --eula accept
         fi
 
         if [[ "$CI_DEPLOY_PLATFORM" == "linux-x86" ]] && [[ "$CI_DEPLOY_MODULE" == "flycapture" ]]; then

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

@@ -53,9 +53,9 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "mkl" ]]; then
           echo Installing MKL
-          curl -LO https://registrationcenter-download.intel.com/akdlm/irc_nas/17960/m_onemkl_p_2021.3.0.517_offline.dmg
-          hdiutil mount m_onemkl_p_2021.3.0.517_offline.dmg
-          sudo /Volumes/m_onemkl_p_2021.3.0.517_offline/bootstrapper.app/Contents/MacOS/install.sh -s -a -s --eula accept
+          curl -LO https://registrationcenter-download.intel.com/akdlm/irc_nas/18227/m_onemkl_p_2021.4.0.637_offline.dmg
+          hdiutil mount m_onemkl_p_2021.4.0.637_offline.dmg
+          sudo /Volumes/m_onemkl_p_2021.4.0.637_offline/bootstrapper.app/Contents/MacOS/install.sh -s -a -s --eula accept
         fi
 
         GRADLE_TASK=publishToMavenLocal

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

@@ -97,8 +97,8 @@ runs:
 
         if "%CI_DEPLOY_MODULE%"=="mkl" (
           echo Installing MKL
-          curl -LO https://registrationcenter-download.intel.com/akdlm/irc_nas/17964/w_onemkl_p_2021.3.0.524_offline.exe
-          w_onemkl_p_2021.3.0.524_offline.exe -s -a -s --eula accept
+          curl -LO https://registrationcenter-download.intel.com/akdlm/irc_nas/18230/w_onemkl_p_2021.4.0.640_offline.exe
+          w_onemkl_p_2021.4.0.640_offline.exe -s -a -s --eula accept
         )
 
         if "%CI_DEPLOY_PLATFORM%"=="windows-x86" if "%CI_DEPLOY_MODULE%"=="flycapture" (

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, DNNL 2.3.2, FFTW 3.3.10, CPython 3.9.7, NumPy 1.21.2, SciPy 1.7.1, Gym 0.20.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.0, 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.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
 
 ### 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

@@ -196,11 +196,11 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * CPython 3.9.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.20.x  https://github.com/openai/gym
- * LLVM 12.0.x  http://llvm.org/releases/download.html
+ * Gym 0.21.x  https://github.com/openai/gym
+ * LLVM 13.0.x  http://llvm.org/releases/download.html
  * libffi 3.4.x  https://github.com/libffi/libffi
  * libpostal 1.1-alpha  https://github.com/openvenues/libpostal
- * Leptonica 1.81.x  http://www.leptonica.org/download.html
+ * Leptonica 1.82.x  http://www.leptonica.org/download.html
  * Tesseract 4.1.1  https://github.com/tesseract-ocr/tesseract
  * Caffe 1.0  https://github.com/BVLC/caffe
  * OpenPose 1.7.0  https://github.com/CMU-Perceptual-Computing-Lab/openpose

ale/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * The Arcade Learning Environment 0.7.0  https://github.com/mgbellemare/Arcade-Learning-Environment
+ * The Arcade Learning Environment 0.7.1  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.0-1.5.7-SNAPSHOT</version>
+            <version>0.7.1-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.0
+ALE_VERSION=0.7.1
 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.0-${project.parent.version}</version>
+  <version>0.7.1-${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.0-${project.parent.version}</version>
+  <version>0.7.1-${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.0-1.5.7-SNAPSHOT</version>
+            <version>0.7.1-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arrow/cppbuild.sh

@@ -12,7 +12,7 @@ if [[ $PLATFORM == windows* ]]; then
     export PYTHON_BIN_PATH=$(which python.exe)
 fi
 
-LLVM_VERSION=12.0.1
+LLVM_VERSION=13.0.0
 OPENSSL_VERSION=1.1.1k
 ZLIB_VERSION=1.2.11
 PROTO_VERSION=3.13.0
@@ -37,7 +37,7 @@ tar --totals -xf ../llvm-$LLVM_VERSION.src.tar.xz || tar --totals -xf ../llvm-$L
 cd apache-arrow-$ARROW_VERSION
 patch -Np1 < ../../../arrow.patch
 sedinplace 's/PlatformToolset=v140/PlatformToolset=v142/g' cpp/cmake_modules/ThirdpartyToolchain.cmake
-sedinplace 's/ARROW_LLVM_VERSIONS "10"/ARROW_LLVM_VERSIONS "11" "10"/g' cpp/CMakeLists.txt
+sedinplace 's/set(ARROW_LLVM_VERSIONS/set(ARROW_LLVM_VERSIONS "13.0"/g' cpp/CMakeLists.txt
 cd ../llvm-$LLVM_VERSION.src
 sedinplace '/find_package(Git/d' cmake/modules/AddLLVM.cmake cmake/modules/VersionFromVCS.cmake
 mkdir -p build tools

gym/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Gym 0.20.0  https://gym.openai.com/
+ * Gym 0.21.0  https://gym.openai.com/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -48,14 +48,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>gym-platform</artifactId>
-            <version>0.20.0-1.5.7-SNAPSHOT</version>
+            <version>0.21.0-1.5.7-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2021.3-1.5.7-SNAPSHOT</version>
+            <version>2021.4-1.5.7-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

gym/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-GYM_VERSION=0.20.0
+GYM_VERSION=0.21.0
 download https://github.com/openai/gym/archive/v$GYM_VERSION.tar.gz gym-$GYM_VERSION.tar.gz
 
 mkdir -p $PLATFORM

gym/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>gym-platform</artifactId>
-  <version>0.20.0-${project.parent.version}</version>
+  <version>0.21.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Gym</name>
 
   <properties>

gym/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>gym</artifactId>
-  <version>0.20.0-${project.parent.version}</version>
+  <version>0.21.0-${project.parent.version}</version>
   <name>JavaCPP Presets for Gym</name>
 
   <dependencies>

gym/samples/pom.xml

@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>gym-platform</artifactId>
-            <version>0.20.0-1.5.7-SNAPSHOT</version>
+            <version>0.21.0-1.5.7-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2021.3-1.5.7-SNAPSHOT</version>
+            <version>2021.4-1.5.7-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

leptonica/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Leptonica 1.81.1  http://www.leptonica.org/
+ * Leptonica 1.82.0  http://www.leptonica.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -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.leptonica</groupId>
     <artifactId>sudokutest</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7-SNAPSHOT</version>
     <properties>
         <exec.mainClass>SudokuTest</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>leptonica-platform</artifactId>
-            <version>1.81.1-1.5.6</version>
+            <version>1.82.0-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

leptonica/cppbuild.sh

@@ -13,8 +13,8 @@ GIFLIB=giflib-5.1.4
 LIBJPEG=libjpeg-turbo-1.5.3
 LIBPNG=libpng-1.6.37 # warning: libpng16 doesn't work on CentOS 6 for some reason
 LIBTIFF=tiff-4.3.0
-LIBWEBP=libwebp-1.2.0
-LEPTONICA_VERSION=1.81.1
+LIBWEBP=libwebp-1.2.1
+LEPTONICA_VERSION=1.82.0
 download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz
 download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz
 download http://downloads.sourceforge.net/project/giflib/$GIFLIB.tar.gz $GIFLIB.tar.gz

leptonica/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>leptonica-platform</artifactId>
-  <version>1.81.1-${project.parent.version}</version>
+  <version>1.82.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Leptonica</name>
 
   <properties>

leptonica/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>leptonica</artifactId>
-  <version>1.81.1-${project.parent.version}</version>
+  <version>1.82.0-${project.parent.version}</version>
   <name>JavaCPP Presets for Leptonica</name>
 
   <dependencies>

leptonica/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.leptonica</groupId>
     <artifactId>sudokutest</artifactId>
-    <version>1.5.6</version>
+    <version>1.5.7-SNAPSHOT</version>
     <properties>
         <exec.mainClass>SudokuTest</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>leptonica-platform</artifactId>
-            <version>1.81.1-1.5.6</version>
+            <version>1.82.0-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

leptonica/src/gen/java/org/bytedeco/leptonica/BOX.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/BOXA.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/BOXAA.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/CCBORD.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/CCBORDA.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/DLLIST.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/DPIX.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/FPIX.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/FPIXA.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/GPLOT.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/Handler_BytePointer.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/Handler_String.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/JBCLASSER.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/JBDATA.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/L_AMAP_NODE.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/L_ASET_NODE.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/L_BBUFFER.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.leptonica;
 

leptonica/src/gen/java/org/bytedeco/leptonica/L_BMF.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.leptonica;