Skip to content

Fix lapack issue #534 #547

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

Merged
merged 4 commits into from
Oct 7, 2021
Merged

Fix lapack issue #534 #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fedf82
Added the lapack installation
asenyaev Sep 21, 2021
3c1ea44
Changed blas to openblas and fixed flow to a proper installation
Oct 1, 2021
40e0e3b
Fixed aarch64 openblas installation
Oct 1, 2021
1d6e034
Fixed an issue when machine:X86 was defined on Windows x64
Oct 1, 2021
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
1 change: 1 addition & 0 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
rm wheelhouse/numpy*
6 changes: 6 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ def main():
"-DBUILD_PERF_TESTS=OFF",
"-DBUILD_DOCS=OFF",
]
+ (
# If it is not defined 'linker flags: /machine:X86' on Windows x64
["-DCMAKE_GENERATOR_PLATFORM=x64"]
if x64 and sys.platform == "win32"
else []
)
+ (
["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")]
if build_contrib
Expand Down
9 changes: 9 additions & 0 deletions travis_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ function pre_build {
echo "Starting pre-build"
set -e -o pipefail

if [ -n "$IS_OSX" ]; then
brew install lapack
else
# epel-release need for aarch64 to get openblas packages
yum install -y lapack-devel epel-release && yum install -y openblas-devel
cp /usr/include/lapacke/lapacke*.h /usr/include/
curl https://raw.githubusercontent.com/xianyi/OpenBLAS/v0.3.3/cblas.h -o /usr/include/cblas.h
fi

if [ -n "$IS_OSX" ]; then
echo "Running for OSX"

Expand Down