Skip to content

Commit 49ea8ba

Browse files
authored
Merge pull request #4207 from jngrad/eb_espresso
Allow installing ESPResSo from a commit
2 parents a68071f + e90e2f1 commit 49ea8ba

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

easybuild/easyblocks/e/espresso.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def _set_configure_options_release_500(self):
143143
self.cfg.update('configopts', f"-DESPRESSO_BUILD_WITH_{dep.upper()}={dep_flag}")
144144

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

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

166166
version = self._get_version()
167-
if version[:2] >= (5, 0):
167+
if version == 'commit' or version[:2] >= (5, 0):
168168
self._set_configure_options_release_500()
169169
elif version[:2] >= (4, 2):
170170
self._set_configure_options_release_420()
@@ -240,7 +240,7 @@ def sanity_check_step(self):
240240
version = self._get_version()
241241

242242
# libraries
243-
if version[:2] >= (5, 0):
243+
if version == 'commit' or version[:2] >= (5, 0):
244244
_libs = [
245245
'espresso_core', 'espresso_shapes', 'espresso_walberla',
246246
'espresso_script_interface', 'script_interface', 'utils', '_init',
@@ -259,19 +259,19 @@ def sanity_check_step(self):
259259
'constraints.py', 'electrostatics.py', 'magnetostatics.py',
260260
'observables.py', 'reaction_methods.py',
261261
]
262-
if version[:2] >= (5, 0):
262+
if version == 'commit' or version[:2] >= (5, 0):
263263
_extra_python_modules = [
264264
'electrokinetics.py', 'lb.py', 'lees_edwards.py',
265265
'particle_data.py', 'system.py', 'thermostat.py', 'version.py',
266266
]
267267
_python_modules = sorted(_python_modules + _extra_python_modules)
268268

269269
if get_software_root('HDF5'):
270-
if version[:2] >= (5, 0):
270+
if version == 'commit' or version[:2] >= (5, 0):
271271
_libs.append('espresso_hdf5')
272272
_python_modules.append(os.path.join('io', 'writer', 'h5md.py'))
273273
if get_software_root('CUDA'):
274-
if version[:2] >= (5, 0):
274+
if version == 'commit' or version[:2] >= (5, 0):
275275
_python_modules.append('cuda_init.py')
276276
else:
277277
_libs.append('cuda_init')

0 commit comments

Comments
 (0)