Update presets for the release version of CUDA 8.0

bytedeco · Oct 9, 2016 · ef9728d · ef9728d
1 parent da8ef6d
commit ef9728d
Show file tree

Hide file tree

Showing 13 changed files with 930 additions and 519 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,13 @@
 
  * Enable CUDA in `cppbuild.sh` script for TensorFlow ([issue #294](https://github.com/bytedeco/javacpp-presets/issues/294))
- * Bundle `libgomp.so.1` in JAR files of OpenCV for the sake of some Linux distributions ([issue bytedeco/javacv#436](https://github.com/bytedeco/javacv/issues/436)
+ * Bundle `libgomp.so.1` in JAR files of OpenCV for the sake of some Linux distributions ([issue bytedeco/javacv#436](https://github.com/bytedeco/javacv/issues/436))
  * Fix `linux-armhf` and `linux-ppc64le` builds for all presets ([pull #279](https://github.com/bytedeco/javacpp-presets/pull/279))
- * Fix `libdc1394` not properly linking with `libusb-1.0` on Mac OS X ([issue bytedeco/javacv#501](https://github.com/bytedeco/javacv/issues/501)
+ * Fix `libdc1394` not properly linking with `libusb-1.0` on Mac OS X ([issue bytedeco/javacv#501](https://github.com/bytedeco/javacv/issues/501))
  * Add presets for the `bioinspired` module of OpenCV 3.1 ([pull #282](https://github.com/bytedeco/javacpp-presets/pull/282))
  * Include `tensorflow/core/graph/dot.h` header file from TensorFlow ([pull #272](https://github.com/bytedeco/javacpp-presets/pull/272))
  * Add presets for OpenBLAS/MKL ([issue #112](https://github.com/bytedeco/javacpp-presets/issues/112))
  * Make Caffe work on CPU-only machines ([issue #219](https://github.com/bytedeco/javacpp-presets/issues/219))
- * Fix loading issue with `opencv_face` ([issue bytedeco/javacv#470](https://github.com/bytedeco/javacv/issues/470)
+ * Fix loading issue with `opencv_face` ([issue bytedeco/javacv#470](https://github.com/bytedeco/javacv/issues/470))
  * Fix presets for CUDA on the `linux-ppc64le` platform
  * Upgrade presets for FFmpeg 3.1.2, x265 2.0, libvpx 1.6.0, CUDA 8.0, cuDNN 5.1, Caffe, TensorFlow 0.10.0
  * Set default options in `tensorflow/cppbuild.sh` to prevent console reads during build

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cublas.java b/cuda/src/main/java/org/bytedeco/javacpp/cublas.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.2.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 
@@ -148,7 +148,10 @@ public class cublas extends org.bytedeco.javacpp.presets.cublas {
     CUBLAS_GEMM_ALGO1         = 1,
     CUBLAS_GEMM_ALGO2         = 2,
     CUBLAS_GEMM_ALGO3         = 3,
-    CUBLAS_GEMM_ALGO4         = 4;
+    CUBLAS_GEMM_ALGO4         = 4,
+    CUBLAS_GEMM_ALGO5         = 5,
+    CUBLAS_GEMM_ALGO6         = 6,
+    CUBLAS_GEMM_ALGO7         = 7;
 
 /* For backward compatibility purposes */
 
@@ -4218,6 +4221,37 @@ public class cublas extends org.bytedeco.javacpp.presets.cublas {
                                                           int ldc,
                                                           int batchCount);
 
+public static native @Cast("cublasStatus_t") int cublasCgemm3mBatched(cublasContext handle,
+                                                          @Cast("cublasOperation_t") int transa,
+                                                          @Cast("cublasOperation_t") int transb, 
+                                                          int m,
+                                                          int n,
+                                                          int k,
+                                                          @Cast("const cuComplex*") float2 alpha, 
+                                                          @Cast("const cuComplex**") PointerPointer Aarray, 
+                                                          int lda,
+                                                          @Cast("const cuComplex**") PointerPointer Barray,
+                                                          int ldb, 
+                                                          @Cast("const cuComplex*") float2 beta, 
+                                                          @Cast("cuComplex**") PointerPointer Carray,
+                                                          int ldc,
+                                                          int batchCount);
+public static native @Cast("cublasStatus_t") int cublasCgemm3mBatched(cublasContext handle,
+                                                          @Cast("cublasOperation_t") int transa,
+                                                          @Cast("cublasOperation_t") int transb, 
+                                                          int m,
+                                                          int n,
+                                                          int k,
+                                                          @Cast("const cuComplex*") float2 alpha, 
+                                                          @Cast("const cuComplex**") @ByPtrPtr float2 Aarray, 
+                                                          int lda,
+                                                          @Cast("const cuComplex**") @ByPtrPtr float2 Barray,
+                                                          int ldb, 
+                                                          @Cast("const cuComplex*") float2 beta, 
+                                                          @Cast("cuComplex**") @ByPtrPtr float2 Carray,
+                                                          int ldc,
+                                                          int batchCount);
+
 public static native @Cast("cublasStatus_t") int cublasZgemmBatched(cublasContext handle,
                                                           @Cast("cublasOperation_t") int transa,
                                                           @Cast("cublasOperation_t") int transb, 
@@ -4378,6 +4412,26 @@ public class cublas extends org.bytedeco.javacpp.presets.cublas {
                                                                  long strideC,
                                                                  int batchCount);
 
+public static native @Cast("cublasStatus_t") int cublasCgemm3mStridedBatched(cublasContext handle,
+                                                                 @Cast("cublasOperation_t") int transa,
+                                                                 @Cast("cublasOperation_t") int transb, 
+                                                                 int m,
+                                                                 int n,
+                                                                 int k,
+                                                                 @Cast("const cuComplex*") float2 alpha,
+                                                                 @Cast("const cuComplex*") float2 A, 
+                                                                 int lda,
+                                                                 long strideA,
+                                                                 @Cast("const cuComplex*") float2 B,
+                                                                 int ldb, 
+                                                                 long strideB,
+                                                                 @Cast("const cuComplex*") float2 beta,
+                                                                 @Cast("cuComplex*") float2 C,
+                                                                 int ldc,
+                                                                 long strideC,
+                                                                 int batchCount);
+
+
 public static native @Cast("cublasStatus_t") int cublasZgemmStridedBatched(cublasContext handle,
                                                                  @Cast("cublasOperation_t") int transa,
                                                                  @Cast("cublasOperation_t") int transb,