Commit 55052539 authored by Jerome Soumagne's avatar Jerome Soumagne
Browse files

Remove hdf5 package now that 1.12.0 is upstream

Fix hdf5-rados package
parent 4037b175
......@@ -19,8 +19,8 @@ class Hdf5Rados(CMakePackage):
variant('mobject', default=True, description='Use mobject')
depends_on('cmake@2.8.12.2:', type='build')
depends_on('mobject-store', when='+mobject')
depends_on('hdf5@extvol-develop+mpi')
depends_on('mobject', when='+mobject')
depends_on('hdf5@1.12.0:+mpi')
def cmake_args(self):
"""Populate cmake arguments for HDF5 RADOS."""
......
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index dd2b171..629418a 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -142,10 +142,7 @@ MODULE H5GLOBAL
INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types
EQUIVALENCE (predef_types(1), H5T_NATIVE_INTEGER_KIND(1))
- EQUIVALENCE (predef_types(2), H5T_NATIVE_INTEGER_KIND(2))
- EQUIVALENCE (predef_types(3), H5T_NATIVE_INTEGER_KIND(3))
- EQUIVALENCE (predef_types(4), H5T_NATIVE_INTEGER_KIND(4))
- EQUIVALENCE (predef_types(5), H5T_NATIVE_INTEGER_KIND(5))
+ ! EQUIVALENCE predef_types(2:5) are unnecessary and violate the standard
EQUIVALENCE (predef_types(6), H5T_NATIVE_INTEGER)
EQUIVALENCE (predef_types(7), H5T_NATIVE_REAL)
EQUIVALENCE (predef_types(8), H5T_NATIVE_DOUBLE)
# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
import shutil
import sys
import subprocess
from spack.pkg.builtin.hdf5 import Hdf5
class Hdf5(Hdf5):
version('extvol-develop', commit='474b0571462956d282331a9ee12c208d50f41032')
version('rados-develop', branch='feature/rados_vol')
version('rados-old', branch='feature/hdf5_rados')
variant('mobject', default=False, description='Enable support for MObject')
depends_on('mobject@develop', when='+mobject')
def configure_args(self):
config_args = super(Hdf5, self).configure_args()
if '+mobject' in self.spec:
pkg_config = which('pkg-config')
extra_libs = "LIBS=%s" % pkg_config('--libs-only-l', "mobject-store",
output=str).strip('\n')
config_args.append(extra_libs)
extra_cflags = "CPPFLAGS=-DHDF5_USE_MOBJECT %s" % pkg_config('--cflags',
'mobject-store', output=str).strip('\n')
config_args.append(extra_cflags)
config_args.append('--with-rados')
return config_args
diff --git a/test/th5s.c b/test/th5s.c
index 462bc36..8e18fad 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -730,8 +730,8 @@ test_h5s_zero_dim(void)
ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
CHECK(ret, FAIL, "H5Pset_chunk");
- // ret = H5Pset_alloc_time(plist_id, alloc_time);
- // CHECK(ret, FAIL, "H5Pset_alloc_time");
+ /* ret = H5Pset_alloc_time(plist_id, alloc_time); */
+ /* CHECK(ret, FAIL, "H5Pset_alloc_time"); */
dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
CHECK(dset1, FAIL, "H5Dcreate2");
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index ee6de5e..3ed6045 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -1341,8 +1341,8 @@ handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe
string_dataformat.do_escape = display_escape;
outputformat = &string_dataformat;
- //attr_name = attr + j + 1;
- // need to replace escape characters
+ /* attr_name = attr + j + 1; */
+ /* need to replace escape characters */
attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 9ce3524..3b4e5e7 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -632,7 +632,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info,
h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
}
-// ctx->need_prefix = 0;
+/* ctx->need_prefix = 0; */
}
/*-------------------------------------------------------------------------
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment