* Upgrade presets for OpenBLAS 0.2.20

dyastremsky · Sep 5, 2017 · c1b3c02 · c1b3c02
1 parent a20eac6
commit c1b3c02
Show file tree

Hide file tree

Showing 17 changed files with 508 additions and 586 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+ * Map `AVERROR()` for error codes from `errno.h` used by FFmpeg ([pull #459](https://github.com/bytedeco/javacpp-presets/pull/459))
+ * Use `long` instead of `int` for constants starting with `AV_CH_LAYOUT_` in `avutil` ([pull #455](https://github.com/bytedeco/javacpp-presets/pull/455))
+ * Build FFmpeg with FreeType, enabling the `drawtext` filter ([pull #452](https://github.com/bytedeco/javacpp-presets/pull/452)), and support for Opus ([pull #457](https://github.com/bytedeco/javacpp-presets/pull/457))
  * Enable cuDNN support for Caffe by default ([issue #187](https://github.com/bytedeco/javacpp-presets/issues/187))
  * Use the new `BUILD_PATH` environment variable passed by the `javacpp` plugin to the `cppbuild.sh` script files
  * Let presets pick up `include` or `link` paths from cached resources ([pull #101](https://github.com/bytedeco/javacpp-presets/pull/101))
@@ -8,7 +11,7 @@
  * Link TensorFlow statically with `cudart` to avoid dependency on CUDA ([issue #396](https://github.com/bytedeco/javacpp-presets/issues/396))
  * Add missing call to `Loader.load()` in helper class for `opencv_ml` ([issue bytedeco/javacv#638](https://github.com/bytedeco/javacv/issues/638))
  * Work around issues with TensorFlow on some versions of Mac OS X ([issue #335](https://github.com/bytedeco/javacpp-presets/issues/335))
- * Upgrade presets for OpenCV 3.2.0, FFmpeg 3.3.2, FlyCapture 2.11.3.121 ([pull #424](https://github.com/bytedeco/javacpp-presets/pull/424)), libdc1394 2.2.5, HDF5 1.10.1, FFTW 3.3.6, GSL 2.4, LLVM 4.0.0 ([pull #404](https://github.com/bytedeco/javacpp-presets/pull/404)), Leptonica 1.74.4, Tesseract 3.05.01, Caffe 1.0, cuDNN 6.0, MXNet 0.10.0, TensorFlow 1.2.1, and their dependencies
+ * Upgrade presets for OpenCV 3.2.0, FFmpeg 3.3.2, FlyCapture 2.11.3.121 ([pull #424](https://github.com/bytedeco/javacpp-presets/pull/424)), libdc1394 2.2.5, HDF5 1.10.1, OpenBLAS 0.2.20, FFTW 3.3.6, GSL 2.4, LLVM 4.0.0 ([pull #404](https://github.com/bytedeco/javacpp-presets/pull/404)), Leptonica 1.74.4, Tesseract 3.05.01, Caffe 1.0, cuDNN 6.0, MXNet 0.10.0, TensorFlow 1.2.1, and their dependencies
  * Add presets for libfreenect2 ([pull #340](https://github.com/bytedeco/javacpp-presets/pull/340)), MKL ([issue #112](https://github.com/bytedeco/javacpp-presets/issues/112)), The Arcade Learning Environment, LiquidFun ([pull #356](https://github.com/bytedeco/javacpp-presets/pull/356)), and Skia ([pull #418](https://github.com/bytedeco/javacpp-presets/pull/418))
  * Fix the `FlyCapture2` module for some versions on Windows ([issue #337](https://github.com/bytedeco/javacpp-presets/issues/337))
  * Add functions missing from the presets of MXNet ([issue #332](https://github.com/bytedeco/javacpp-presets/issues/332))

diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ Each child module in turn relies on its corresponding native libraries being alr
  * flandmark 1.07  http://cmp.felk.cvut.cz/~uricamic/flandmark/#download
  * HDF5 1.10.1  https://support.hdfgroup.org/HDF5/
  * MKL 2017.2  https://software.intel.com/intel-mkl
- * OpenBLAS 0.2.19  http://www.openblas.net/
+ * OpenBLAS 0.2.20  http://www.openblas.net/
  * FFTW 3.3.6  http://www.fftw.org/download.html
  * GSL 2.4  http://www.gnu.org/software/gsl/#downloading
  * LLVM 4.0.0  http://llvm.org/releases/download.html

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

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.2.19-${project.parent.version}</version>
+      <version>0.2.20-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -65,7 +65,7 @@
           <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.2.19-${project.parent.version}</version>
+            <version>0.2.20-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
@@ -82,7 +82,7 @@
           <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.2.19-${project.parent.version}</version>
+            <version>0.2.20-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/mxnet/platform/pom.xml b/mxnet/platform/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>openblas-platform</artifactId>
-      <version>0.2.19-${project.parent.version}</version>
+      <version>0.2.20-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/mxnet/pom.xml b/mxnet/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.bytedeco.javacpp-presets</groupId>
       <artifactId>openblas</artifactId>
-      <version>0.2.19-${project.parent.version}</version>
+      <version>0.2.20-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -55,7 +55,7 @@
           <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.2.19-${project.parent.version}</version>
+            <version>0.2.20-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
@@ -66,7 +66,7 @@
           <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>openblas</artifactId>
-            <version>0.2.19-${project.parent.version}</version>
+            <version>0.2.20-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/openblas/OpenBLAS-0.2.19-android.patch b/openblas/OpenBLAS-0.2.19-android.patch
diff --git a/openblas/OpenBLAS-android.patch b/openblas/OpenBLAS-android.patch
@@ -0,0 +1,15 @@
+diff -ruN OpenBLAS-0.2.20/common.h OpenBLAS-0.2.20-android/common.h
+--- OpenBLAS-0.2.20/common.h	2017-07-24 13:03:35.000000000 +0900
++++ OpenBLAS-0.2.20-android/common.h	2017-08-23 06:08:41.651929598 +0900
+@@ -100,9 +100,9 @@
+ #ifdef OS_ANDROID
+ #define NO_SYSV_IPC
+ //Android NDK only supports complex.h since Android 5.0
+-#if __ANDROID_API__ < 21
++//#if __ANDROID_API__ < 21
+ #define FORCE_OPENBLAS_COMPLEX_STRUCT
+-#endif
++//#endif
+ #endif
+
+ #ifdef OS_WINDOWS
diff --git a/openblas/OpenBLAS-0.2.19-linux-ppc64le.patch → openblas/OpenBLAS-linux-ppc64le.patch b/openblas/OpenBLAS-0.2.19-linux-ppc64le.patch → openblas/OpenBLAS-linux-ppc64le.patch
diff --git a/openblas/OpenBLAS-0.2.19-macosx.patch → openblas/OpenBLAS-macosx.patch b/openblas/OpenBLAS-0.2.19-macosx.patch → openblas/OpenBLAS-macosx.patch
diff --git a/openblas/README.md b/openblas/README.md
@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * OpenBLAS 0.2.19  http://www.openblas.net/
+ * OpenBLAS 0.2.20  http://www.openblas.net/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -36,15 +36,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.javacpp-presets.openblas</groupId>
     <artifactId>openblas</artifactId>
-    <version>1.3</version>
+    <version>1.3.4-SNAPSHOT</version>
     <properties>
         <exec.mainClass>ExampleDGELSrowmajor</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco.javacpp-presets</groupId>
             <artifactId>openblas-platform</artifactId>
-            <version>0.2.19-1.3</version>
+            <version>0.2.20-1.3.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-OPENBLAS_VERSION=0.2.19
+OPENBLAS_VERSION=0.2.20
 
 download https://github.com/xianyi/OpenBLAS/archive/v$OPENBLAS_VERSION.tar.gz OpenBLAS-$OPENBLAS_VERSION.tar.gz
 
@@ -28,7 +28,7 @@ export NUM_THREADS=64
 export NO_AFFINITY=1
 case $PLATFORM in
     android-arm)
-        patch -Np1 < ../../../OpenBLAS-$OPENBLAS_VERSION-android.patch
+        patch -Np1 < ../../../OpenBLAS-android.patch
         export CFLAGS="--sysroot=$ANDROID_ROOT -DANDROID -fPIC -ffunction-sections -funwind-tables -fstack-protector -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300"
         export CC="$ANDROID_BIN-gcc $CFLAGS"
         export FC="$ANDROID_BIN-gfortran $CFLAGS"
@@ -43,7 +43,7 @@ case $PLATFORM in
         sed -i 's/-march=armv5/-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16/' Makefile.arm
         ;;
     android-x86)
-        patch -Np1 < ../../../OpenBLAS-$OPENBLAS_VERSION-android.patch
+        patch -Np1 < ../../../OpenBLAS-android.patch
         export CFLAGS="--sysroot=$ANDROID_ROOT -DANDROID -fPIC -ffunction-sections -funwind-tables -mssse3 -mfpmath=sse -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300"
         export CC="$ANDROID_BIN-gcc $CFLAGS"
         export FC="$ANDROID_BIN-gfortran $CFLAGS"
@@ -72,7 +72,7 @@ case $PLATFORM in
         ;;
     linux-ppc64le)
         # patch to use less buggy generic kernels
-        patch -Np1 < ../../../OpenBLAS-$OPENBLAS_VERSION-linux-ppc64le.patch
+        patch -Np1 < ../../../OpenBLAS-linux-ppc64le.patch
         export CC="$OLDCC -m64"
         export FC="$OLDFC -m64"
         export BINARY=64
@@ -85,7 +85,7 @@ case $PLATFORM in
         export TARGET=ARMV6
         ;;
     macosx-*)
-        patch -Np1 < ../../../OpenBLAS-$OPENBLAS_VERSION-macosx.patch
+        patch -Np1 < ../../../OpenBLAS-macosx.patch
         export CC="$(ls -1 /usr/local/bin/gcc-? | head -n 1)"
         export FC="$(ls -1 /usr/local/bin/gfortran-? | head -n 1)"
         export BINARY=64

diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>openblas-platform</artifactId>
-  <version>0.2.19-${project.parent.version}</version>
+  <version>0.2.20-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for OpenBLAS</name>
 
   <properties>

diff --git a/openblas/pom.xml b/openblas/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>openblas</artifactId>
-  <version>0.2.19-${project.parent.version}</version>
+  <version>0.2.20-${project.parent.version}</version>
   <name>JavaCPP Presets for OpenBLAS</name>
 
   <properties>
@@ -51,6 +51,20 @@
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>${javacpp.platform}</id>
+            <phase>package</phase>
+            <configuration>
+              <excludes>
+                <exclude>org/bytedeco/javacpp/${javacpp.platform}/*mkl*</exclude>
+                <exclude>org/bytedeco/javacpp/${javacpp.platform}/*omp*</exclude>
+                <exclude>org/bytedeco/javacpp/${javacpp.platform}/bin/*openblas*</exclude>
+                <exclude>org/bytedeco/javacpp/${javacpp.platform}/lib/*openblas*</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>