Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 80f0790

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

File tree

Expand file treeCollapse file tree

3 files changed

+16
-0
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+16
-0
lines changed

‎scripts/build.sh

Copy file name to clipboardExpand all lines: scripts/build.sh
+1Lines changed: 1 addition & 0 deletions
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

Copy file name to clipboardExpand all lines: setup.py
+6Lines changed: 6 additions & 0 deletions
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

Copy file name to clipboardExpand all lines: travis_config.sh
+9Lines changed: 9 additions & 0 deletions
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.