* Upgrade presets for Arrow 0.17.1, NumPy 1.18.4, Gym 0.17.2, Tensor…

…Flow 1.15.3, Skia 1.68.3

CHANGELOG.md

@@ -1,7 +1,7 @@
 
  * Fix JPMS modules for CUDA, ARPACK-NG, GSL, SciPy, Gym, MXNet ([pull #880](https://github.com/bytedeco/javacpp-presets/pull/880) and [pull #881](https://github.com/bytedeco/javacpp-presets/pull/881))
  * Build OpenBLAS with a `TARGET` even for `DYNAMIC_ARCH` to avoid SIGILL ([issue eclipse/deeplearning4j#8747](https://github.com/eclipse/deeplearning4j/issues/8747))
- * Upgrade presets for Arrow 0.17.0, MKL-DNN 0.21.5, DNNL 1.4, NumPy 1.18.3, ONNX 1.7.0 ([pull #882](https://github.com/bytedeco/javacpp-presets/pull/882)), ONNX Runtime 1.3.0 ([pull #887](https://github.com/bytedeco/javacpp-presets/pull/887)), and their dependencies
+ * Upgrade presets for Arrow 0.17.1, MKL-DNN 0.21.5, DNNL 1.4, NumPy 1.18.4, Gym 0.17.2, TensorFlow 1.15.3, ONNX 1.7.0 ([pull #882](https://github.com/bytedeco/javacpp-presets/pull/882)), ONNX Runtime 1.3.0 ([pull #887](https://github.com/bytedeco/javacpp-presets/pull/887)), Skia 1.68.3, and their dependencies
  * Add `FullOptimization.h` allowing users to fully optimize LLVM modules ([pull #869](https://github.com/bytedeco/javacpp-presets/pull/869))
 
 ### April 14, 2020 version 1.5.3

README.md

@@ -143,7 +143,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
    * cuDNN 7.6.x  https://developer.nvidia.com/cudnn
    * NCCL 2.6.x  https://developer.nvidia.com/nccl
  * MXNet 1.6.0  https://github.com/apache/incubator-mxnet
- * TensorFlow 1.15.2  https://github.com/tensorflow/tensorflow
+ * TensorFlow 1.15.x  https://github.com/tensorflow/tensorflow
  * TensorRT 7.0  https://developer.nvidia.com/tensorrt
  * The Arcade Learning Environment 0.6.x  https://github.com/mgbellemare/Arcade-Learning-Environment
  * ONNX 1.7.0  https://github.com/onnx/onnx

arrow/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Arrow 0.17.0  https://arrow.apache.org/
+ * Arrow 0.17.1  https://arrow.apache.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -42,7 +42,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arrow-platform</artifactId>
-            <version>0.17.0-1.5.4-SNAPSHOT</version>
+            <version>0.17.1-1.5.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arrow/cppbuild.sh

@@ -16,7 +16,7 @@ LLVM_VERSION=8.0.1
 OPENSSL_VERSION=1.1.1f
 ZLIB_VERSION=1.2.11
 PROTO_VERSION=3.7.1
-ARROW_VERSION=0.17.0
+ARROW_VERSION=0.17.1
 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.xz llvm-$LLVM_VERSION.src.tar.xz
 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.xz cfe-$LLVM_VERSION.src.tar.xz
 download https://github.com/python/cpython-bin-deps/archive/openssl-bin.zip cpython-bin-deps-openssl-bin.zip

arrow/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>arrow-platform</artifactId>
-  <version>0.17.0-${project.parent.version}</version>
+  <version>0.17.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Arrow</name>
 
   <properties>

arrow/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>arrow</artifactId>
-  <version>0.17.0-${project.parent.version}</version>
+  <version>0.17.1-${project.parent.version}</version>
   <name>JavaCPP Presets for Arrow</name>
 
   <dependencies>

arrow/samples/pom.xml

@@ -10,7 +10,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arrow-platform</artifactId>
-            <version>0.17.0-1.5.4-SNAPSHOT</version>
+            <version>0.17.1-1.5.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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

@@ -137,11 +137,11 @@ public class arrow extends org.bytedeco.arrow.presets.arrow {
 
 public static final int ARROW_VERSION_MAJOR = 0;
 public static final int ARROW_VERSION_MINOR = 17;
-public static final int ARROW_VERSION_PATCH = 0;
+public static final int ARROW_VERSION_PATCH = 1;
 public static final int ARROW_VERSION = ((ARROW_VERSION_MAJOR * 1000) + ARROW_VERSION_MINOR) * 1000 + ARROW_VERSION_PATCH;
 
 public static final String ARROW_SO_VERSION = "17";
-public static final String ARROW_FULL_SO_VERSION = "17.0.0";
+public static final String ARROW_FULL_SO_VERSION = "17.1.0";
 
 // #define GRPCPP_PP_INCLUDE
 

arrow/src/gen/java/org/bytedeco/arrow/global/parquet.java

@@ -1094,6 +1094,23 @@ public class parquet extends org.bytedeco.arrow.presets.parquet {
 
 
 
+/** Controls serialization format of data pages.  parquet-format v2.0.0
+ *  introduced a new data page metadata type DataPageV2 and serialized page
+ *  structure (for example, encoded levels are no longer compressed). Prior to
+ *  the completion of PARQUET-457 in 2020, this library did not implement
+ *  DataPageV2 correctly, so if you use the V2 data page format, you may have
+ *  forward compatibility issues (older versions of the library will be unable
+ *  to read the files). Note that some Parquet implementations do not implement
+ *  DataPageV2 at all. */
+@Namespace("parquet") public enum ParquetDataPageVersion { V1(0), V2(1);
+
+    public final int value;
+    private ParquetDataPageVersion(int v) { this.value = v; }
+    private ParquetDataPageVersion(ParquetDataPageVersion e) { this.value = e.value; }
+    public ParquetDataPageVersion intern() { for (ParquetDataPageVersion e : values()) if (e.value == value) return e; return this; }
+    @Override public String toString() { return intern().name(); }
+}
+
 @Namespace("parquet") @MemberGetter public static native @Cast("int64_t") long DEFAULT_BUFFER_SIZE();
 @Namespace("parquet") @MemberGetter public static native @Cast("bool") boolean DEFAULT_USE_BUFFERED_STREAM();
 // Targeting ../../parquet/ReaderProperties.java
@@ -1117,7 +1134,6 @@ public class parquet extends org.bytedeco.arrow.presets.parquet {
 @Namespace("parquet") @MemberGetter public static native @Cast("const int64_t") long DEFAULT_MAX_STATISTICS_SIZE();
 public static final long DEFAULT_MAX_STATISTICS_SIZE = DEFAULT_MAX_STATISTICS_SIZE();
 @Namespace("parquet") @MemberGetter public static native Encoding.type DEFAULT_ENCODING();
-@Namespace("parquet") @MemberGetter public static native ParquetVersion.type DEFAULT_WRITER_VERSION();
 @Namespace("parquet") @MemberGetter public static native byte DEFAULT_CREATED_BY(int i);
 @Namespace("parquet") @MemberGetter public static native String DEFAULT_CREATED_BY();
 @Namespace("parquet") @MemberGetter public static native Compression.type DEFAULT_COMPRESSION_TYPE();

arrow/src/gen/java/org/bytedeco/parquet/ParquetVersion.java

@@ -13,6 +13,16 @@
 import static org.bytedeco.arrow.global.parquet.*;
 
 
+/** Determines use of Parquet Format version >= 2.0.0 logical types. For
+ *  example, when writing from Arrow data structures, PARQUET_2_0 will enable
+ *  use of INT_* and UINT_* converted types as well as nanosecond timestamps
+ *  stored physically as INT64. Since some Parquet implementations do not
+ *  support the logical types added in the 2.0.0 format version, if you want to
+ *  maximize compatibility of your files you may want to use PARQUET_1_0.
+ * 
+ *  Note that the 2.x format version series also introduced new serialized
+ *  data page metadata and on disk data page layout. To enable this, use
+ *  ParquetDataPageVersion. */
 @Namespace("parquet") @Properties(inherit = org.bytedeco.arrow.presets.parquet.class)
 public class ParquetVersion extends Pointer {
     static { Loader.load(); }

arrow/src/gen/java/org/bytedeco/parquet/WriterProperties.java

@@ -57,6 +57,9 @@ public class WriterProperties extends Pointer {
 
     public native Builder data_pagesize(@Cast("int64_t") long pg_size);
 
+    public native Builder data_page_version(ParquetDataPageVersion data_page_version);
+    public native Builder data_page_version(@Cast("parquet::ParquetDataPageVersion") int data_page_version);
+
     public native Builder version(ParquetVersion.type version);
     public native Builder version(@Cast("parquet::ParquetVersion::type") int version);
 
@@ -183,6 +186,8 @@ public native Builder encryption(
 
   public native @Cast("int64_t") long data_pagesize();
 
+  public native ParquetDataPageVersion data_page_version();
+
   public native ParquetVersion.type version();
 
   public native @StdString String created_by();

gym/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Gym 0.17.1  https://gym.openai.com/
+ * Gym 0.17.2  https://gym.openai.com/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -36,22 +36,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.gym</groupId>
     <artifactId>listenvs</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4-SNAPSHOT</version>
     <properties>
         <exec.mainClass>ListEnvs</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>gym-platform</artifactId>
-            <version>0.17.1-1.5.3</version>
+            <version>0.17.2-1.5.4-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2020.1-1.5.3</version>
+            <version>2020.1-1.5.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

gym/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-GYM_VERSION=0.17.1
+GYM_VERSION=0.17.2
 download https://github.com/openai/gym/archive/$GYM_VERSION.tar.gz gym-$GYM_VERSION.tar.gz
 
 mkdir -p $PLATFORM
@@ -72,7 +72,7 @@ mkdir -p "$PYTHON_INSTALL_PATH"
 
 # Adjust the directory structure a bit to facilitate packaging in JAR file
 mkdir -p ../python
-export MODULES=(cloudpickle future six pyglet gym)
+export MODULES=(cloudpickle future `#six` pyglet gym)
 for MODULE in ${MODULES[@]}; do
     mkdir -p ../python/$MODULE.egg-info
     cp -r $PYTHON_INSTALL_PATH/$MODULE-*/$MODULE* ../python/

gym/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>gym-platform</artifactId>
-  <version>0.17.1-${project.parent.version}</version>
+  <version>0.17.2-${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.17.1-${project.parent.version}</version>
+  <version>0.17.2-${project.parent.version}</version>
   <name>JavaCPP Presets for Gym</name>
 
   <properties>
@@ -86,7 +86,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>numpy</artifactId>
-            <version>1.18.3-${project.parent.version}</version>
+            <version>1.18.4-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -108,7 +108,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>numpy</artifactId>
-            <version>1.18.3-${project.parent.version}</version>
+            <version>1.18.4-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
           <dependency>

gym/samples/pom.xml

@@ -2,22 +2,22 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.gym</groupId>
     <artifactId>listenvs</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4-SNAPSHOT</version>
     <properties>
         <exec.mainClass>ListEnvs</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>gym-platform</artifactId>
-            <version>0.17.1-1.5.3</version>
+            <version>0.17.2-1.5.4-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2020.1-1.5.3</version>
+            <version>2020.1-1.5.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

numpy/README.md

@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * NumPy 1.18.2  http://www.numpy.org/
+ * NumPy 1.18.4  http://www.numpy.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -36,22 +36,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.numpy</groupId>
     <artifactId>matmul</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4-SNAPSHOT</version>
     <properties>
         <exec.mainClass>MatMul</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>numpy-platform</artifactId>
-            <version>1.18.2-1.5.3</version>
+            <version>1.18.4-1.5.4-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2020.1-1.5.3</version>
+            <version>2020.1-1.5.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

numpy/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-NUMPY_VERSION=1.18.3
+NUMPY_VERSION=1.18.4
 download https://github.com/numpy/numpy/releases/download/v$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz numpy-$NUMPY_VERSION.tar.gz
 
 mkdir -p $PLATFORM

numpy/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>numpy-platform</artifactId>
-  <version>1.18.3-${project.parent.version}</version>
+  <version>1.18.4-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for NumPy</name>
 
   <properties>

numpy/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>numpy</artifactId>
-  <version>1.18.3-${project.parent.version}</version>
+  <version>1.18.4-${project.parent.version}</version>
   <name>JavaCPP Presets for NumPy</name>
 
   <properties>

numpy/samples/pom.xml

@@ -2,22 +2,22 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.numpy</groupId>
     <artifactId>matmul</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4-SNAPSHOT</version>
     <properties>
         <exec.mainClass>MatMul</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>numpy-platform</artifactId>
-            <version>1.18.2-1.5.3</version>
+            <version>1.18.4-1.5.4-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2020.1-1.5.3</version>
+            <version>2020.1-1.5.4-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

opencv/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>numpy</artifactId>
-      <version>1.18.3-${project.parent.version}</version>
+      <version>1.18.4-${project.parent.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -73,7 +73,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>numpy-platform</artifactId>
-            <version>1.18.3-${project.parent.version}</version>
+            <version>1.18.4-${project.parent.version}</version>
           </dependency>
         </dependencies>
         <configuration>