Skip to content
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

Jump to bottom

fix OpenFOAM easyblock to support installation on Arm/aarch64 systems #2162

Merged
merged 3 commits into from
Sep 7, 2020
Merged

fix OpenFOAM easyblock to support installation on Arm/aarch64 systems #2162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74b8489
Different OpenFOAM variants are... different.
terjekv Sep 3, 2020
5bee786
Merge branch 'develop' into aarch64_support_for_openfoam_v2
terjekv Sep 3, 2020
3e41455
Fix merge with develop.
terjekv Sep 3, 2020
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
12 changes: 10 additions & 2 deletions easybuild/easyblocks/o/openfoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
from easybuild.tools.filetools import adjust_permissions, apply_regex_substitutions, mkdir
from easybuild.tools.modules import get_software_root, get_software_version
from easybuild.tools.run import run_cmd, run_cmd_qa
from easybuild.tools.systemtools import get_shared_lib_ext
from easybuild.tools.systemtools import get_shared_lib_ext, get_cpu_architecture, AARCH64


class EB_OpenFOAM(EasyBlock):
Expand Down Expand Up @@ -364,7 +364,15 @@ def sanity_check_step(self):
else:
int_size = ''

psubdir = "linux64%sDP%s%s" % (self.wm_compiler, int_size, self.build_type)
archpart = '64'
if get_cpu_architecture() == AARCH64:
# Variants have different abbreviations for ARM64...
if self.looseversion < LooseVersion("100"):
archpart = 'Arm64'
else:
archpart = 'ARM64'

psubdir = "linux%s%sDP%s%s" % (archpart, self.wm_compiler, int_size, self.build_type)

openfoam_extend_v3 = 'extend' in self.name.lower() and self.looseversion >= LooseVersion('3.0')
if openfoam_extend_v3 or self.looseversion < LooseVersion("2"):
Expand Down