Skip to content

Commit 80f0790

Browse files
authored
Merge pull request #547 from asenyaev/asen/lapack_issue
Fix lapack issue #534
2 parents 4b49e0b + 1d6e034 commit 80f0790

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

scripts/build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ echo $ENABLE_CONTRIB > contrib.enabled
1515
echo $ENABLE_HEADLESS > headless.enabled
1616
set -x
1717
build_wheel $REPO_DIR $PLAT
18+
rm wheelhouse/numpy*

setup.py

+6
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ def main():
151151
"-DBUILD_PERF_TESTS=OFF",
152152
"-DBUILD_DOCS=OFF",
153153
]
154+
+ (
155+
# If it is not defined 'linker flags: /machine:X86' on Windows x64
156+
["-DCMAKE_GENERATOR_PLATFORM=x64"]
157+
if x64 and sys.platform == "win32"
158+
else []
159+
)
154160
+ (
155161
["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")]
156162
if build_contrib

travis_config.sh

+9
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ function pre_build {
9292
echo "Starting pre-build"
9393
set -e -o pipefail
9494

95+
if [ -n "$IS_OSX" ]; then
96+
brew install lapack
97+
else
98+
# epel-release need for aarch64 to get openblas packages
99+
yum install -y lapack-devel epel-release && yum install -y openblas-devel
100+
cp /usr/include/lapacke/lapacke*.h /usr/include/
101+
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h
102+
fi
103+
95104
if [ -n "$IS_OSX" ]; then
96105
echo "Running for OSX"
97106

0 commit comments

Comments
 (0)