Skip to content
Merged
Changes from all commits
Commits
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: 6 additions & 6 deletions easybuild/easyblocks/e/espresso.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def _set_configure_options_release_500(self):
self.cfg.update('configopts', f"-DESPRESSO_BUILD_WITH_{dep.upper()}={dep_flag}")

version = self._get_version()
if version[:2] < (5, 1) and get_software_root('Kokkos') and get_software_root('Cabana'):
if version != 'commit' and version[:2] < (5, 1) and get_software_root('Kokkos') and get_software_root('Cabana'):
self.cfg.update('configopts', ' -DESPRESSO_BUILD_WITH_SHARED_MEMORY_PARALLELISM=ON')

self.cfg.update('configopts', ' -DESPRESSO_BUILD_WITH_STOKESIAN_DYNAMICS=OFF')
Expand All @@ -164,7 +164,7 @@ def configure_step(self):
self._patch_fetchcontent()

version = self._get_version()
if version[:2] >= (5, 0):
if version == 'commit' or version[:2] >= (5, 0):
self._set_configure_options_release_500()
elif version[:2] >= (4, 2):
self._set_configure_options_release_420()
Expand Down Expand Up @@ -240,7 +240,7 @@ def sanity_check_step(self):
version = self._get_version()

# libraries
if version[:2] >= (5, 0):
if version == 'commit' or version[:2] >= (5, 0):
_libs = [
'espresso_core', 'espresso_shapes', 'espresso_walberla',
'espresso_script_interface', 'script_interface', 'utils', '_init',
Expand All @@ -259,19 +259,19 @@ def sanity_check_step(self):
'constraints.py', 'electrostatics.py', 'magnetostatics.py',
'observables.py', 'reaction_methods.py',
]
if version[:2] >= (5, 0):
if version == 'commit' or version[:2] >= (5, 0):
_extra_python_modules = [
'electrokinetics.py', 'lb.py', 'lees_edwards.py',
'particle_data.py', 'system.py', 'thermostat.py', 'version.py',
]
_python_modules = sorted(_python_modules + _extra_python_modules)

if get_software_root('HDF5'):
if version[:2] >= (5, 0):
if version == 'commit' or version[:2] >= (5, 0):
_libs.append('espresso_hdf5')
_python_modules.append(os.path.join('io', 'writer', 'h5md.py'))
if get_software_root('CUDA'):
if version[:2] >= (5, 0):
if version == 'commit' or version[:2] >= (5, 0):
_python_modules.append('cuda_init.py')
else:
_libs.append('cuda_init')
Expand Down