Skip to content
Snippets Groups Projects
Commit 74d6176d authored by Damian Alvarez's avatar Damian Alvarez
Browse files

Merge branch 'sk-CGNS_MED' into '2023' 

{cae,lib}[gpsmpi/2022a] CGNS/4.3.0 MED/4.1.0

See merge request software-team/easybuild!1592
parents f80a4558 bba9df4d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Golden_Repo/c/CGNS/CGNS-4.3.0-gpsmpi-2022a.eb 0 → 100644
+ 34
− 0
View file @ 74d6176d
# easyconfig file for CGNS library
easyblock = 'CMakeMake'
name = 'CGNS'
version = '4.3.0'
homepage = 'https://cgns.github.io/'
description = """The CGNS system is designed to facilitate the exchange
of data between sites and applications, and to help stabilize the archiving
of aerodynamic data."""
toolchain = {'name': 'gpsmpi', 'version': '2022a'}
toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
source_urls = ['https://github.com/CGNS/CGNS/archive/refs/tags/']
sources = ['v%(version)s.tar.gz']
checksums = ['7709eb7d99731dea0dd1eff183f109eaef8d9556624e3fbc34dc5177afc0a032'] # CGNS-4.3.0.tar.gz
dependencies = [
('HDF5', '1.12.2'),
]
builddependencies = [
('CMake', '3.23.1'),
]
sanity_check_paths = {
'files': ["bin/%s" % x for x in ["cgnscheck", "cgnscompress",
"cgnsconvert", "cgnsdiff", "cgnslist", "cgnsnames",
"cgnsupdate"]],
'dirs': [],
}
moduleclass = 'cae'
Golden_Repo/m/MED/MED-4.1.0-gpsmpi-2022a.eb 0 → 100644
+ 42
− 0
View file @ 74d6176d
# easyconfig file for MED Library
easyblock = 'ConfigureMake'
name = 'MED'
version = '4.1.0'
homepage = 'http://salome-platform.org/'
description = """Initially defined by EDF R&D,
this format has been defined and maintained
through a MED working group comprising members of
EDF R&D and CEA (the Code Saturne team being represented).
"""
toolchain = {'name': 'gpsmpi', 'version': '2022a'}
toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
source_urls = ['http://files.salome-platform.org/Salome/other/']
sources = ['med-%(version)s.tar.gz']
patches = [
'med-%(version)s_hdf5_v11201.patch',
'med-%(version)s_hdf5_H5Oget_info.patch',
]
checksums = [
'847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce', # med-4.1.0.tar.gz
'6176281bcead9c1d5587daa1d0a82553f3bf8071282282e31c8275700aebf761', # med-4.1.0_hdf5_v11201.patch
'ded71c03da362efffdb24dcc76e9fae3e36eb58130c70ebe2df8d05c0ec08437', # med-4.1.0_hdf5_H5Oget_info.patch
]
dependencies = [
('Python', '3.10.4'),
('SWIG', '4.0.2'),
('HDF5', '1.12.2')
]
prebuildopts = 'autoreconf -f -i && '
# better to configure these dependents explicitly
configopts = '--with-f90 '
configopts += '--with-swig=$EBROOTSWIG '
configopts += '--with-hdf5=$EBROOTHDF5 '
moduleclass = 'lib'
Golden_Repo/m/MED/med-4.1.0_hdf5_H5Oget_info.patch 0 → 100644
+ 96
− 0
View file @ 74d6176d
diff -ruN med-4.1.0-orig/src/hdfi/_MEDattributeNumWrByName.c med-4.1.0/src/hdfi/_MEDattributeNumWrByName.c
--- med-4.1.0-orig/src/hdfi/_MEDattributeNumWrByName.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDattributeNumWrByName.c 2022-01-20 18:42:35.685834000 +0100
@@ -68,7 +68,7 @@
if ( (_attid=H5Aopen_by_name( pid, path, attname, H5P_DEFAULT, H5P_DEFAULT )) >= 0 ) {
- if ( H5Oget_info( pid, &_oinfo ) <0) {
+ if ( H5Oget_info( pid, &_oinfo, H5O_INFO_BASIC ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
goto ERROR;
}
diff -ruN med-4.1.0-orig/src/hdfi/_MEDattributeNumWr.c med-4.1.0/src/hdfi/_MEDattributeNumWr.c
--- med-4.1.0-orig/src/hdfi/_MEDattributeNumWr.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDattributeNumWr.c 2022-01-20 18:42:47.171221000 +0100
@@ -77,7 +77,7 @@
if ( (_attid=H5Aopen( pid, attname, H5P_DEFAULT )) >= 0 ) {
- if ( H5Oget_info( pid, &_oinfo ) <0) {
+ if ( H5Oget_info( pid, &_oinfo, H5O_INFO_BASIC ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info");
goto ERROR;
}
diff -ruN med-4.1.0-orig/src/hdfi/_MEDcheckAttributeStringFunc.c med-4.1.0/src/hdfi/_MEDcheckAttributeStringFunc.c
--- med-4.1.0-orig/src/hdfi/_MEDcheckAttributeStringFunc.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDcheckAttributeStringFunc.c 2022-01-20 18:23:28.503780000 +0100
@@ -40,7 +40,7 @@
oinfo.type=H5G_LINK;
break;
case H5L_TYPE_HARD:
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -ruN med-4.1.0-orig/src/hdfi/_MEDchecknSublinkFunc.c med-4.1.0/src/hdfi/_MEDchecknSublinkFunc.c
--- med-4.1.0-orig/src/hdfi/_MEDchecknSublinkFunc.c 2020-03-11 10:36:36.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDchecknSublinkFunc.c 2022-01-20 18:22:11.761793000 +0100
@@ -41,7 +41,7 @@
oinfo.type=H5G_LINK;
break;
case H5L_TYPE_HARD:
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -ruN med-4.1.0-orig/src/hdfi/_MEDdatagroupExist.c med-4.1.0/src/hdfi/_MEDdatagroupExist.c
--- med-4.1.0-orig/src/hdfi/_MEDdatagroupExist.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDdatagroupExist.c 2022-01-20 18:22:51.586949000 +0100
@@ -45,7 +45,7 @@
case H5L_TYPE_HARD:
*isasoftlink = MED_FALSE;
- if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( gid, datagroupname, &_oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE( datagroupname);
}
diff -ruN med-4.1.0-orig/src/hdfi/_MEDdatasetExist.c med-4.1.0/src/hdfi/_MEDdatasetExist.c
--- med-4.1.0-orig/src/hdfi/_MEDdatasetExist.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDdatasetExist.c 2022-01-20 18:22:38.394310000 +0100
@@ -47,7 +47,7 @@
case H5L_TYPE_HARD:
*isasoftlink = MED_FALSE;
- if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( gid, datasetname, &_oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE( datasetname);
}
diff -ruN med-4.1.0-orig/src/hdfi/_MEDlinkObjs.c med-4.1.0/src/hdfi/_MEDlinkObjs.c
--- med-4.1.0-orig/src/hdfi/_MEDlinkObjs.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDlinkObjs.c 2022-01-20 18:22:25.480007000 +0100
@@ -62,7 +62,7 @@
sur un lien hard
Sur un lien soft H5O_TYPE_UNKNOWN
*/
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
diff -ruN med-4.1.0-orig/tools/medimport/2.3.6/_MEDconvertStringDatasets.c med-4.1.0/tools/medimport/2.3.6/_MEDconvertStringDatasets.c
--- med-4.1.0-orig/tools/medimport/2.3.6/_MEDconvertStringDatasets.c 2020-03-11 10:36:40.000000000 +0100
+++ med-4.1.0/tools/medimport/2.3.6/_MEDconvertStringDatasets.c 2022-01-20 18:23:07.202747000 +0100
@@ -52,7 +52,7 @@
oinfo.type=(H5O_type_t) H5G_LINK;
break;
case H5L_TYPE_HARD:
- if ( H5Oget_info_by_name( id, lname, &oinfo, H5P_DEFAULT ) <0) {
+ if ( H5Oget_info_by_name( id, lname, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT ) <0) {
MED_ERR_(_ret,MED_ERR_CALL,MED_ERR_API,"H5Oget_info_by_name");
SSCRUTE(lname);
}
Golden_Repo/m/MED/med-4.1.0_hdf5_v11201.patch 0 → 100644
+ 126
− 0
View file @ 74d6176d
diff -ruN med-4.1.0-orig/config/cmake_files/medMacros.cmake med-4.1.0/config/cmake_files/medMacros.cmake
--- med-4.1.0-orig/config/cmake_files/medMacros.cmake 2020-01-30 17:04:19.000000000 +0100
+++ med-4.1.0/config/cmake_files/medMacros.cmake 2021-12-19 17:43:22.912215417 +0100
@@ -447,7 +447,7 @@
##
## Requires 1.10.x version
##
- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
+ IF (HDF5_VERSION VERSION_LESS 1.10.2)
MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
ENDIF()
##
diff -ruN med-4.1.0-orig/src/hdfi/_MEDfileCreate.c med-4.1.0/src/hdfi/_MEDfileCreate.c
--- med-4.1.0-orig/src/hdfi/_MEDfileCreate.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDfileCreate.c 2021-12-19 17:45:54.776831000 +0100
@@ -159,7 +159,7 @@
* En HDF5-1.10.0p1 cela n'a aucun effet !
* Un test autoconf permet de fixer un intervalle de version HDF à MED.
*/
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
diff -ruN med-4.1.0-orig/src/hdfi/_MEDfileOpen.c med-4.1.0/src/hdfi/_MEDfileOpen.c
--- med-4.1.0-orig/src/hdfi/_MEDfileOpen.c 2020-03-12 16:27:49.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDfileOpen.c 2021-12-19 17:47:06.339960000 +0100
@@ -72,7 +72,7 @@
• The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
*/
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
/* L'avantage de bloquer le modèle interne HDF5
diff -ruN med-4.1.0-orig/src/hdfi/_MEDmemFileOpen.c med-4.1.0/src/hdfi/_MEDmemFileOpen.c
--- med-4.1.0-orig/src/hdfi/_MEDmemFileOpen.c 2020-03-11 11:06:04.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDmemFileOpen.c 2021-12-19 17:47:36.424414488 +0100
@@ -434,7 +434,7 @@
goto ERROR;
}
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
diff -ruN med-4.1.0-orig/src/hdfi/_MEDparFileCreate.c med-4.1.0/src/hdfi/_MEDparFileCreate.c
--- med-4.1.0-orig/src/hdfi/_MEDparFileCreate.c 2020-03-11 10:36:37.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDparFileCreate.c 2021-12-19 17:48:04.197197000 +0100
@@ -64,7 +64,7 @@
* En HDF5-1.10.0p1 cela n'a aucun effet !
* Un test autoconf permet de fixer un intervalle de version HDF à MED.
*/
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
diff -ruN med-4.1.0-orig/src/hdfi/_MEDparFileOpen.c med-4.1.0/src/hdfi/_MEDparFileOpen.c
--- med-4.1.0-orig/src/hdfi/_MEDparFileOpen.c 2020-03-11 10:36:36.000000000 +0100
+++ med-4.1.0/src/hdfi/_MEDparFileOpen.c 2021-12-19 17:48:23.560680000 +0100
@@ -55,7 +55,7 @@
MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
goto ERROR;
}
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to change the compatibility version of the library !"
#endif
if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
diff -ruN med-4.1.0-orig/config/med_check_hdf5.m4 med-4.1.0/config/med_check_hdf5.m4
--- med-4.1.0-orig/config/med_check_hdf5.m4 2020-03-11 10:36:32.000000000 +0100
+++ med-4.1.0/config/med_check_hdf5.m4 2022-01-20 15:31:06.868449943 +0100
@@ -133,8 +133,9 @@
H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
- HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
- test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && AC_MSG_ERROR([
+ # HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
+ HDF5_VERSION="11201"
+ test "0${HDF5_VERSION}" -gt "11210" || test "0${HDF5_VERSION}" -lt "11002" && AC_MSG_ERROR([
This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
diff -ruN med-4.1.0-orig/configure med-4.1.0/configure
--- med-4.1.0-orig/configure 2020-03-11 12:53:46.000000000 +0100
+++ med-4.1.0/configure 2022-01-20 16:07:15.956942479 +0100
@@ -7576,8 +7576,12 @@
H5_VER_MAJOR=` grep '#define *H5_VERS_MAJOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MAJOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
H5_VER_MINOR=` grep '#define *H5_VERS_MINOR' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_MINOR[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
H5_VER_RELEASE=`grep '#define *H5_VERS_RELEASE' $HDF5_ABS_PATH | sed 's/^.*H5_VERS_RELEASE[[ \t]]*\([0-9]*\)[[ \t]]*.*$/\1/g' `
- HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
- test "0${HDF5_VERSION}" -gt "11100" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
+ H5_VER_MAJOR="1"
+ H5_VER_MINOR="12"
+ H5_VER_RELEASE="1"
+ # HDF5_VERSION=` expr 10000 \* ${H5_VER_MAJOR} + 100 \* ${H5_VER_MINOR} + ${H5_VER_RELEASE} `
+ HDF5_VERSION="11201"
+ test "0${HDF5_VERSION}" -gt "11210" || test "0${HDF5_VERSION}" -lt "11002" && as_fn_error $? "
This HDF5 version ${H5_VER_MAJOR}.${H5_VER_MINOR}.${H5_VER_RELEASE} must not be used with med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE}.
The HDF5 library version used by med-fichier${MED_NUM_MAJEUR}.y.z MUST NOT be > 1.10 and have to be at least HDF${HDF_VERSION_REF}.
DO NOT TRY TO COMPILE med-fichier${MED_NUM_MAJEUR}.${MED_NUM_MINEUR}.${MED_NUM_RELEASE} version with an HDF5 library which would generate an hdf5 file not compliant with HDF5-${HDF_VERSION_MAJOR_REF}.${HDF_VERSION_MINOR_REF}.z library.
diff -ruN med-4.1.0-orig/src/ci/MEDfileCompatibility.c med-4.1.0/src/ci/MEDfileCompatibility.c
--- med-4.1.0-orig/src/ci/MEDfileCompatibility.c 2020-03-11 10:36:34.000000000 +0100
+++ med-4.1.0/src/ci/MEDfileCompatibility.c 2022-01-20 16:10:40.474811000 +0100
@@ -71,7 +71,7 @@
_hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
/* ISCRUTE(_hversionMMR); */
/* ISCRUTE(HDF_VERSION_NUM_REF); */
- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
+ if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
/* TODO : Vérifier si la version mineure HDF du fichier est supérieure
à la version mineure de la bibliothèque HDF utilisée :
@@ -113,7 +113,7 @@
#if MED_NUM_MAJEUR != 4
#error "Don't forget to update the test version here when you change the major version of the library !"
#endif
-#if H5_VERS_MINOR > 10
+#if H5_VERS_MINOR > 12
#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
#error "Cf. _MEDfileCreate ..."
#endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment