diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b5b559e6..58cfce29ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ - * Add `openblas_full` class giving access to all of OpenBLAS ([pull #1571](https://github.com/bytedeco/javacpp-presets/pull/1571)) + * Add `openblas_full` class giving access to all of OpenBLAS ([pull #1572](https://github.com/bytedeco/javacpp-presets/pull/1572)) * Introduce `macosx-arm64` builds for ARPACK-NG, CMINPACK, FFTW, GSL, TensorFlow Lite, ONNX, ONNX Runtime ([issue #1069](https://github.com/bytedeco/javacpp-presets/issues/1069)) * Upgrade presets for OpenCV 4.11.0, DNNL 3.6.2, CPython 3.13.1, NumPy 2.2.1, SciPy 1.15.1, LLVM 19.1.6, ONNX Runtime 1.20.1 diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_full.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_full.java index 87be7ee2ce..95c05aff37 100644 --- a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_full.java +++ b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_full.java @@ -41,5 +41,4 @@ public class openblas_full extends openblas { @Override public void map(InfoMap infoMap) { openblas_nolapack.mapCommon(infoMap); } - } diff --git a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java index 1a254fbf4d..6fa486c152 100644 --- a/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java +++ b/openblas/src/main/java/org/bytedeco/openblas/presets/openblas_nolapack.java @@ -130,13 +130,11 @@ static void mapCommon(InfoMap infoMap) { } @Override public void map(InfoMap infoMap) { - mapCommon(infoMap); String[] functions = { // not available in Accelerate - "cblas_caxpby", "cblas_daxpby", "cblas_saxpby", "cblas_zaxpby", - "cblas_caxpyc", "cblas_zaxpyc", + "cblas_caxpby", "cblas_daxpby", "cblas_saxpby", "cblas_zaxpby", "cblas_caxpyc", "cblas_zaxpyc", "cblas_sgemmt", "cblas_dgemmt", "cblas_cgemmt", "cblas_zgemmt", "cblas_cgemm_batch", "cblas_dgemm_batch", "cblas_sgemm_batch", "cblas_zgemm_batch", "cblas_samax", "cblas_damax", "cblas_scamax", "cblas_dzamax", @@ -168,7 +166,6 @@ static void mapCommon(InfoMap infoMap) { "cgbrfsx", "cporfsx", "dgerfsx", "sgbrfsx", "ssyrfsx", "zherfsx", "cgerfsx", "csyrfsx", "dporfsx", "sgerfsx", "zgbrfsx", "zporfsx", "cherfsx", "dgbrfsx", "dsyrfsx", "sporfsx", "zgerfsx", "zsyrfsx", "cgbsvxx", "cposvxx", "dgesvxx", "sgbsvxx", "ssysvxx", "zhesvxx", "cgesvxx", "csysvxx", "dposvxx", "sgesvxx", "zgbsvxx", "zposvxx", "chesvxx", "dgbsvxx", "dsysvxx", "sposvxx", "zgesvxx", "zsysvxx"}; - for (String f : functions) { infoMap.put(new Info(f, "LAPACK_" + f, "LAPACK_" + f + "_base", "LAPACKE_" + f, "LAPACKE_" + f + "_work").skip()); }