* Map missing cblas_?axpby() functions in presets for MKL (issue #…

…1326)
bytedeco · Feb 22, 2023 · dabd151 · dabd151
1 parent bb99d74
commit dabd151
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Map missing `cblas_?axpby()` functions in presets for MKL ([issue #1326](https://github.com/bytedeco/javacpp-presets/issues/1326))
  * Prefix with "fisheye" all functions from the `cv::fisheye::` namespace to avoid collisions ([pull #1324](https://github.com/bytedeco/javacpp-presets/pull/1324))
  * Remove mapping for platform-dependent `enum` values in presets for libffi ([pull #1318](https://github.com/bytedeco/javacpp-presets/pull/1318))
  * Fix mapping of `cv::fisheye::calibrate()` function from `opencv_calib3d` ([issue #1185](https://github.com/bytedeco/javacpp-presets/issues/1185))

diff --git a/mkl/src/gen/java/org/bytedeco/mkl/global/mkl_rt.java b/mkl/src/gen/java/org/bytedeco/mkl/global/mkl_rt.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.8: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.9-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.mkl.global;
 
@@ -1062,7 +1062,12 @@ public static native void cblas_saxpy(int N, float alpha, @Const FloatBuffer X,
                  int incX, FloatBuffer Y, int incY);
 public static native void cblas_saxpy(int N, float alpha, @Const float[] X,
                  int incX, float[] Y, int incY);
-
+public static native void cblas_saxpby(int N, float alpha, @Const FloatPointer X,
+                  int incX, float beta, FloatPointer Y, int incY);
+public static native void cblas_saxpby(int N, float alpha, @Const FloatBuffer X,
+                  int incX, float beta, FloatBuffer Y, int incY);
+public static native void cblas_saxpby(int N, float alpha, @Const float[] X,
+                  int incX, float beta, float[] Y, int incY);
 public static native void cblas_saxpyi(int N, float alpha, @Const FloatPointer X,
                   @Const IntPointer indx, FloatPointer Y);
 public static native void cblas_saxpyi(int N, float alpha, @Const FloatBuffer X,
@@ -1109,7 +1114,12 @@ public static native void cblas_daxpy(int N, double alpha, @Const DoubleBuffer X
                  int incX, DoubleBuffer Y, int incY);
 public static native void cblas_daxpy(int N, double alpha, @Const double[] X,
                  int incX, double[] Y, int incY);
-
+public static native void cblas_daxpby(int N, double alpha, @Const DoublePointer X,
+                  int incX, double beta, DoublePointer Y, int incY);
+public static native void cblas_daxpby(int N, double alpha, @Const DoubleBuffer X,
+                  int incX, double beta, DoubleBuffer Y, int incY);
+public static native void cblas_daxpby(int N, double alpha, @Const double[] X,
+                  int incX, double beta, double[] Y, int incY);
 public static native void cblas_daxpyi(int N, double alpha, @Const DoublePointer X,
                   @Const IntPointer indx, DoublePointer Y);
 public static native void cblas_daxpyi(int N, double alpha, @Const DoubleBuffer X,
@@ -1144,7 +1154,8 @@ public static native void cblas_ccopy(int N, @Const Pointer X, int incX,
                  Pointer Y, int incY);
 public static native void cblas_caxpy(int N, @Const Pointer alpha, @Const Pointer X,
                  int incX, Pointer Y, int incY);
-
+public static native void cblas_caxpby(int N, @Const Pointer alpha, @Const Pointer X,
+                  int incX, @Const Pointer beta, Pointer Y, int incY);
 public static native void cblas_caxpyi(int N, @Const Pointer alpha, @Const Pointer X,
                   @Const IntPointer indx, Pointer Y);
 public static native void cblas_caxpyi(int N, @Const Pointer alpha, @Const Pointer X,
@@ -1179,7 +1190,8 @@ public static native void cblas_zcopy(int N, @Const Pointer X, int incX,
                  Pointer Y, int incY);
 public static native void cblas_zaxpy(int N, @Const Pointer alpha, @Const Pointer X,
                  int incX, Pointer Y, int incY);
-
+public static native void cblas_zaxpby(int N, @Const Pointer alpha, @Const Pointer X,
+                  int incX, @Const Pointer beta, Pointer Y, int incY);
 public static native void cblas_zaxpyi(int N, @Const Pointer alpha, @Const Pointer X,
                   @Const IntPointer indx, Pointer Y);
 public static native void cblas_zaxpyi(int N, @Const Pointer alpha, @Const Pointer X,

diff --git a/mkl/src/main/java/org/bytedeco/mkl/presets/mkl_rt.java b/mkl/src/main/java/org/bytedeco/mkl/presets/mkl_rt.java
@@ -131,7 +131,7 @@ public void map(InfoMap infoMap) {
 
                .put(new Info("DFTI_DESCRIPTOR_DM_HANDLE").valueTypes("_DFTI_DESCRIPTOR_DM").pointerTypes("@ByPtrPtr _DFTI_DESCRIPTOR_DM"))
 
-               .put(new Info("cblas_caxpby", "cblas_daxpby", "cblas_saxpby", "cblas_zaxpby", "mklfreetls", "MKLFREETLS", "MKLFreeTls",
+               .put(new Info("mklfreetls", "MKLFREETLS", "MKLFreeTls",
                              "mkl_sparse_c_create_vector", "mkl_sparse_d_create_vector", "mkl_sparse_s_create_vector", "mkl_sparse_z_create_vector",
                              "mkl_sparse_c_export_vector", "mkl_sparse_d_export_vector", "mkl_sparse_s_export_vector", "mkl_sparse_z_export_vector",
                              "mkl_sparse_destroy_vector", "mkl_sparse_c_spmspvd", "mkl_sparse_d_spmspvd", "mkl_sparse_s_spmspvd", "mkl_sparse_z_spmspvd",