Skip to content

Instantly share code, notes, and snippets.

@jedbrown
Created April 28, 2020 05:05
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jedbrown/527ef81ff59a0dccf833da40fdd15a47 to your computer and use it in GitHub Desktop.
Save jedbrown/527ef81ff59a0dccf833da40fdd15a47 to your computer and use it in GitHub Desktop.
med-openmpi with hdf5-1.12
diff --git c/config/cmake_files/medMacros.cmake w/config/cmake_files/medMacros.cmake
index b79f387..7c82cec 100644
--- c/config/cmake_files/medMacros.cmake
+++ w/config/cmake_files/medMacros.cmake
@@ -398,7 +398,7 @@ MACRO(MED_FIND_HDF5)
##
## 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 --git c/src/ci/MEDfileCompatibility.c w/src/ci/MEDfileCompatibility.c
index b5c42d1..d94e6a8 100644
--- c/src/ci/MEDfileCompatibility.c
+++ w/src/ci/MEDfileCompatibility.c
@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename,
_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érieur
à la version mineure de la bibliothèque HDF utilisée */
diff --git c/src/hdfi/_MEDfileCreate.c w/src/hdfi/_MEDfileCreate.c
index 34c75cc..66073c1 100644
--- c/src/hdfi/_MEDfileCreate.c
+++ w/src/hdfi/_MEDfileCreate.c
@@ -84,7 +84,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
* 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 --git c/src/hdfi/_MEDfileOpen.c w/src/hdfi/_MEDfileOpen.c
index 7d0b798..6a7de9a 100644
--- c/src/hdfi/_MEDfileOpen.c
+++ w/src/hdfi/_MEDfileOpen.c
@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
• 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 --git c/src/hdfi/_MEDmemFileOpen.c w/src/hdfi/_MEDmemFileOpen.c
index 9449cda..a3f4adc 100644
--- c/src/hdfi/_MEDmemFileOpen.c
+++ w/src/hdfi/_MEDmemFileOpen.c
@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
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 --git c/src/hdfi/_MEDparFileCreate.c w/src/hdfi/_MEDparFileCreate.c
index c6d9f44..b3b2a41 100644
--- c/src/hdfi/_MEDparFileCreate.c
+++ w/src/hdfi/_MEDparFileCreate.c
@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
* 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 --git c/src/hdfi/_MEDparFileOpen.c w/src/hdfi/_MEDparFileOpen.c
index 0100729..dfad95c 100644
--- c/src/hdfi/_MEDparFileOpen.c
+++ w/src/hdfi/_MEDparFileOpen.c
@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
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 ) ) {
# Maintainer: nim65s
# Former Maintainer: Joey Dumont <joey.dumont@gmail.com>
# Contributor: simonp
# Contributor: Martin Ortbauer <mortbauer@gmail.com>
# Original: Michele Mocciola <mickele>
# Contributor: Brice Méalier <mealier_brice@yahoo.fr>
# Modified by: César Vecchio <cesar UNDERSTRIKE vecchio AT yahoo DOT com>
# Contributor: valandil
_pkgname='med'
pkgname=('med-openmpi' 'med-openmpi-docs')
pkgver=4.0.0
pkgrel=2
pkgdesc="Modelisation et Echanges de Donnees, i.e. Data Modelization and Exchanges - code-aster exchange module linked to hdf5"
url="https://www.salome-platform.org/downloads"
license=('LGPL')
depends=('hdf5-openmpi' 'tk' 'python')
makedepends=('gcc-fortran' 'swig' 'openmpi' 'cmake')
arch=('x86_64')
source=("http://files.salome-platform.org/Salome/other/${_pkgname}-${pkgver}.tar.gz"
"hdf5-1.12.patch")
sha256sums=('a474e90b5882ce69c5e9f66f6359c53b8b73eb448c5f631fa96e8cd2c14df004'
'82d28b6ae2ee6ceb3c6de9acb861a49741e2e759c7c556217f7d284216788206')
prepare() {
cd ${_pkgname}-${pkgver}
patch --forward --strip=1 --input="${srcdir}/hdf5-1.12.patch"
}
build() {
cd ${_pkgname}-${pkgver}
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
-DMEDFILE_USE_MPI=ON -DMEDFILE_BUILD_PYTHON=ON .
make
}
# I got 37 tests failed out of 91…
#check() {
#cd "$pkgname-$pkgver"
#make test
#}
package_med-openmpi() {
provides=('med')
conflicts=('med')
replaces=('med')
cd ${_pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
rm -rf $pkgdir/usr/share/doc
}
package_med-openmpi-docs() {
arch=('any')
depends=()
cd ${_pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
rm -rf $pkgdir/usr/share/cmake
rm -rf $pkgdir/usr/lib
rm -rf $pkgdir/usr/include
rm -rf $pkgdir/usr/bin
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment