Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1bda4e3c70 | |||
| 819ddc4704 | |||
| 3894452bc9 | |||
| 58be7a8318 | |||
| 9a06157427 | |||
| a44e2b6a05 | |||
| ac8d16c0b6 | |||
| 6c944f2b16 |
@@ -9,8 +9,6 @@
|
||||
/NEWS -text
|
||||
/README -text
|
||||
/autogen.sh -text
|
||||
/config.guess -text
|
||||
/config.sub -text
|
||||
/configure-crayxt -text
|
||||
/configure.ac -text
|
||||
/depcomp -text
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
/Makefile.in
|
||||
/aclocal.m4
|
||||
/autom4te.cache
|
||||
/build
|
||||
/config.h.in
|
||||
/configure
|
||||
doc/Makefile.in
|
||||
/ltmain.sh
|
||||
/m4
|
||||
src/H5PartF.h
|
||||
src/Makefile.in
|
||||
test/Makefile.in
|
||||
tools/Makefile.in
|
||||
@@ -1,5 +1,3 @@
|
||||
# Trial by Antino Kim
|
||||
# Top level Makefile.am
|
||||
ACLOCAL_AMFLAGS=-I m4
|
||||
|
||||
SUBDIRS = \
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
#### H5PART 1.6.4 ############################################################
|
||||
|
||||
Fixed bug where H5PartSetViewIndices was not setting an empty view when the
|
||||
number of elements is 0.
|
||||
|
||||
Set a threshold on the HDF5 alignment parameter so that small metadata writes
|
||||
are not aligned, which causes large gaps in the file.
|
||||
|
||||
#### H5PART 1.6.3 ############################################################
|
||||
|
||||
New build system uses libtool and can build shared libraries.
|
||||
|
||||
+26
-32
@@ -1,54 +1,48 @@
|
||||
#!/bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
|
||||
ACLOCAL_FLAGS="-I m4 $ACLOCAL_FLAGS"
|
||||
LIBTOOLIZE_FLAGS="--force $LIBTOOLIZE_FLAGS"
|
||||
AUTOMAKE_FLAGS="--add-missing --copy --foreign $AUTOMAKE_FLAGS"
|
||||
|
||||
LIBTOOLIZE=`which libtoolize`
|
||||
if [ "$LIBTOOLIZE" = "" ]; then
|
||||
LIBTOOLIZE=`which glibtoolize`
|
||||
fi
|
||||
if [ "$LIBTOOLIZE" = "" ]; then
|
||||
echo "libtoolize not found" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "+ making misc files ..."
|
||||
touch NEWS README AUTHORS ChangeLog
|
||||
echo
|
||||
echo
|
||||
$LIBTOOLIZE $LIBTOOLIZE_FLAGS || {
|
||||
echo "libtoolize failed"
|
||||
exit 1
|
||||
}
|
||||
echo
|
||||
echo "+ running aclocal ..."
|
||||
aclocal $ACLOCAL_FLAGS || {
|
||||
echo
|
||||
echo "aclocal failed - check that all needed development files are present on system"
|
||||
exit 1
|
||||
echo "aclocal failed - check that all needed development files are present on system"
|
||||
exit 1
|
||||
}
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
echo "+ running autoheader ... "
|
||||
autoheader || {
|
||||
echo
|
||||
echo "autoheader failed"
|
||||
exit 1
|
||||
echo "autoheader failed"
|
||||
exit 1
|
||||
}
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
echo "+ running libtoolize ... "
|
||||
libtoolize --force || {
|
||||
echo
|
||||
echo "libtoolize failed"
|
||||
exit 1
|
||||
}
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
echo "+ running autoconf ... "
|
||||
autoconf || {
|
||||
echo
|
||||
echo "autoconf failed"
|
||||
exit 1
|
||||
echo "autoconf failed"
|
||||
exit 1
|
||||
}
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
echo "+ running automake ... "
|
||||
automake -a -c --foreign || {
|
||||
echo
|
||||
echo "automake failed"
|
||||
exit 1
|
||||
automake $AUTOMAKE_FLAGS || {
|
||||
echo "automake failed"
|
||||
exit 1
|
||||
}
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
|
||||
|
||||
Vendored
-1561
File diff suppressed because it is too large
Load Diff
Vendored
-1686
File diff suppressed because it is too large
Load Diff
+1
-57
@@ -1,6 +1,6 @@
|
||||
# Every configure script must call AC_INIT before doing anything else.
|
||||
# AC_INIT (package, version, [bug-report], [tarname])
|
||||
AC_INIT([H5Part], [1.6.3], [h5part@lists.psi.ch], H5Part)
|
||||
AC_INIT([H5Part], [1.6.4], [h5part@lists.psi.ch], H5Part)
|
||||
|
||||
# Ensure that a recent enough version of Autoconf is being used.
|
||||
# If the version of Autoconf being used to create configure is earlier than version,
|
||||
@@ -54,20 +54,6 @@ AC_ARG_WITH(
|
||||
[path to HDF5 installation [default=""]])],
|
||||
[HDF5PATH=$withval], [HDF5PATH=""])
|
||||
|
||||
###############################################################################
|
||||
################# A SIMPLE WORK AROUND TO USE ENV. VARS #######################
|
||||
###############################################################################
|
||||
|
||||
SAVE_CC=$CC
|
||||
SAVE_CXX=$CXX
|
||||
SAVE_FC=$FC
|
||||
SAVE_CFLAGS=$CFLAGS
|
||||
SAVE_CXXFLAGS=$CXXFLAGS
|
||||
SAVE_FFLAGS=$FFLAGS
|
||||
SAVE_INCLUDES=$INCLUDES
|
||||
SAVE_LDFLAGS=$LDFLAGS
|
||||
SAVE_LIBS=$LIBS
|
||||
|
||||
###############################################################################
|
||||
############### PATH SERACH FUNCTION - to be used later... ####################
|
||||
###############################################################################
|
||||
@@ -316,48 +302,6 @@ AC_TYPE_SSIZE_T
|
||||
AC_FUNC_MALLOC
|
||||
AC_CHECK_FUNCS([memset pow strchr strdup])
|
||||
|
||||
|
||||
###############################################################################
|
||||
################# A SIMPLE WORK AROUND TO USE ENV. VARS #######################
|
||||
###############################################################################
|
||||
|
||||
#if there was an external input for the variable...
|
||||
if test -n "$SAVE_CC"; then
|
||||
CC="$SAVE_CC"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_CXX"; then
|
||||
CXX="$SAVE_CXX"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_FC"; then
|
||||
FC="$SAVE_FC"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_CFLAGS"; then
|
||||
CFLAGS="$SAVE_CFLAGS"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_CXXFLAGS"; then
|
||||
CFLAGS="$SAVE_CXXFLAGS"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_FFLAGS"; then
|
||||
FFLAGS="$SAVE_FFLAGS"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_INCLUDES"; then
|
||||
INCLUDES="$SAVE_INCLUDES"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_LDFLAGS"; then
|
||||
LDFLAGS="$SAVE_LDFLAGS"
|
||||
fi
|
||||
|
||||
if test -n "$SAVE_LIBS"; then
|
||||
LIBS="$SAVE_LIBS"
|
||||
fi
|
||||
|
||||
###############################################################################
|
||||
############## EXPORTING VARIABLES & CREATING OUTPUT FILES ####################
|
||||
###############################################################################
|
||||
|
||||
+9
-5
@@ -291,9 +291,9 @@ _H5Part_open_file (
|
||||
|
||||
if ( align != 0 ) {
|
||||
_H5Part_print_info (
|
||||
"Setting HDF5 alignment to %ld bytes",
|
||||
"Setting HDF5 alignment to %ld bytes with threshold at half that many bytes",
|
||||
align );
|
||||
if (H5Pset_alignment ( f->access_prop, 0, align ) < 0) {
|
||||
if (H5Pset_alignment ( f->access_prop, align/2, align ) < 0) {
|
||||
HANDLE_H5P_SET_FAPL_ERR;
|
||||
goto error_cleanup;
|
||||
}
|
||||
@@ -2332,7 +2332,11 @@ _H5Part_get_object_name (
|
||||
data.len = (size_t)len_obj_name;
|
||||
|
||||
#ifdef H5PART_HAVE_HDF5_18
|
||||
hid_t child_id = H5Gopen ( group_id, group_name, H5P_DEFAULT );
|
||||
hid_t child_id = H5Gopen ( group_id, group_name
|
||||
#ifndef H5_USE_16_API
|
||||
, H5P_DEFAULT
|
||||
#endif
|
||||
);
|
||||
if ( child_id < 0 ) return child_id;
|
||||
herr = H5Literate ( child_id, H5_INDEX_NAME, H5_ITER_INC, 0,
|
||||
_H5Part_iteration_operator2, &data );
|
||||
@@ -2855,9 +2859,9 @@ _set_view_indices (
|
||||
herr = _reset_view ( f );
|
||||
if ( herr < 0 ) return herr;
|
||||
|
||||
if ( indices == NULL || nelems <= 0 ) {
|
||||
if ( indices == NULL || nelems < 0 ) {
|
||||
_H5Part_print_warn (
|
||||
"View indices array is null or size is <= 0: reseting view." );
|
||||
"View indices array is null or size is < 0: reseting view." );
|
||||
return H5PART_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -16,10 +16,10 @@ extern "C" {
|
||||
#include "H5MultiBlock.h"
|
||||
#endif
|
||||
|
||||
#define H5PART_VER_STRING "1.6.3"
|
||||
#define H5PART_VER_STRING "1.6.4"
|
||||
#define H5PART_VER_MAJOR 1
|
||||
#define H5PART_VER_MINOR 6
|
||||
#define H5PART_VER_RELEASE 3
|
||||
#define H5PART_VER_RELEASE 4
|
||||
|
||||
/* error values */
|
||||
#define H5PART_SUCCESS 0
|
||||
|
||||
+2
-2
@@ -22,6 +22,6 @@ test_LDADD = ../src/libH5Part.la
|
||||
testf_SOURCES = testf.F90
|
||||
testf_LDADD = ../src/libH5PartF.la
|
||||
|
||||
clean: clean-am
|
||||
rm -f *.h5
|
||||
clean-local:
|
||||
$(RM) -f *.h5
|
||||
|
||||
|
||||
Reference in New Issue
Block a user