Skip to content

Commit

Permalink
Merge pull request #547 from asenyaev/asen/lapack_issue
Browse files Browse the repository at this point in the history
Fix lapack issue #534
  • Loading branch information
asenyaev committed Oct 7, 2021
2 parents 4b49e0b + 1d6e034 commit 80f0790
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions scripts/build.sh
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
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
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

0 comments on commit 80f0790

Please sign in to comment.