Skip to content

Update DualSPHysics sanity checks for newer version #3850

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
jfgrimm merged 3 commits into from
Jul 22, 2025
Merged

Update DualSPHysics sanity checks for newer version #3850

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7970311
Update sanity checks for newer version
WilleBell Jul 18, 2025
3a69a44
update GPU target
WilleBell Jul 18, 2025
6c54388
Add blank line
WilleBell Jul 18, 2025
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
22 changes: 18 additions & 4 deletions easybuild/easyblocks/d/dualsphysics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
from easybuild.tools.filetools import adjust_permissions
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_shell_cmd
from easybuild.tools import LooseVersion


class EB_DualSPHysics(CMakeMakeCp):
Expand Down Expand Up @@ -130,10 +131,23 @@ def sanity_check_step(self):
else:
self.dsph_target = 'CPU'

bins = ['GenCase', 'PartVTK', 'IsoSurface', 'MeasureTool', 'GenCase_MkWord', 'DualSPHysics4.0_LiquidGas',
'DualSPHysics4.0_LiquidGasCPU', 'DualSPHysics%s' % self.shortver,
'DualSPHysics%s%s' % (self.shortver, self.dsph_target), 'DualSPHysics%s_NNewtonian' % self.shortver,
'DualSPHysics%s_NNewtonianCPU' % self.shortver]
# Determine which binaries to check based on version
if LooseVersion(self.version) >= LooseVersion('5.4.0'):
bins = [
'GenCase', 'PartVTK', 'IsoSurface', 'MeasureTool',
'DualSPHysics%sCPU' % self.shortver
]
if self.dsph_target == '':
bins.append('DualSPHysics%s' % self.shortver)
else:
bins = [
'GenCase', 'PartVTK', 'IsoSurface', 'MeasureTool', 'GenCase_MkWord',
'DualSPHysics4.0_LiquidGas', 'DualSPHysics4.0_LiquidGasCPU',
'DualSPHysics%s' % self.shortver,
'DualSPHysics%s%s' % (self.shortver, self.dsph_target),
'DualSPHysics%s_NNewtonian' % self.shortver,
'DualSPHysics%s_NNewtonianCPU' % self.shortver,
]

custom_paths = {
'files': ['bin/%s_linux64' % x for x in bins],
Expand Down