only build OpenCV with IPP support on x86_64 systems#2056
Merged
boegel merged 3 commits intoeasybuilders:developfrom Jul 4, 2020
Merged
only build OpenCV with IPP support on x86_64 systems#2056boegel merged 3 commits intoeasybuilders:developfrom
boegel merged 3 commits intoeasybuilders:developfrom
Conversation
Contributor
Author
|
Without whitespace changes, it just looks like this: diff --git a/easybuild/easyblocks/o/opencv.py b/easybuild/easyblocks/o/opencv.py
index 1660b92..c6f95d5 100644
--- a/easybuild/easyblocks/o/opencv.py
+++ b/easybuild/easyblocks/o/opencv.py
@@ -38,7 +38,7 @@ from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.config import build_option
from easybuild.tools.filetools import compute_checksum, copy
from easybuild.tools.modules import get_software_libdir, get_software_root
-from easybuild.tools.systemtools import get_cpu_features, get_shared_lib_ext
+from easybuild.tools.systemtools import X86_64, get_cpu_architecture, get_cpu_features, get_shared_lib_ext
from easybuild.tools.toolchain.compiler import OPTARCH_GENERIC
@@ -68,6 +68,8 @@ class EB_OpenCV(CMakeMake):
self.pylibdir = det_pylibdir()
+ if get_cpu_architecture() == X86_64:
+ # IPP are Intel's Integrated Performance Primitives - so only make sense on X86_64
ippicv_tgz = glob.glob(os.path.join(self.builddir, 'ippicv*.tgz'))
if ippicv_tgz:
if len(ippicv_tgz) == 1:
@@ -85,7 +87,8 @@ class EB_OpenCV(CMakeMake):
if LooseVersion(self.version) >= LooseVersion('3.4.4'):
self.cfg.update('configopts', '-DOPENCV_DOWNLOAD_PATH=%s' % self.builddir)
else:
- raise EasyBuildError("Found multiple ippicv*.tgz source tarballs in %s: %s", self.builddir, ippicv_tgz)
+ raise EasyBuildError("Found multiple ippicv*.tgz source tarballs in %s: %s",
+ self.builddir, ippicv_tgz)
def configure_step(self):
"""Custom configuration procedure for OpenCV.""" |
Member
|
Tested and approved, sorry for the holdup on this one @edmondac! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a small change to exclude trying to build OpenCV using the Intel Integrated Performance Primitives on non-X86 systems.