Skip to content
Snippets Groups Projects
Commit 710658ec authored by Anke Kreuzer's avatar Anke Kreuzer
Browse files

Added Silo in 2023

parent 0c9ef379
Branches
No related tags found
No related merge requests found
easyblock = 'ConfigureMake'
name = 'Silo'
version = '4.11'
homepage = 'https://wci.llnl.gov/simulation/computer-codes/silo/'
description = 'Silo is a library for reading and writing a wide variety of scientific data to binary, disk files.'
toolchain = {'name': 'gpsmpi', 'version': '2022a'}
toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
source_urls = ['https://wci.llnl.gov/sites/wci/files/2021-09/']
sources = ['%(namelower)s-%(version)s.tgz']
patches = ['silo-4.11-fix-hdf5.patch']
checksums = [
'ab936c1f4fc158d9fdc4415965f7d9def7f4abeca596fe5a25bd8485654898ac', # silo-4.11.tgz
'62ac2c76d2a4fc6562a5cbf1e11957174858b3b238c7dc5057865db0cce8bef1', # silo-4.11-fix-hdf5.patch
]
dependencies = [
('HDF5', '1.12.2'),
('Szip', '2.1.1')
]
configopts = [
'--with-hdf5=$EBROOTHDF5/include,$EBROOTHDF5/lib --with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
'--with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
]
sanity_check_paths = {
'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a', 'lib/libsiloh5.a'],
'dirs': [],
}
moduleclass = 'data'
easyblock = 'ConfigureMake'
name = 'Silo'
version = '4.11'
homepage = 'https://wci.llnl.gov/simulation/computer-codes/silo/'
description = 'Silo is a library for reading and writing a wide variety of scientific data to binary, disk files.'
toolchain = {'name': 'ipsmpi', 'version': '2022a'}
toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
source_urls = ['https://wci.llnl.gov/sites/wci/files/2021-09/']
sources = ['%(namelower)s-%(version)s.tgz']
patches = ['silo-4.11-fix-hdf5.patch']
checksums = [
'ab936c1f4fc158d9fdc4415965f7d9def7f4abeca596fe5a25bd8485654898ac', # silo-4.11.tgz
'62ac2c76d2a4fc6562a5cbf1e11957174858b3b238c7dc5057865db0cce8bef1', # silo-4.11-fix-hdf5.patch
]
dependencies = [
('HDF5', '1.12.2'),
('Szip', '2.1.1')
]
configopts = [
'--with-hdf5=$EBROOTHDF5/include,$EBROOTHDF5/lib --with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
'--with-szlib=$EBROOTSZIP/lib --enable-shared --disable-silex',
]
sanity_check_paths = {
'files': ['bin/browser', 'bin/silock', 'bin/silodiff', 'bin/silofile', 'lib/libsilo.a', 'lib/libsiloh5.a'],
'dirs': [],
}
moduleclass = 'data'
diff --git a/src/hdf5_drv/H5FDsilo.c b/src/hdf5_drv/H5FDsilo.c
--- a/src/hdf5_drv/H5FDsilo.c
+++ b/src/hdf5_drv/H5FDsilo.c
@@ -243,6 +243,12 @@
return tmp;
}
+#if HDF5_VERSION_GE(1,10,8)
+#define H5EPR_SEMI_COLON ;
+#else
+#define H5EPR_SEMI_COLON
+#endif
+
#ifdef H5_HAVE_SNPRINTF
#define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno) \
@@ -252,13 +258,13 @@
snprintf(msg, sizeof(msg), Msg "(errno=%d, \"%s\")", \
Errno, strerror(Errno)); \
ret_value = Ret; \
- H5Epush_ret(Func, Cls, Maj, Min, msg, Ret) \
+ H5Epush_ret(Func, Cls, Maj, Min, msg, Ret) H5EPR_SEMI_COLON \
}
#else
#define H5E_PUSH_HELPER(Func,Cls,Maj,Min,Msg,Ret,Errno) \
{ \
ret_value = Ret; \
- H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret) \
+ H5Epush_ret(Func, Cls, Maj, Min, Msg, Ret) H5EPR_SEMI_COLON \
}
#endif
@@ -1355,7 +1368,7 @@
assert(sizeof(hsize_t)<=8);
memcpy(p, &file->block_size, sizeof(hsize_t));
if (H5Tconvert(H5T_NATIVE_HSIZE, H5T_STD_U64LE, 1, buf+8, NULL, H5P_DEFAULT)<0)
- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
+ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) H5EPR_SEMI_COLON
return 0;
}
@@ -1383,14 +1396,14 @@
/* Make sure the name/version number is correct */
if (strcmp(name, "LLNLsilo"))
- H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1)
+ H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid silo superblock", -1) H5EPR_SEMI_COLON
buf += 8;
/* Decode block size */
assert(sizeof(hsize_t)<=8);
memcpy(x, buf, 8);
if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HSIZE, 1, x, NULL, H5P_DEFAULT)<0)
- H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1)
+ H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1) H5EPR_SEMI_COLON
ap = (hsize_t*)x;
/*file->block_size = *ap; ignore stored value for now */
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment