* Upgrade presets for Gym 0.23.1, PyTorch 1.11.0, cpu_features 0.7.0

CHANGELOG.md

@@ -5,7 +5,7 @@
  * Bundle correctly OpenMP library for PyTorch builds on Mac as well
  * Remove dependency on CUDA from presets for Triton Inference Server ([pull #1151](https://github.com/bytedeco/javacpp-presets/pull/1151))
  * Disable signal handlers of DepthAI known to cause issues with the JDK ([issue #1118](https://github.com/bytedeco/javacpp-presets/issues/1118))
- * Upgrade presets for DNNL 2.5.3, OpenBLAS 0.3.20, NumPy 1.22.3, Gym 0.23.0, Tesseract 5.1.0, CUDA 11.6.1, ALE 0.7.4, DepthAI 2.15.0, ONNX 1.11.0, and their dependencies
+ * Upgrade presets for DNNL 2.5.3, OpenBLAS 0.3.20, NumPy 1.22.3, Gym 0.23.1, Tesseract 5.1.0, CUDA 11.6.1, PyTorch 1.11.0, ALE 0.7.4, DepthAI 2.15.0, ONNX 1.11.0, cpu_features 0.7.0, and their dependencies
 
 ### February 11, 2022 version 1.5.7
  * Build FFmpeg with WebP encoding support ([pull #1133](https://github.com/bytedeco/javacpp-presets/pull/1133))

README.md

@@ -213,7 +213,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * NVIDIA Video Codec SDK 11.1.x  https://developer.nvidia.com/nvidia-video-codec-sdk
  * OpenCL 3.0.x  https://github.com/KhronosGroup/OpenCL-ICD-Loader
  * MXNet 1.9.0  https://github.com/apache/incubator-mxnet
- * PyTorch 1.10.x  https://github.com/pytorch/pytorch
+ * PyTorch 1.11.x  https://github.com/pytorch/pytorch
  * TensorFlow 1.15.x  https://github.com/tensorflow/tensorflow
  * TensorFlow Lite 2.8.x  https://github.com/tensorflow/tensorflow
  * TensorRT 8.x  https://developer.nvidia.com/tensorrt
@@ -227,7 +227,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * LiquidFun  http://google.github.io/liquidfun/
  * Qt 5.15.x  https://download.qt.io/archive/qt/
  * Mono/Skia 2.80.x  https://github.com/mono/skia
- * cpu_features 0.6.0  https://github.com/google/cpu_features
+ * cpu_features 0.7.0  https://github.com/google/cpu_features
  * ModSecurity 3.0.x  https://github.com/SpiderLabs/ModSecurity
  * System APIs of the build environments:
    * Linux (glibc)  https://www.gnu.org/software/libc/

cpu_features/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * cpu_features 0.6.0  https://github.com/google/cpu_features
+ * cpu_features 0.7.0  https://github.com/google/cpu_features
 
 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.cpu_features</groupId>
     <artifactId>simpleexample</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
     <properties>
         <exec.mainClass>SimpleExample</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpu_features-platform</artifactId>
-            <version>0.6.0-1.5.7</version>
+            <version>0.7.0-1.5.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpu_features/cppbuild.sh

@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-CPU_FEATURES_VERSION=0.6.0
+CPU_FEATURES_VERSION=0.7.0
 download https://github.com/google/cpu_features/archive/v$CPU_FEATURES_VERSION.tar.gz cpu_features-$CPU_FEATURES_VERSION.tar.gz
 
 mkdir -p $PLATFORM
@@ -48,13 +48,13 @@ case $PLATFORM in
         ;;
     linux-x86)
         sedinplace 's/sys\/auxv.h/linux\/auxvec.h/g' src/hwcaps.c
-        CC="gcc -m32 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+        CC="gcc -m32 -fPIC" CXX="g++ -m32 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j $MAKEJ
         make install
         ;;
     linux-x86_64)
         sedinplace 's/sys\/auxv.h/linux\/auxvec.h/g' src/hwcaps.c
-        CC="gcc -m64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+        CC="gcc -m64 -fPIC" CXX="g++ -m64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j $MAKEJ
         make install
         ;;
@@ -63,8 +63,8 @@ case $PLATFORM in
         sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h
         sedinplace 's/set(PROCESSOR_IS_ARM FALSE)/set(PROCESSOR_IS_ARM TRUE)/g' CMakeLists.txt
         sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt
-        sedinplace 's/(HardwareCapabilities)//g' src/define_tables.h
-        CC="arm-linux-gnueabihf-gcc -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+#        sedinplace 's/(HardwareCapabilities)//g' src/define_tables.h
+        CC="arm-linux-gnueabihf-gcc -fPIC" CXX="arm-linux-gnueabihf-g++ -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j $MAKEJ
         make install
         ;;
@@ -73,7 +73,7 @@ case $PLATFORM in
         sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h
         sedinplace 's/set(PROCESSOR_IS_AARCH64 FALSE)/set(PROCESSOR_IS_AARCH64 TRUE)/g' CMakeLists.txt
         sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt
-        CC="aarch64-linux-gnu-gcc -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+        CC="aarch64-linux-gnu-gcc -fPIC" CXX="aarch64-linux-gnu-g++ -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j $MAKEJ
         make install
         ;;
@@ -84,9 +84,9 @@ case $PLATFORM in
         sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt
         MACHINE_TYPE=$( uname -m )
         if [[ "$MACHINE_TYPE" =~ ppc64 ]]; then
-          CC="gcc -m64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+          CC="gcc -m64 -fPIC" CXX="g++ -m64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         else
-          CC="powerpc64le-linux-gnu-gcc -fPIC" CMAKE_C_COMPILER=$CC $CMAKE -DCMAKE_SYSTEM_PROCESSOR=powerpc -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+          CC="powerpc64le-linux-gnu-gcc -fPIC" CXX="powerpc64le-linux-gnu-g++ -fPIC" $CMAKE -DCMAKE_SYSTEM_PROCESSOR=powerpc -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         fi
         make -j $MAKEJ
         make install
@@ -96,12 +96,12 @@ case $PLATFORM in
         sedinplace 's/GetXCR0Eax(void);/GetXCR0Eax(void) { }/g' include/internal/cpuid_x86.h
         sedinplace 's/set(PROCESSOR_IS_MIPS FALSE)/set(PROCESSOR_IS_MIPS TRUE)/g' CMakeLists.txt
         sedinplace 's/set(PROCESSOR_IS_X86 TRUE)/set(PROCESSOR_IS_X86 FALSE)/g' CMakeLists.txt
-        CC="gcc -mabi=64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+        CC="gcc -mabi=64 -fPIC" CXX="g++ -mabi=64 -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j $MAKEJ
         make install
         ;;
     macosx-*)
-        CC="clang -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
+        CC="clang -fPIC" CXX="clang++ -fPIC" $CMAKE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=.. -DCMAKE_INSTALL_LIBDIR="lib" .
         make -j $MAKEJ
         make install
         ;;

cpu_features/cpu_features.patch

@@ -101,18 +101,3 @@ diff -ruN cpu_features-0.4.0/include/cpuinfo_x86.h cpu_features-0.4.0-patch/incl
 +CPU_FEATURES_END_CPP_NAMESPACE
 +
  #endif  // CPU_FEATURES_INCLUDE_CPUINFO_X86_H_
-diff -ruN cpu_features-0.4.0/include/internal/hwcaps.h cpu_features-0.4.0-patch/include/internal/hwcaps.h
---- cpu_features-0.4.0/include/internal/hwcaps.h	2019-07-05 15:47:41.000000000 +0900
-+++ cpu_features-0.4.0-patch/include/internal/hwcaps.h	2019-07-16 18:03:58.910537799 +0900
-@@ -133,6 +133,11 @@
-
- PlatformType CpuFeatures_GetPlatformType(void);
-
-+#if defined(__cplusplus) && defined(CPU_FEATURES_ARCH_X86)
-+HardwareCapabilities CpuFeatures_GetHardwareCapabilities(void) { return HardwareCapabilities(); }
-+PlatformType CpuFeatures_GetPlatformType(void) { return PlatformType(); }
-+#endif
-+
- CPU_FEATURES_END_CPP_NAMESPACE
-
- #endif  // CPU_FEATURES_INCLUDE_INTERNAL_HWCAPS_H_

cpu_features/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpu_features-platform</artifactId>
-  <version>0.6.0-${project.parent.version}</version>
+  <version>0.7.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for cpu_features</name>
 
   <properties>

cpu_features/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>cpu_features</artifactId>
-  <version>0.6.0-${project.parent.version}</version>
+  <version>0.7.0-${project.parent.version}</version>
   <name>JavaCPP Presets for cpu_features</name>
 
   <dependencies>

cpu_features/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.cpu_features</groupId>
     <artifactId>simpleexample</artifactId>
-    <version>1.5.7</version>
+    <version>1.5.8-SNAPSHOT</version>
     <properties>
         <exec.mainClass>SimpleExample</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>cpu_features-platform</artifactId>
-            <version>0.6.0-1.5.7</version>
+            <version>0.7.0-1.5.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Features.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cpu_features;
 
@@ -79,6 +79,7 @@ public class Aarch64Features extends Pointer {
   public native @NoOffset int dgh(); public native Aarch64Features dgh(int setter);         // Data Gathering Hint instruction.
   public native @NoOffset int rng(); public native Aarch64Features rng(int setter);         // True random number generator support.
   public native @NoOffset int bti(); public native Aarch64Features bti(int setter);         // Branch target identification.
+  public native @NoOffset int mte(); public native Aarch64Features mte(int setter);         // Memory tagging extension.
 
   // Make sure to update Aarch64FeaturesEnum below if you add a field here.
 }

cpu_features/src/gen/java/org/bytedeco/cpu_features/Aarch64Info.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmFeatures.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/ArmInfo.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/CacheInfo.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/CacheLevelInfo.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/HardwareCapabilities.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsFeatures.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/MipsInfo.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCFeatures.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCInfo.java

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

cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCPlatformStrings.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cpu_features;
 
@@ -37,5 +37,5 @@ public class PPCPlatformStrings extends Pointer {
   @MemberGetter public native @Cast("char*") BytePointer machine();   // 0 terminated string
   public native @Cast("char") byte cpu(int i); public native PPCPlatformStrings cpu(int i, byte setter);
   @MemberGetter public native @Cast("char*") BytePointer cpu();       // 0 terminated string
-  public native @ByRef PlatformType type(); public native PPCPlatformStrings type(PlatformType setter);
+  public native @ByRef PPCPlatformTypeStrings type(); public native PPCPlatformStrings type(PPCPlatformTypeStrings setter);
 }

cpu_features/src/gen/java/org/bytedeco/cpu_features/PlatformType.java → cpu_features/src/gen/java/org/bytedeco/cpu_features/PPCPlatformTypeStrings.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cpu_features;
 
@@ -12,25 +12,25 @@
 
 
 @Namespace("cpu_features") @Properties(inherit = org.bytedeco.cpu_features.presets.cpu_features.class)
-public class PlatformType extends Pointer {
+public class PPCPlatformTypeStrings extends Pointer {
     static { Loader.load(); }
     /** Default native constructor. */
-    public PlatformType() { super((Pointer)null); allocate(); }
+    public PPCPlatformTypeStrings() { super((Pointer)null); allocate(); }
     /** Native array allocator. Access with {@link Pointer#position(long)}. */
-    public PlatformType(long size) { super((Pointer)null); allocateArray(size); }
+    public PPCPlatformTypeStrings(long size) { super((Pointer)null); allocateArray(size); }
     /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-    public PlatformType(Pointer p) { super(p); }
+    public PPCPlatformTypeStrings(Pointer p) { super(p); }
     private native void allocate();
     private native void allocateArray(long size);
-    @Override public PlatformType position(long position) {
-        return (PlatformType)super.position(position);
+    @Override public PPCPlatformTypeStrings position(long position) {
+        return (PPCPlatformTypeStrings)super.position(position);
     }
-    @Override public PlatformType getPointer(long i) {
-        return new PlatformType((Pointer)this).offsetAddress(i);
+    @Override public PPCPlatformTypeStrings getPointer(long i) {
+        return new PPCPlatformTypeStrings((Pointer)this).offsetAddress(i);
     }
 
-  public native @Cast("char") byte platform(int i); public native PlatformType platform(int i, byte setter);
+  public native @Cast("char") byte platform(int i); public native PPCPlatformTypeStrings platform(int i, byte setter);
   @MemberGetter public native @Cast("char*") BytePointer platform();       // 0 terminated string
-  public native @Cast("char") byte base_platform(int i); public native PlatformType base_platform(int i, byte setter);
+  public native @Cast("char") byte base_platform(int i); public native PPCPlatformTypeStrings base_platform(int i, byte setter);
   @MemberGetter public native @Cast("char*") BytePointer base_platform();  // 0 terminated string
 }

cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Features.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cpu_features;
 
@@ -96,5 +96,6 @@ public class X86Features extends Pointer {
 
   public native @NoOffset int dca(); public native X86Features dca(int setter);
   public native @NoOffset int ss(); public native X86Features ss(int setter);
+  public native @NoOffset int adx(); public native X86Features adx(int setter);
   // Make sure to update X86FeaturesEnum below if you add a field here.
 }

cpu_features/src/gen/java/org/bytedeco/cpu_features/X86Info.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.7: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.8-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.cpu_features;
 
@@ -34,5 +34,7 @@ public class X86Info extends Pointer {
   public native int model(); public native X86Info model(int setter);
   public native int stepping(); public native X86Info stepping(int setter);
   public native @Cast("char") byte vendor(int i); public native X86Info vendor(int i, byte setter);
-  @MemberGetter public native @Cast("char*") BytePointer vendor();  // 0 terminated string
+  @MemberGetter public native @Cast("char*") BytePointer vendor();        // 0 terminated string
+  public native @Cast("char") byte brand_string(int i); public native X86Info brand_string(int i, byte setter);
+  @MemberGetter public native @Cast("char*") BytePointer brand_string();  // 0 terminated string
 }