Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build OpenBlas and mkl for ios (x86_64 and aarch64) #515

Merged
merged 7 commits into from
Feb 4, 2018
Merged

Build OpenBlas and mkl for ios (x86_64 and aarch64) #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80ec6e5
Build OpenBlas and mkl for ios (x86_64 and aarch64)
johanvos Jan 29, 2018
d701fe2
Don't include mkl on ios
johanvos Jan 30, 2018
f80151d
at least start the build of openblas for ios (in case cppbuild=true)
johanvos Jan 30, 2018
16ae078
Fix build for OpenBLAS on iOS
saudet Jan 31, 2018
d01cf9a
for now, build using the Accelerate framework by default
johanvos Jan 31, 2018
4b5997b
Revert "for now, build using the Accelerate framework by default"
saudet Feb 3, 2018
ca5a989
Fix more builds for OpenBLAS on iOS and add to .travis.yml
saudet Feb 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,27 @@ matrix:
install: true
script: ./ci/install-travis.sh

- os: osx
osx_image: xcode7.3
env: PROJ=openblas OS=ios-arm
install: true
script: ./ci/install-travis.sh
- os: osx
osx_image: xcode7.3
env: PROJ=openblas OS=ios-arm64
install: true
script: ./ci/install-travis.sh
- os: osx
osx_image: xcode7.3
env: PROJ=openblas OS=ios-x86
install: true
script: ./ci/install-travis.sh
- os: osx
osx_image: xcode7.3
env: PROJ=openblas OS=ios-x86_64
install: true
script: ./ci/install-travis.sh

- os: linux
env: PROJ=opencv,flandmark OS=linux-armhf
install: true
Expand Down
40 changes: 39 additions & 1 deletion openblas/cppbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ case $PLATFORM in
export NOFORTRAN=1
fi
export BINARY=32
export TARGET=ARMV5
export TARGET=ARMV5 # to disable hard-float functions unsupported by Android
export ARM_SOFTFP_ABI=1
sed -i 's/-march=armv5/-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16/' Makefile.arm
;;
Expand All @@ -57,6 +57,44 @@ case $PLATFORM in
export BINARY=32
export TARGET=ATOM
;;
ios-arm)
export CC="$(xcrun --sdk iphoneos --find clang) -isysroot $(xcrun --sdk iphoneos --show-sdk-path) -arch armv7"
export FC=
export NO_LAPACK=1
export NOFORTRAN=1
export BINARY=32
export TARGET=ARMV5 # to disable unsupported assembler from iOS SDK
export NO_SHARED=1
;;
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"
export FC=
export NO_LAPACK=1
export NOFORTRAN=1
export BINARY=64
export TARGET=ARMV8
export NO_SHARED=1
;;
ios-x86)
export CC="$(xcrun --sdk iphonesimulator --find clang) -isysroot $(xcrun --sdk iphonesimulator --show-sdk-path) -arch i686"
export FC=
export NO_LAPACK=1
export NOFORTRAN=1
export BINARY=32
export TARGET=ATOM
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 FC=
export NO_LAPACK=1
export NOFORTRAN=1
export BINARY=64
export TARGET=ATOM
export NO_SHARED=1
;;
linux-x86)
export CC="$OLDCC -m32"
export FC="$OLDFC -m32"
Expand Down
4 changes: 3 additions & 1 deletion openblas/src/main/java/org/bytedeco/javacpp/presets/openblas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
@Platform(value = "linux-armhf", preloadpath = {"/usr/arm-linux-gnueabihf/lib/", "/usr/lib/arm-linux-gnueabihf/"}),
@Platform(value = "linux-x86", preloadpath = {"/lib32/", "/lib/", "/usr/lib32/", "/usr/lib/", "/opt/intel/lib/ia32/", "/opt/intel/mkl/lib/ia32/"}),
@Platform(value = "linux-x86_64", preloadpath = {"/lib64/", "/lib/", "/usr/lib64/", "/usr/lib/", "/opt/intel/lib/intel64/", "/opt/intel/mkl/lib/intel64/"}),
@Platform(value = "linux-ppc64", preloadpath = {"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}) })
@Platform(value = "linux-ppc64", preloadpath = {"/usr/lib/powerpc64-linux-gnu/", "/usr/lib/powerpc64le-linux-gnu/"}),
@Platform(value = "ios", include = {"openblas_config.h", "cblas.h", "blas_extra.h" /* no LAPACK */}, preload = "libopenblas")
})
public class openblas implements LoadEnabled, InfoMapper {

@Override public void init(ClassProperties properties) {
Expand Down
124 changes: 124 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,130 @@
</properties>
</profile>

<profile>
<id>javacpp-platform-ios-arm</id>
<activation>
<property>
<name>javacpp.platform</name>
<value>ios-arm</value>
</property>
</activation>
<modules>
<module>openblas</module>
</modules>
<properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
<javacpp.platform.android-x86></javacpp.platform.android-x86>
<javacpp.platform.android-x86_64></javacpp.platform.android-x86_64>
<javacpp.platform.ios-arm>${javacpp.platform}</javacpp.platform.ios-arm>
<javacpp.platform.ios-arm64></javacpp.platform.ios-arm64>
<javacpp.platform.ios-x86></javacpp.platform.ios-x86>
<javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
<javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
<javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
<javacpp.platform.linux-x86></javacpp.platform.linux-x86>
<javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
<javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
<javacpp.platform.windows-x86></javacpp.platform.windows-x86>
<javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
</properties>
</profile>

<profile>
<id>javacpp-platform-ios-arm64</id>
<activation>
<property>
<name>javacpp.platform</name>
<value>ios-arm64</value>
</property>
</activation>
<modules>
<module>openblas</module>
</modules>
<properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
<javacpp.platform.android-x86></javacpp.platform.android-x86>
<javacpp.platform.android-x86_64></javacpp.platform.android-x86_64>
<javacpp.platform.ios-arm></javacpp.platform.ios-arm>
<javacpp.platform.ios-arm64>${javacpp.platform}</javacpp.platform.ios-arm64>
<javacpp.platform.ios-x86></javacpp.platform.ios-x86>
<javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
<javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
<javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
<javacpp.platform.linux-x86></javacpp.platform.linux-x86>
<javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
<javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
<javacpp.platform.windows-x86></javacpp.platform.windows-x86>
<javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
</properties>
</profile>

<profile>
<id>javacpp-platform-ios-x86</id>
<activation>
<property>
<name>javacpp.platform</name>
<value>ios-x86</value>
</property>
</activation>
<modules>
<module>openblas</module>
</modules>
<properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
<javacpp.platform.android-x86></javacpp.platform.android-x86>
<javacpp.platform.android-x86_64></javacpp.platform.android-x86_64>
<javacpp.platform.ios-arm></javacpp.platform.ios-arm>
<javacpp.platform.ios-arm64></javacpp.platform.ios-arm64>
<javacpp.platform.ios-x86>${javacpp.platform}</javacpp.platform.ios-x86>
<javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
<javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
<javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
<javacpp.platform.linux-x86></javacpp.platform.linux-x86>
<javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
<javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
<javacpp.platform.windows-x86></javacpp.platform.windows-x86>
<javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
</properties>
</profile>

<profile>
<id>javacpp-platform-ios-x86_64</id>
<activation>
<property>
<name>javacpp.platform</name>
<value>ios-x86_64</value>
</property>
</activation>
<modules>
<module>openblas</module>
</modules>
<properties>
<javacpp.platform.android-arm></javacpp.platform.android-arm>
<javacpp.platform.android-arm64></javacpp.platform.android-arm64>
<javacpp.platform.android-x86></javacpp.platform.android-x86>
<javacpp.platform.android-x86_64></javacpp.platform.android-x86_64>
<javacpp.platform.ios-arm></javacpp.platform.ios-arm>
<javacpp.platform.ios-arm64></javacpp.platform.ios-arm64>
<javacpp.platform.ios-x86></javacpp.platform.ios-x86>
<javacpp.platform.ios-x86_64>${javacpp.platform}</javacpp.platform.ios-x86_64>
<javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
<javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
<javacpp.platform.linux-x86></javacpp.platform.linux-x86>
<javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
<javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
<javacpp.platform.windows-x86></javacpp.platform.windows-x86>
<javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
</properties>
</profile>

<profile>
<id>javacpp-platform-linux-armhf</id>
<activation>
Expand Down