diff --git a/openblas/cppbuild.sh b/openblas/cppbuild.sh index 1768cbb205d..6da8eb989ce 100755 --- a/openblas/cppbuild.sh +++ b/openblas/cppbuild.sh @@ -58,7 +58,7 @@ case $PLATFORM in export TARGET=ATOM ;; ios-arm) - export CC="$(xcrun --sdk iphoneos --find clang) -isysroot $(xcrun --sdk iphoneos --show-sdk-path) -arch armv7" + export CC="$(xcrun --sdk iphoneos --find clang) -isysroot $(xcrun --sdk iphoneos --show-sdk-path) -arch armv7 -miphoneos-version-min=5.0" export FC= export NO_LAPACK=1 export NOFORTRAN=1 @@ -69,7 +69,9 @@ case $PLATFORM in ios-arm64) # https://gmplib.org/list-archives/gmp-bugs/2014-September/003538.html sed -i="" 's/add.sp, sp, #-(11 \* 16)/sub sp, sp, #(11 \* 16)/g' kernel/arm64/sgemm_kernel_4x4.S - export CC="$(xcrun --sdk iphoneos --find clang) -isysroot $(xcrun --sdk iphoneos --show-sdk-path) -arch arm64" + # but still results in a linking error, so disable the assembler entirely + sed -i="" 's/sgemm_kernel_4x4.S/..\/generic\/gemmkernel_2x2.c/g' kernel/arm64/KERNEL.ARMV8 + export CC="$(xcrun --sdk iphoneos --find clang) -isysroot $(xcrun --sdk iphoneos --show-sdk-path) -arch arm64 -miphoneos-version-min=5.0" export FC= export NO_LAPACK=1 export NOFORTRAN=1 @@ -78,7 +80,7 @@ case $PLATFORM in export NO_SHARED=1 ;; ios-x86) - export CC="$(xcrun --sdk iphonesimulator --find clang) -isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -arch i686" + export CC="$(xcrun --sdk iphonesimulator --find clang) -isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -arch i686 -mios-simulator-version-min=5.0" export FC= export NO_LAPACK=1 export NOFORTRAN=1 @@ -87,7 +89,7 @@ case $PLATFORM in export NO_SHARED=1 ;; ios-x86_64) - export CC="$(xcrun --sdk iphonesimulator --find clang) -isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -arch x86_64" + export CC="$(xcrun --sdk iphonesimulator --find clang) -isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -arch x86_64 -mios-simulator-version-min=5.0" export FC= export NO_LAPACK=1 export NOFORTRAN=1 diff --git a/openblas/src/main/java/org/bytedeco/javacpp/openblas.java b/openblas/src/main/java/org/bytedeco/javacpp/openblas.java index b6228d6f07d..e17aadff086 100644 --- a/openblas/src/main/java/org/bytedeco/javacpp/openblas.java +++ b/openblas/src/main/java/org/bytedeco/javacpp/openblas.java @@ -865,21 +865,13 @@ public static native void cblas_zher2k(@Cast("const CBLAS_ORDER") int Order, @Ca /*** BLAS extensions ***/ -public static native void cblas_saxpby(@Cast("const blasint") int n, float alpha, @Const FloatPointer x, @Cast("const blasint") int incx,float beta, FloatPointer y, @Cast("const blasint") int incy); -public static native void cblas_saxpby(@Cast("const blasint") int n, float alpha, @Const FloatBuffer x, @Cast("const blasint") int incx,float beta, FloatBuffer y, @Cast("const blasint") int incy); -public static native void cblas_saxpby(@Cast("const blasint") int n, float alpha, @Const float[] x, @Cast("const blasint") int incx,float beta, float[] y, @Cast("const blasint") int incy); -public static native void cblas_daxpby(@Cast("const blasint") int n, double alpha, @Const DoublePointer x, @Cast("const blasint") int incx,double beta, DoublePointer y, @Cast("const blasint") int incy); -public static native void cblas_daxpby(@Cast("const blasint") int n, double alpha, @Const DoubleBuffer x, @Cast("const blasint") int incx,double beta, DoubleBuffer y, @Cast("const blasint") int incy); -public static native void cblas_daxpby(@Cast("const blasint") int n, double alpha, @Const double[] x, @Cast("const blasint") int incx,double beta, double[] y, @Cast("const blasint") int incy); -public static native void cblas_caxpby(@Cast("const blasint") int n, @Const FloatPointer alpha, @Const FloatPointer x, @Cast("const blasint") int incx,@Const FloatPointer beta, FloatPointer y, @Cast("const blasint") int incy); -public static native void cblas_caxpby(@Cast("const blasint") int n, @Const FloatBuffer alpha, @Const FloatBuffer x, @Cast("const blasint") int incx,@Const FloatBuffer beta, FloatBuffer y, @Cast("const blasint") int incy); -public static native void cblas_caxpby(@Cast("const blasint") int n, @Const float[] alpha, @Const float[] x, @Cast("const blasint") int incx,@Const float[] beta, float[] y, @Cast("const blasint") int incy); -public static native void cblas_zaxpby(@Cast("const blasint") int n, @Const DoublePointer alpha, @Const DoublePointer x, @Cast("const blasint") int incx,@Const DoublePointer beta, DoublePointer y, @Cast("const blasint") int incy); -public static native void cblas_zaxpby(@Cast("const blasint") int n, @Const DoubleBuffer alpha, @Const DoubleBuffer x, @Cast("const blasint") int incx,@Const DoubleBuffer beta, DoubleBuffer y, @Cast("const blasint") int incy); -public static native void cblas_zaxpby(@Cast("const blasint") int n, @Const double[] alpha, @Const double[] x, @Cast("const blasint") int incx,@Const double[] beta, double[] y, @Cast("const blasint") int incy); + + + + diff --git a/openblas/src/main/java/org/bytedeco/javacpp/presets/openblas.java b/openblas/src/main/java/org/bytedeco/javacpp/presets/openblas.java index e9a8654a7eb..e65926bb6a9 100644 --- a/openblas/src/main/java/org/bytedeco/javacpp/presets/openblas.java +++ b/openblas/src/main/java/org/bytedeco/javacpp/presets/openblas.java @@ -108,6 +108,8 @@ public class openblas implements LoadEnabled, InfoMapper { .put(new Info("openblas_complex_double", "lapack_complex_double").cast().pointerTypes("DoublePointer", "DoubleBuffer", "double[]")); String[] functions = { + // not available in Accelerate + "cblas_caxpby", "cblas_daxpby", "cblas_saxpby", "cblas_zaxpby", // not exported by OpenBLAS "cblas_cgemm3m", "cblas_zgemm3m", "cblas_xerbla", // not implemented by MKL