diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-06 05:13:47 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-06 05:13:47 (GMT) |
| commit | 76d509dd6f454de8b01d0116dc73e56ea5949aa8 (patch) | |
| tree | bd3291ac545e0ab332624aed7b6435899b13d4ef | |
| parent | 50c38a5733bf39c2ba2cdb0de4d03e4aa78b1814 (diff) | |
| download | hdf5-76d509dd6f454de8b01d0116dc73e56ea5949aa8.zip hdf5-76d509dd6f454de8b01d0116dc73e56ea5949aa8.tar.gz hdf5-76d509dd6f454de8b01d0116dc73e56ea5949aa8.tar.bz2 | |
[svn-r26378] Bring revisions #26220 - #26324 from trunk to revise_chunks. h5committested.
153 files changed, 1840 insertions, 6809 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 04baa2e..f5c2dda 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -1,4 +1,4 @@ -include (${HDF_RESOURCES_DIR}/CMakePackageConfigHelpers.cmake) +include (CMakePackageConfigHelpers) #----------------------------------------------------------------------------- # Check for Installation Utilities @@ -80,10 +80,10 @@ configure_package_config_file ( if (NOT HDF5_EXTERNALLY_CONFIGURED) configure_file ( ${HDF_RESOURCES_DIR}/FindHDF5.cmake.in - ${HDF5_BINARY_DIR}/CMakeFiles/FindHDF5${HDF_PACKAGE_EXT}.cmake @ONLY + ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindHDF5${HDF_PACKAGE_EXT}.cmake @ONLY ) install ( - FILES ${HDF5_BINARY_DIR}/CMakeFiles/FindHDF5${HDF_PACKAGE_EXT}.cmake + FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindHDF5${HDF_PACKAGE_EXT}.cmake DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) @@ -97,14 +97,14 @@ set (SHARE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${HDF5_INSTALL_CMAKE_DIR}" ) set (CURRENT_BUILD_DIR "${CMAKE_INSTALL_PREFIX}" ) configure_package_config_file ( ${HDF_RESOURCES_DIR}/hdf5-config.cmake.in - "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake" + "${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake" INSTALL_DESTINATION "${HDF5_INSTALL_CMAKE_DIR}" PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR CURRENT_BUILD_DIR ) if (NOT HDF5_EXTERNALLY_CONFIGURED) install ( - FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake + FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) @@ -116,10 +116,10 @@ endif (NOT HDF5_EXTERNALLY_CONFIGURED) if (NOT HDF5_EXTERNALLY_CONFIGURED) configure_file ( ${HDF_RESOURCES_DIR}/hdf5-config-version.cmake.in - ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake @ONLY + ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake @ONLY ) install ( - FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake + FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) @@ -317,7 +317,6 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}\\\\hdf.bmp") set (CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}") set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}\\\\${CPACK_PACKAGE_VERSION}") - set (CPACK_MONOLITHIC_INSTALL ON) set (CPACK_NSIS_CONTACT "${HDF5_PACKAGE_BUGREPORT}") set (CPACK_NSIS_MODIFY_PATH ON) @@ -361,12 +360,16 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES) # # This image must be 493 by 312 pixels. # + set(CPACK_WIX_PROPERTY_ARPCOMMENTS "HDF5 (Hierarchical Data Format 5) Software Library and Utilities") + set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}") + set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}") elseif (APPLE) list (APPEND CPACK_GENERATOR "DragNDrop") set (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) set (CPACK_PACKAGING_INSTALL_PREFIX "/${CPACK_PACKAGE_INSTALL_DIRECTORY}") set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.icns") + option (HDF5_PACK_MACOSX_BUNDLE "Package the HDF5 Library in a Bundle" OFF) if (HDF5_PACK_MACOSX_BUNDLE) list (APPEND CPACK_GENERATOR "Bundle") set (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}") @@ -466,6 +469,21 @@ The HDF5 data model, file format, API, library, and tools are open and distribut include (CPack) + cpack_add_install_type(Full DISPLAY_NAME "Everything") + cpack_add_install_type(Developer) + + cpack_add_component_group(Runtime) + + cpack_add_component_group(Development + EXPANDED + DESCRIPTION "All of the tools you'll need to develop HDF5 applications" + ) + + cpack_add_component_group(Applications + EXPANDED + DESCRIPTION "Tools for HDF5 files" + ) + #--------------------------------------------------------------------------- # Now list the cpack commands #--------------------------------------------------------------------------- @@ -1189,6 +1189,8 @@ ./testpar/t_pflush2.c ./testpar/t_prop.c ./testpar/t_shapesame.c +./testpar/t_pshutdown.c +./testpar/t_prestart.c ./testpar/t_span_tree.c ./testpar/testpar.h ./testpar/testphdf5.c @@ -2494,58 +2496,8 @@ ./hl/c++/test/Makefile.am ./hl/c++/test/Makefile.in -#vms files -./vms/COPYING - -./vms/c++/examples/check.com -./vms/c++/examples/make.com -./vms/c++/src/make.com -./vms/c++/test/check.com -./vms/c++/test/make.com - -./vms/fortran/examples/check.com -./vms/fortran/examples/make.com -./vms/fortran/src/make.com -./vms/fortran/test/check.com -./vms/fortran/test/make.com - -./vms/examples/check.com -./vms/examples/make.com -./vms/src/make.com -./vms/src/h5pubconf.h -./vms/test/check.com -./vms/test/make.com -./vms/test/H5srcdir_str.h - -./vms/build.com -./vms/install.com -./vms/make.com -./vms/tools/h5copy/make.com -./vms/tools/h5copy/check_h5copy.com -./vms/tools/h5dump/make.com -./vms/tools/h5dump/check_h5dump.com -./vms/tools/h5ls/check.com -./vms/tools/h5ls/check_h5ls.com -./vms/tools/h5ls/make.com -./vms/tools/h5diff/check_h5diff.com -./vms/tools/h5diff/make.com -./vms/tools/h5import/check_h5import.com -./vms/tools/h5import/make.com -./vms/tools/h5jam/check_h5jam.com -./vms/tools/h5jam/make.com -./vms/tools/h5repack/check_h5repack.com -./vms/tools/h5repack/make.com -./vms/tools/h5stat/make.com -./vms/tools/lib/make.com -./vms/tools/misc/make.com -./vms/tools/testfiles/tattr-3.ddl -./vms/tools/testfiles/tdset-2.ddl -./vms/tools/testfiles/tgroup-2.ddl -./vms/tools/testfiles/tperror.ddl - # CMake-specific Files ./config/cmake/cacheinit.cmake -./config/cmake/CMakePackageConfigHelpers.cmake ./config/cmake/ConversionTests.c ./config/cmake/ConfigureChecks.cmake ./config/cmake/CTestCustom.cmake diff --git a/Makefile.in b/Makefile.in index f9c1263..9c1d71e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -501,10 +501,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Some files/directories generated during check that should be cleaned -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *-tmp @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = # Define subdirectories to build. diff --git a/bin/chkmanifest b/bin/chkmanifest index 70c38a9..6188eab 100755 --- a/bin/chkmanifest +++ b/bin/chkmanifest @@ -20,75 +20,17 @@ verbose=yes MANIFEST=/tmp/HD_MANIFEST.$$ -SVNENTRY=/tmp/HD_SVNENTRY.$$ - -# function definitions - -GETSVNENTRIES_13 () -# Purpose: Extract filenames from the svn v1.3.* entries file -# $1: directory name in which the svn entries is. -# steps: -# 1. remove all single line entries so that step 2 does not fail on them. -# 2. merge all multiple lines entries into single lines. -# 3. remove all non file entries. -# 4. insert a blank line because some entries files has no kind="file" -# entry and ed does not like to do g on an empty file. -# 5. remove everything except the file name. -# 6. remove all blank lines, including the inserted one. -{ -cp $1/entries $SVNENTRY -chmod u+w $SVNENTRY # entries file is not writable. -ed - $SVNENTRY <<EOF -g/^<.*>$/d -g/^</.,/>$/j -v/kind="file"/d -a - -. -g/.*name="/s/// -g/".*/s/// -g/^$/d -w -q -EOF -cat $SVNENTRY -rm $SVNENTRY -} - -GETSVNENTRIES_14 () -# Purpose: Extract filenames from the svn v1.4.* entries file -# $1: directory name in which the svn entries is. -# steps: -# 1. all valid files are followed by a line containing "file" only. -# 2. find them by looking for "file" first, then mark its preceding line as -# wanted. -# 3. remove all non-marked line. -# 4. insert a blank line because some entries files has no kind="file" -# entry and ed does not like to do g on an empty file. -# 5. remove the marks. -{ -cp $1/entries $SVNENTRY -chmod u+w $SVNENTRY # entries file is not writable. -ed - $SVNENTRY <<EOF -g/^file$/-s/^/%WANTED%/ -v/%WANTED%/d -a - -. -g/^%WANTED%/s/// -w -q -EOF -cat $SVNENTRY -rm $SVNENTRY -} - # Main test "$verbose" && echo " Checking MANIFEST..." 1>&2 # clean up $MANIFEST file when exits trap "rm -f $MANIFEST" 0 +# Only split lines on newline, not whitespace +set -f +IFS=' +' + # First make sure i am in the directory in which there is an MANIFEST file # and then do the checking from there. Will try the following, # current directory, parent directory, the directory this command resides. @@ -132,36 +74,50 @@ for file in `cat $MANIFEST`; do fi done +# Get the list of files under version control and check that they are +# present. +# +# First get a list of all the pending files with svn stat and +# check those. +svn_stat="$(svn stat -q)" +for file in $svn_stat; do + # Newly added files are not listed by svn ls, which + # we check below.. + # The line listing them starts with 'A'. + letter="$(echo $file | head -c 1)" + if [ "$letter" = "A" ]; then + # Convert 'A ' to './' so it matches + # the manifest file name. + path=`echo $file | sed 's/^A\s*/\.\//g'` + # Ignore directories + if [ ! -d $path ]; then + if (grep ^$path$ $MANIFEST >/dev/null); then + : + else + echo "+ $path" + fail=yes + fi + fi + fi +done -# Inspect the .svn/entries to figure out what version of svn file entry is -# used. -# The following algorithm is formed via reverse engineering. -# I don't know what the official svn format is if such a specification exists. -# Algorithm: -# If the first line of the file has 'xml version="1.0"' in it, it is created -# by svn 1.3 or older; else if it has '^file$' in it, it is created by svn 1.4. -svn_entry_file=.svn/entries -if head -1 $svn_entry_file | grep 'xml version="1.0"' > /dev/null 2>&1;then - getsvnentries=GETSVNENTRIES_13 -elif grep '^file$' $svn_entry_file > /dev/null 2>&1; then - getsvnentries=GETSVNENTRIES_14 -else - echo "Unknown svn entries format. Aborted" - exit 1 -fi - -for svn in `find . -type d -name .svn -print`; do - path=`echo $svn |sed 's/\/.svn//'` - for file in `$getsvnentries $svn`; do - if (grep ^$path/$file$ $MANIFEST >/dev/null); then - : - else - echo "+ $path/$file" - fail=yes - fi - done +# Next check svn ls, which gets a list of all files that are +# checked in. +svn_ls="$(svn ls -R)" +for file in $svn_ls; do + path="./${file}" + # Ignore directories + if [ ! -d $path ]; then + if (grep ^$path$ $MANIFEST >/dev/null); then + : + else + echo "+ $path" + fail=yes + fi + fi done +# Finish up if [ "X$fail" = "Xyes" ]; then cat 1>&2 <<EOF The MANIFEST is out of date. Files marked with a minus sign (-) no @@ -118,7 +118,8 @@ $Source = ""; "H5G_iterate_t" => "x", "H5G_info_t" => "x", "H5I_free_t" => "x", - "H5L_class_t" => "x", + "H5I_search_func_t" => "x", + "H5L_class_t" => "x", "H5L_elink_traverse_t" => "x", "H5L_iterate_t" => "x", "H5MM_allocate_t" => "x", @@ -281,14 +282,10 @@ sub rewrite_func ($$$$$) { # The H5TRACE() statement if ($body =~ /\/\*[ \t]*NO[ \t]*TRACE[ \t]*\*\//) { - if ($body =~ /\s*H5TRACE\d+\s*\(/) { - errmesg $file, $name, "warning: trace info was not updated because of NO TRACE comment"; - } else { - errmesg $file, $name, "warning: trace info was not inserted because of NO TRACE comment"; - } + # Ignored due to NO TRACE comment. } elsif ($body =~ s/((\n[ \t]*)H5TRACE\d+\s*\(.*?\);)\n/"$2$trace"/es) { - # Replaced an H5TRACE macro - } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*\(.*?\);??)\n/"$1$2$trace"/es) { + # Replaced an H5TRACE macro. + } elsif ($body=~s/((\n[ \t]*)FUNC_ENTER\w*\s*(\(.*?\))?;??)\n/"$1$2$trace"/es) { # Added an H5TRACE macro after a FUNC_ENTER macro. } else { errmesg $file, $name, "unable to insert tracing information"; @@ -317,14 +314,14 @@ for $file (@ARGV) { # Make modifications my $original = $Source; - my $napi = $Source =~ s/\n([A-Za-z]\w*(\s+[a-z]\w*)*)\s*\n #type + my $napi = $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type (H5[A-Z]{0,2}[^_A-Z0-9]\w*) #name \s*\((.*?)\)\s* #args (\{.*?\n\}[^\n]*) #body /rewrite_func($file,$1,$3,$4,$5)/segx; $total_api += $napi; - # If the source changed then print out the new version +# If the source changed then print out the new version if ($original ne $Source) { printf "%s: instrumented %d API function%s\n", $file, $napi, 1==$napi?"":"s"; @@ -335,3 +332,6 @@ for $file (@ARGV) { } } } + +printf "Finished processing HDF5 API calls\n" + diff --git a/c++/Makefile.in b/c++/Makefile.in index ad4923f..45aeb34 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -661,8 +661,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test DIST_SUBDIRS = src test examples diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 8a6f4dc..d4a652f 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -609,8 +609,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 INSTALL_SCRIPT_FILES = run-c++-ex.sh # These are the programs that 'make all' or 'make prog' will build and diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 0faf8d9..a55cfac 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -675,8 +675,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index f6e2044..8b0b90f 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -666,10 +666,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files -CHECK_CLEANFILES = *.chkexe *.chklog *.clog tattr_multi.h5 tfattrs.h5 \ - tattr_scalar.h5 tattr_compound.h5 tattr_dtype.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 tattr_multi.h5 \ + tfattrs.h5 tattr_scalar.h5 tattr_compound.h5 tattr_dtype.h5 \ tattr_basic.h5 # These are our main targets. They should be listed in the order to be diff --git a/config/cmake/CMakePackageConfigHelpers.cmake b/config/cmake/CMakePackageConfigHelpers.cmake deleted file mode 100644 index c6dc141..0000000 --- a/config/cmake/CMakePackageConfigHelpers.cmake +++ /dev/null @@ -1,321 +0,0 @@ -#.rst: -# CMakePackageConfigHelpers -# ------------------------- -# -# Helpers functions for creating config files that can be included by other -# projects to find and use a package. -# -# Adds the :command:`configure_package_config_file()` and -# :command:`write_basic_package_version_file()` commands. -# -# Generating a Package Configuration File -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -# -# .. command:: configure_package_config_file -# -# Create a config file for a project:: -# -# configure_package_config_file(<input> <output> INSTALL_DESTINATION <path> -# [PATH_VARS <var1> <var2> ... <varN>] -# [NO_SET_AND_CHECK_MACRO] -# [NO_CHECK_REQUIRED_COMPONENTS_MACRO] -# [INSTALL_PREFIX <path>]) -# -# -# ``configure_package_config_file()`` should be used instead of the plain -# :command:`configure_file()` command when creating the ``<Name>Config.cmake`` -# or ``<Name>-config.cmake`` file for installing a project or library. It helps -# making the resulting package relocatable by avoiding hardcoded paths in the -# installed ``Config.cmake`` file. -# -# In a ``FooConfig.cmake`` file there may be code like this to make the install -# destinations know to the using project: -# -# .. code-block:: cmake -# -# set(FOO_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@" ) -# set(FOO_DATA_DIR "@CMAKE_INSTALL_PREFIX@/@RELATIVE_DATA_INSTALL_DIR@" ) -# set(FOO_ICONS_DIR "@CMAKE_INSTALL_PREFIX@/share/icons" ) -# ...logic to determine installedPrefix from the own location... -# set(FOO_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@" ) -# -# All 4 options shown above are not sufficient, since the first 3 hardcode the -# absolute directory locations, and the 4th case works only if the logic to -# determine the ``installedPrefix`` is correct, and if ``CONFIG_INSTALL_DIR`` -# contains a relative path, which in general cannot be guaranteed. This has the -# effect that the resulting ``FooConfig.cmake`` file would work poorly under -# Windows and OSX, where users are used to choose the install location of a -# binary package at install time, independent from how -# :variable:`CMAKE_INSTALL_PREFIX` was set at build/cmake time. -# -# Using ``configure_package_config_file`` helps. If used correctly, it makes -# the resulting ``FooConfig.cmake`` file relocatable. Usage: -# -# 1. write a ``FooConfig.cmake.in`` file as you are used to -# 2. insert a line containing only the string ``@PACKAGE_INIT@`` -# 3. instead of ``set(FOO_DIR "@SOME_INSTALL_DIR@")``, use -# ``set(FOO_DIR "@PACKAGE_SOME_INSTALL_DIR@")`` (this must be after the -# ``@PACKAGE_INIT@`` line) -# 4. instead of using the normal :command:`configure_file()`, use -# ``configure_package_config_file()`` -# -# -# -# The ``<input>`` and ``<output>`` arguments are the input and output file, the -# same way as in :command:`configure_file()`. -# -# The ``<path>`` given to ``INSTALL_DESTINATION`` must be the destination where -# the ``FooConfig.cmake`` file will be installed to. This path can either be -# absolute, or relative to the ``INSTALL_PREFIX`` path. -# -# The variables ``<var1>`` to ``<varN>`` given as ``PATH_VARS`` are the -# variables which contain install destinations. For each of them the macro will -# create a helper variable ``PACKAGE_<var...>``. These helper variables must be -# used in the ``FooConfig.cmake.in`` file for setting the installed location. -# They are calculated by ``configure_package_config_file`` so that they are -# always relative to the installed location of the package. This works both for -# relative and also for absolute locations. For absolute locations it works -# only if the absolute location is a subdirectory of ``INSTALL_PREFIX``. -# -# If the ``INSTALL_PREFIX`` argument is passed, this is used as base path to -# calculate all the relative paths. The ``<path>`` argument must be an absolute -# path. If this argument is not passed, the :variable:`CMAKE_INSTALL_PREFIX` -# variable will be used instead. The default value is good when generating a -# FooConfig.cmake file to use your package from the install tree. When -# generating a FooConfig.cmake file to use your package from the build tree this -# option should be used. -# -# By default ``configure_package_config_file`` also generates two helper macros, -# ``set_and_check()`` and ``check_required_components()`` into the -# ``FooConfig.cmake`` file. -# -# ``set_and_check()`` should be used instead of the normal ``set()`` command for -# setting directories and file locations. Additionally to setting the variable -# it also checks that the referenced file or directory actually exists and fails -# with a ``FATAL_ERROR`` otherwise. This makes sure that the created -# ``FooConfig.cmake`` file does not contain wrong references. -# When using the ``NO_SET_AND_CHECK_MACRO``, this macro is not generated -# into the ``FooConfig.cmake`` file. -# -# ``check_required_components(<package_name>)`` should be called at the end of -# the ``FooConfig.cmake`` file if the package supports components. This macro -# checks whether all requested, non-optional components have been found, and if -# this is not the case, sets the ``Foo_FOUND`` variable to ``FALSE``, so that -# the package is considered to be not found. It does that by testing the -# ``Foo_<Component>_FOUND`` variables for all requested required components. -# When using the ``NO_CHECK_REQUIRED_COMPONENTS_MACRO`` option, this macro is -# not generated into the ``FooConfig.cmake`` file. -# -# For an example see below the documentation for -# :command:`write_basic_package_version_file()`. -# -# Generating a Package Version File -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -# -# .. command:: write_basic_package_version_file -# -# Create a version file for a project:: -# -# write_basic_package_version_file(<filename> -# [VERSION <major.minor.patch>] -# COMPATIBILITY <AnyNewerVersion|SameMajorVersion|ExactVersion> ) -# -# -# Writes a file for use as ``<package>ConfigVersion.cmake`` file to -# ``<filename>``. See the documentation of :command:`find_package()` for -# details on this. -# -# ``<filename>`` is the output filename, it should be in the build tree. -# ``<major.minor.patch>`` is the version number of the project to be installed. -# -# If no ``VERSION`` is given, the :variable:`PROJECT_VERSION` variable is used. -# If this hasn't been set, it errors out. -# -# The ``COMPATIBILITY`` mode ``AnyNewerVersion`` means that the installed -# package version will be considered compatible if it is newer or exactly the -# same as the requested version. This mode should be used for packages which -# are fully backward compatible, also across major versions. -# If ``SameMajorVersion`` is used instead, then the behaviour differs from -# ``AnyNewerVersion`` in that the major version number must be the same as -# requested, e.g. version 2.0 will not be considered compatible if 1.0 is -# requested. This mode should be used for packages which guarantee backward -# compatibility within the same major version. -# If ``ExactVersion`` is used, then the package is only considered compatible if -# the requested version matches exactly its own version number (not considering -# the tweak version). For example, version 1.2.3 of a package is only -# considered compatible to requested version 1.2.3. This mode is for packages -# without compatibility guarantees. -# If your project has more elaborated version matching rules, you will need to -# write your own custom ``ConfigVersion.cmake`` file instead of using this -# macro. -# -# Internally, this macro executes :command:`configure_file()` to create the -# resulting version file. Depending on the ``COMPATIBLITY``, either the file -# ``BasicConfigVersion-SameMajorVersion.cmake.in`` or -# ``BasicConfigVersion-AnyNewerVersion.cmake.in`` is used. Please note that -# these two files are internal to CMake and you should not call -# :command:`configure_file()` on them yourself, but they can be used as starting -# point to create more sophisticted custom ``ConfigVersion.cmake`` files. -# -# Example Generating Package Files -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -# -# Example using both :command:`configure_package_config_file` and -# ``write_basic_package_version_file()``: -# -# ``CMakeLists.txt``: -# -# .. code-block:: cmake -# -# set(INCLUDE_INSTALL_DIR include/ ... CACHE ) -# set(LIB_INSTALL_DIR lib/ ... CACHE ) -# set(SYSCONFIG_INSTALL_DIR etc/foo/ ... CACHE ) -# ... -# include(CMakePackageConfigHelpers) -# configure_package_config_file(FooConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake -# INSTALL_DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake -# PATH_VARS INCLUDE_INSTALL_DIR SYSCONFIG_INSTALL_DIR) -# write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake -# VERSION 1.2.3 -# COMPATIBILITY SameMajorVersion ) -# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/FooConfigVersion.cmake -# DESTINATION ${LIB_INSTALL_DIR}/Foo/cmake ) -# -# ``FooConfig.cmake.in``: -# -# .. code-block:: cmake -# -# set(FOO_VERSION x.y.z) -# ... -# @PACKAGE_INIT@ -# ... -# set_and_check(FOO_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -# set_and_check(FOO_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@") -# -# check_required_components(Foo) - - -#============================================================================= -# Copyright 2012 Alexander Neundorf <neundorf@kde.org> -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -include(CMakeParseArguments) - -include(WriteBasicConfigVersionFile) - -macro(WRITE_BASIC_PACKAGE_VERSION_FILE) - write_basic_config_version_file(${ARGN}) -endmacro() - -function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile) - set(options NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO) - set(oneValueArgs INSTALL_DESTINATION INSTALL_PREFIX) - set(multiValueArgs PATH_VARS ) - - cmake_parse_arguments(CCF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - if(CCF_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Unknown keywords given to CONFIGURE_PACKAGE_CONFIG_FILE(): \"${CCF_UNPARSED_ARGUMENTS}\"") - endif() - - if(NOT CCF_INSTALL_DESTINATION) - message(FATAL_ERROR "No INSTALL_DESTINATION given to CONFIGURE_PACKAGE_CONFIG_FILE()") - endif() - - if(DEFINED CCF_INSTALL_PREFIX) - if(IS_ABSOLUTE "${CCF_INSTALL_PREFIX}") - set(installPrefix "${CCF_INSTALL_PREFIX}") - else() - message(FATAL_ERROR "INSTALL_PREFIX must be an absolute path") - endif() - else() - set(installPrefix "${CMAKE_INSTALL_PREFIX}") - endif() - - if(IS_ABSOLUTE "${CCF_INSTALL_DESTINATION}") - set(absInstallDir "${CCF_INSTALL_DESTINATION}") - else() - set(absInstallDir "${installPrefix}/${CCF_INSTALL_DESTINATION}") - endif() - - file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${absInstallDir}" "${installPrefix}" ) - - foreach(var ${CCF_PATH_VARS}) - if(NOT DEFINED ${var}) - message(FATAL_ERROR "Variable ${var} does not exist") - else() - if(IS_ABSOLUTE "${${var}}") - string(REPLACE "${installPrefix}" "\${PACKAGE_PREFIX_DIR}" - PACKAGE_${var} "${${var}}") - else() - set(PACKAGE_${var} "\${PACKAGE_PREFIX_DIR}/${${var}}") - endif() - endif() - endforeach() - - get_filename_component(inputFileName "${_inputFile}" NAME) - - set(PACKAGE_INIT " -####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### -####### Any changes to this file will be overwritten by the next CMake run #### -####### The input file was ${inputFileName} ######## - -get_filename_component(PACKAGE_PREFIX_DIR \"\${CMAKE_CURRENT_LIST_DIR}/${PACKAGE_RELATIVE_PATH}\" ABSOLUTE) -") - - if("${absInstallDir}" MATCHES "^(/usr)?/lib(64)?/.+") - # Handle "/usr move" symlinks created by some Linux distros. - set(PACKAGE_INIT "${PACKAGE_INIT} -# Use original install prefix when loaded through a \"/usr move\" -# cross-prefix symbolic link such as /lib -> /usr/lib. -get_filename_component(_realCurr \"\${CMAKE_CURRENT_LIST_DIR}\" REALPATH) -get_filename_component(_realOrig \"${absInstallDir}\" REALPATH) -if(_realCurr STREQUAL _realOrig) - set(PACKAGE_PREFIX_DIR \"${installPrefix}\") -endif() -unset(_realOrig) -unset(_realCurr) -") - endif() - - if(NOT CCF_NO_SET_AND_CHECK_MACRO) - set(PACKAGE_INIT "${PACKAGE_INIT} -macro(set_and_check _var _file) - set(\${_var} \"\${_file}\") - if(NOT EXISTS \"\${_file}\") - message(FATAL_ERROR \"File or directory \${_file} referenced by variable \${_var} does not exist !\") - endif() -endmacro() -") - endif() - - - if(NOT CCF_NO_CHECK_REQUIRED_COMPONENTS_MACRO) - set(PACKAGE_INIT "${PACKAGE_INIT} -macro(check_required_components _NAME) - foreach(comp \${\${_NAME}_FIND_COMPONENTS}) - if(NOT \${_NAME}_\${comp}_FOUND) - if(\${_NAME}_FIND_REQUIRED_\${comp}) - set(\${_NAME}_FOUND FALSE) - endif() - endif() - endforeach() -endmacro() -") - endif() - - set(PACKAGE_INIT "${PACKAGE_INIT} -####################################################################################") - - configure_file("${_inputFile}" "${_outputFile}" @ONLY) - -endfunction() diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 8235c54..a557364 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -57,9 +57,6 @@ /* Define the default plugins path to compile */ #cmakedefine H5_DEFAULT_PLUGINDIR "@H5_DEFAULT_PLUGINDIR@" -/* Define the default virtual file driver to compile */ -#cmakedefine H5_DEFAULT_VFD @H5_DEFAULT_VFD@ - /* Define if `dev_t' is a scalar */ #cmakedefine H5_DEV_T_IS_SCALAR @H5_DEV_T_IS_SCALAR@ @@ -89,9 +86,6 @@ long long values. */ #cmakedefine H5_FP_TO_ULLONG_RIGHT_MAXIMUM @H5_FP_TO_ULLONG_RIGHT_MAXIMUM@ -/* Define if gettimeofday() populates the tz pointer passed in */ -#cmakedefine H5_GETTIMEOFDAY_GIVES_TZ @H5_GETTIMEOFDAY_GIVES_TZ@ - /* Define to 1 if you have the `alarm' function. */ #cmakedefine H5_HAVE_ALARM @H5_HAVE_ALARM@ @@ -101,9 +95,6 @@ /* Define if the __attribute__(()) extension is present */ #cmakedefine H5_HAVE_ATTRIBUTE @H5_HAVE_ATTRIBUTE@ -/* Define to 1 if you have the `BSDgettimeofday' function. */ -#cmakedefine H5_HAVE_BSDGETTIMEOFDAY @H5_HAVE_BSDGETTIMEOFDAY@ - /* Define if the compiler understands C99 designated initialization of structs and unions */ #cmakedefine H5_HAVE_C99_DESIGNATED_INITIALIZER @H5_HAVE_C99_DESIGNATED_INITIALIZER@ @@ -377,12 +368,6 @@ /* Define if `struct text_info' is defined */ #cmakedefine H5_HAVE_STRUCT_TEXT_INFO @H5_HAVE_STRUCT_TEXT_INFO@ -/* Define if `struct timezone' is defined */ -#cmakedefine H5_HAVE_STRUCT_TIMEZONE @H5_HAVE_STRUCT_TIMEZONE@ - -/* Define to 1 if `tm_zone' is a member of `struct tm'. */ -#cmakedefine H5_HAVE_STRUCT_TM_TM_ZONE @H5_HAVE_STRUCT_TM_TM_ZONE@ - /* Define if `struct videoconfig' is defined */ #cmakedefine H5_HAVE_STRUCT_VIDEOCONFIG @H5_HAVE_STRUCT_VIDEOCONFIG@ @@ -446,14 +431,6 @@ /* Define if `tm_gmtoff' is a member of `struct tm' */ #cmakedefine H5_HAVE_TM_GMTOFF @H5_HAVE_TM_GMTOFF@ -/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use - `HAVE_STRUCT_TM_TM_ZONE' instead. */ -#cmakedefine H5_HAVE_TM_ZONE @H5_HAVE_TM_ZONE@ - -/* Define to 1 if you don't have `tm_zone' but do have the external array - `tzname'. */ -#cmakedefine H5_HAVE_TZNAME @H5_HAVE_TZNAME@ - /* Define to 1 if you have the <unistd.h> header file. */ #cmakedefine H5_HAVE_UNISTD_H @H5_HAVE_UNISTD_H@ @@ -484,9 +461,6 @@ /* Define to 1 if you have the `_scrsize' function. */ #cmakedefine H5_HAVE__SCRSIZE @H5_HAVE__SCRSIZE@ -/* Define if `__tm_gmtoff' is a member of `struct tm' */ -#cmakedefine H5_HAVE___TM_GMTOFF @H5_HAVE___TM_GMTOFF@ - /* Define if your system can't handle converting floating-point values to long long. */ #cmakedefine H5_HW_FP_TO_LLONG_NOT_WORKS @H5_HW_FP_TO_LLONG_NOT_WORKS@ @@ -540,9 +514,6 @@ /* Define if deprecated public API symbols are disabled */ #cmakedefine H5_NO_DEPRECATED_SYMBOLS @H5_NO_DEPRECATED_SYMBOLS@ -/* Define if shared writing must be disabled (CodeWarrior only) */ -#cmakedefine H5_NO_SHARED_WRITING @H5_NO_SHARED_WRITING@ - /* Name of package */ #define H5_PACKAGE "@HDF5_PACKAGE@" diff --git a/config/commence.am b/config/commence.am index 4bc005e..554c9fb 100644 --- a/config/commence.am +++ b/config/commence.am @@ -89,8 +89,8 @@ F9XMODFLAG=@F9XMODFLAG@ # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES=*.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES=*.chkexe *.chklog *.clog *.clog2 # List all build rules defined by HDF5 Makefiles as "PHONY" targets here. # This tells the Makefiles that these targets are not files to be built but @@ -921,7 +921,6 @@ enable_using_memchecker enable_parallel with_mpe enable_filters -with_default_vfd enable_direct_vfd with_default_plugindir enable_dconv_exception @@ -1617,8 +1616,9 @@ Optional Features: --enable-filters=all Turn on all internal I/O filters. One may also specify a comma-separated list of filters or the word no. The default is all internal I/O filters. - --enable-direct-vfd Build the Direct I/O Virtual File Driver - [default=yes] + --enable-direct-vfd Build the direct I/O virtual file driver (VFD). This + is based on the POSIX (sec2) VFD and requires the + open() call to take the O_DIRECT flag. [default=no] --enable-dconv-exception if exception handling functions is checked during data conversions [default=yes] @@ -1659,8 +1659,6 @@ Optional Packages: --with-pthread=DIR Specify alternative path to Pthreads library when thread-safe capability is built --with-mpe=DIR Use MPE instrumentation [default=no] - --with-default-vfd=driver - Specify default file driver [default=sec2] --with-default-plugindir=location Specify default location for plugins [default="/usr/local/hdf5/lib/plugin"] @@ -2682,79 +2680,6 @@ $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_decl - -# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES -# ---------------------------------------------------- -# Tries to find if the field MEMBER exists in type AGGR, after including -# INCLUDES, setting cache variable VAR accordingly. -ac_fn_c_check_member () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval \${$4+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -static $2 ac_aggr; -if (ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -static $2 ac_aggr; -if (sizeof ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - eval "$4=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_member cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -6695,13 +6620,13 @@ $as_echo_n "checking if Fortran compiler version compatible with Fortran 2003 HD program main - USE iso_c_binding - IMPLICIT NONE - TYPE(C_PTR) :: ptr - TYPE(C_FUNPTR) :: funptr - CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr + USE iso_c_binding + IMPLICIT NONE + TYPE(C_PTR) :: ptr + TYPE(C_FUNPTR) :: funptr + CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr - ptr = C_LOC(ichr(1:1)) + ptr = C_LOC(ichr(1:1)) end @@ -22540,113 +22465,6 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -## ---------------------------------------------------------------------- -## Check for these two functions before the time headers are checked -## for, otherwise they are not detected correctly on Solaris (the -## configure test will fail due to multiply-defined symbols). -## -for ac_func in difftime -do : - ac_fn_c_check_func "$LINENO" "difftime" "ac_cv_func_difftime" -if test "x$ac_cv_func_difftime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DIFFTIME 1 -_ACEOF - -fi -done - -for ac_func in gettimeofday -do : - ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETTIMEOFDAY 1 -_ACEOF - have_gettime="yes" -else - have_gettime="no" -fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 -$as_echo_n "checking for library containing clock_gettime... " >&6; } -if ${ac_cv_search_clock_gettime+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char clock_gettime (); -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -return clock_gettime (); - ; - return 0; -} -_ACEOF -for ac_lib in '' rt posix4; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_clock_gettime=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_clock_gettime+:} false; then : - break -fi -done -if ${ac_cv_search_clock_gettime+:} false; then : - -else - ac_cv_search_clock_gettime=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -$as_echo "$ac_cv_search_clock_gettime" >&6; } -ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -for ac_func in clock_gettime -do : - ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" -if test "x$ac_cv_func_clock_gettime" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_CLOCK_GETTIME 1 -_ACEOF - have_clock_gettime="yes" -else - have_clock_gettime="no" -fi -done - - ## Unix for ac_header in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h do : @@ -23102,19 +22920,28 @@ case "$host_cpu-$host_vendor-$host_os" in ## Add POSIX support on Linux systems, so <features.h> defines ## __USE_POSIX, which is required to get the prototype for fdopen ## defined correctly in <stdio.h>. + ## ## This flag was removed from h5cc as of 2009-10-17 when it was found ## that the flag broke compiling netCDF-4 code with h5cc, but kept in ## H5_CPPFLAGS because fdopen and HDfdopen fail without it. HDfdopen ## is used only by H5_debug_mask which is used only when debugging in ## H5_init_library (all in H5.c). When the flag was removed this was ## the only compile failure noted. + ## ## This was originally defined as _POSIX_SOURCE which was updated to ## _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX ## functionality so clock_gettime and CLOCK_MONOTONIC are defined - ## correctly. + ## correctly. This was later updated to 200112L so that + ## posix_memalign() is visible for the direct VFD code on Linux + ## systems. + ## ## POSIX feature information can be found in the gcc manual at: ## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html - H5_CPPFLAGS="-D_POSIX_C_SOURCE=199506L $H5_CPPFLAGS" + H5_CPPFLAGS="-D_POSIX_C_SOURCE=200112L $H5_CPPFLAGS" + + ## Need to add this so that O_DIRECT is visible for the direct + ## VFD on Linux systems. + AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" ## Also add BSD support on Linux systems, so <features.h> defines ## __USE_BSD, which is required to get the prototype for strdup @@ -26328,42 +26155,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -## check if `struct tm' has a `__tm_gmtoff' member. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __tm_gmtoff in struct tm" >&5 -$as_echo_n "checking for __tm_gmtoff in struct tm... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <sys/time.h> - #include <time.h> -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -struct tm tm; tm.__tm_gmtoff=0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -$as_echo "#define HAVE___TM_GMTOFF 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ## Check whether the global variable `timezone' is defined. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for global timezone variable" >&5 $as_echo_n "checking for global timezone variable... " >&6; } @@ -26410,217 +26201,6 @@ rm -f core conftest.err conftest.$ac_objext \ ;; esac -## Check whether `struct timezone' is defined. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 -$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } -if ${ac_cv_struct_tm+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <time.h> - -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -struct tm tm; - int *p = &tm.tm_sec; - return !p; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_tm=time.h -else - ac_cv_struct_tm=sys/time.h -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 -$as_echo "$ac_cv_struct_tm" >&6; } -if test $ac_cv_struct_tm = sys/time.h; then - -$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h - -fi - -ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h> -#include <$ac_cv_struct_tm> - -" -if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TM_TM_ZONE 1 -_ACEOF - - -fi - -if test "$ac_cv_member_struct_tm_tm_zone" = yes; then - -$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h - -else - ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h> -" -if test "x$ac_cv_have_decl_tzname" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_TZNAME $ac_have_decl -_ACEOF - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 -$as_echo_n "checking for tzname... " >&6; } -if ${ac_cv_var_tzname+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <time.h> -#if !HAVE_DECL_TZNAME -extern char *tzname[]; -#endif - -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -return tzname[0][0]; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_var_tzname=yes -else - ac_cv_var_tzname=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5 -$as_echo "$ac_cv_var_tzname" >&6; } - if test $ac_cv_var_tzname = yes; then - -$as_echo "#define HAVE_TZNAME 1" >>confdefs.h - - fi -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timezone" >&5 -$as_echo_n "checking for struct timezone... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <sys/types.h> - #include <sys/time.h> - #include <time.h> -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -struct timezone tz; tz.tz_minuteswest=0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -$as_echo "#define HAVE_STRUCT_TIMEZONE 1" >>confdefs.h - - have_struct_tz="yes" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -## If gettimeofday() is going to be used, make sure it uses the timezone struct - -if test "$have_gettime" = "yes" -a "$have_struct_tz" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday() gives timezone" >&5 -$as_echo_n "checking whether gettimeofday() gives timezone... " >&6; } - if ${hdf5_cv_gettimeofday_tz+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <time.h> - #include <sys/time.h> - int main(void) - { - struct timeval tv; - struct timezone tz; - tz.tz_minuteswest = 7777; /* Initialize to an unreasonable number */ - tz.tz_dsttime = 7; - gettimeofday(&tv, &tz); - /* Check whether the function returned any value at all */ - if(tz.tz_minuteswest == 7777 && tz.tz_dsttime == 7) - exit(1); - else exit (0); - } -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - hdf5_cv_gettimeofday_tz=yes -else - hdf5_cv_gettimeofday_tz=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi - - - if test ${hdf5_cv_gettimeofday_tz} = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define GETTIMEOFDAY_GIVES_TZ 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi -fi ## ---------------------------------------------------------------------- ## Does the struct stat have the st_blocks field? This field is not Posix. @@ -26840,7 +26420,73 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ## ---------------------------------------------------------------------- ## Check for functions. ## -for ac_func in alarm BSDgettimeofday fork frexpf frexpl +## NOTE: clock_gettime may require linking to the rt or posix4 library +## so we'll search for it before calling AC_CHECK_FUNCS. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +$as_echo_n "checking for library containing clock_gettime... " >&6; } +if ${ac_cv_search_clock_gettime+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char clock_gettime (); +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return clock_gettime (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt posix4; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_clock_gettime=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_clock_gettime+:} false; then : + break +fi +done +if ${ac_cv_search_clock_gettime+:} false; then : + +else + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 +$as_echo "$ac_cv_search_clock_gettime" >&6; } +ac_res=$ac_cv_search_clock_gettime +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +for ac_func in alarm clock_gettime difftime fork frexpf frexpl do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -26852,7 +26498,7 @@ _ACEOF fi done -for ac_func in gethostname getpwuid getrusage lstat +for ac_func in gethostname getpwuid getrusage gettimeofday do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -26864,7 +26510,7 @@ _ACEOF fi done -for ac_func in rand_r random setsysinfo +for ac_func in lstat rand_r random setsysinfo do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -27833,7 +27479,7 @@ $as_echo_n "checking whether a simple MPI-IO Fortran program can be linked... " cat > conftest.$ac_ext <<_ACEOF PROGRAM main - USE mpi + INCLUDE 'mpif.h' INTEGER :: comm, amode, info, fh, ierror CHARACTER(LEN=1) :: filename CALL MPI_File_open( comm, filename, amode, info, fh, ierror) @@ -28267,6 +27913,7 @@ $as_echo "#define HAVE_MPE 1" >>confdefs.h fi fi + ## ---------------------------------------------------------------------- ## Turn on internal I/O filters by setting macros in header files ## Internal I/O filters are contained entirely within the library and do @@ -28340,147 +27987,70 @@ $as_echo "#define HAVE_FILTER_SCALEOFFSET 1" >>confdefs.h done fi -## ---------------------------------------------------------------------- -## This is defined only when we're using CodeWarrior, since it has a -## broken "open()" call. -# -if test 1 = 2; then - -$as_echo "#define NO_SHARED_WRITING 1" >>confdefs.h - -fi -## -------------------------------------------------------------------------- -## Should the Default Virtual File Driver be compiled? +## ---------------------------------------------------------------------- +## Check if Direct I/O driver is enabled by --enable-direct-vfd ## -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Default Virtual File Driver definition" >&5 -$as_echo_n "checking for Default Virtual File Driver definition... " >&6; } +## Check these regardless. If the checks are moved inside the main +## direct VFD block, the output is nested. -# Check whether --with-default-vfd was given. -if test "${with_default_vfd+set}" = set; then : - withval=$with_default_vfd; +if ${hdf5_cv_direct_io+:} false; then : + $as_echo_n "(cached) " >&6 else - withval=sec2 + ac_fn_c_check_decl "$LINENO" "O_DIRECT" "ac_cv_have_decl_O_DIRECT" "#include <fcntl.h> +" +if test "x$ac_cv_have_decl_O_DIRECT" = xyes; then : + hdf5_cv_direct_io=yes +else + hdf5_cv_direct_io=no fi +fi -if test "X$withval" = "Xsec2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - default_vfd=yes - vfd_define=H5FD_SEC2 -elif test "X$withval" = "Xstdio"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - default_vfd=yes - vfd_define=H5FD_STDIO +if ${hdf5_cv_posix_memalign+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - default_vfd=no + ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign" +if test "x$ac_cv_func_posix_memalign" = xyes; then : + hdf5_cv_posix_memalign=yes +else + hdf5_cv_posix_memalign=no fi -if test "X$default_vfd" = "Xyes"; then - -cat >>confdefs.h <<_ACEOF -#define DEFAULT_VFD $vfd_define -_ACEOF - fi -## ---------------------------------------------------------------------- -## Check if Direct I/O driver is enabled by --enable-direct-vfd -## -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Direct Virtual File Driver support" >&5 -$as_echo_n "checking for Direct Virtual File Driver support... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the direct I/O virtual file driver (VFD) is enabled" >&5 +$as_echo_n "checking if the direct I/O virtual file driver (VFD) is enabled... " >&6; } # Check whether --enable-direct-vfd was given. if test "${enable_direct_vfd+set}" = set; then : enableval=$enable_direct_vfd; DIRECT_VFD=$enableval else - DIRECT_VFD=yes + DIRECT_VFD=no fi -if test "$DIRECT_VFD" = "yes"; then - if ${hdf5_cv_direct_io+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> - int main(void) - { - int fid; - if((fid=open("tst_file", O_CREAT | O_TRUNC | O_DIRECT, 0755))<0) - exit(1); - close(fid); - remove("tst_file"); - exit (0); - } -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -posix_memalign() - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - hdf5_cv_direct_io=yes -else - hdf5_cv_direct_io=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -else - hdf5_cv_direct_io=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi - - - if test ${hdf5_cv_direct_io} = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +if test "X$DIRECT_VFD" = "Xyes"; then + if test ${hdf5_cv_direct_io} = "yes" && test ${hdf5_cv_posix_memalign} = "yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } $as_echo "#define HAVE_DIRECT 1" >>confdefs.h - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - DIRECT_VFD=no - fi + DIRECT_VFD=no + as_fn_error $? "The direct VFD was requested but cannot be built. This is either + due to O_DIRECT not being found in fcntl.h or a lack of + posix_memalign() on your system. Please re-configure without + specifying --enable-direct-vfd." "$LINENO" 5 + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5 -$as_echo "suppressed" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "X$DIRECT_VFD" = "Xyes"; then diff --git a/configure.ac b/configure.ac index fe07e1e..aea5a58 100644 --- a/configure.ac +++ b/configure.ac @@ -997,16 +997,6 @@ dnl AC_CHECK_LIB([coug], [main]) ## ...for ASCI/Red AC_HEADER_STDC AC_HEADER_TIME -## ---------------------------------------------------------------------- -## Check for these two functions before the time headers are checked -## for, otherwise they are not detected correctly on Solaris (the -## configure test will fail due to multiply-defined symbols). -## -AC_CHECK_FUNCS([difftime]) -AC_CHECK_FUNCS([gettimeofday], [have_gettime="yes"], [have_gettime="no"]) -AC_SEARCH_LIBS([clock_gettime], [rt posix4]) -AC_CHECK_FUNCS([clock_gettime],[have_clock_gettime="yes"],[have_clock_gettime="no"]) - ## Unix AC_CHECK_HEADERS([sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h]) AC_CHECK_HEADERS([sys/socket.h sys/types.h]) @@ -1110,19 +1100,28 @@ case "$host_cpu-$host_vendor-$host_os" in ## Add POSIX support on Linux systems, so <features.h> defines ## __USE_POSIX, which is required to get the prototype for fdopen ## defined correctly in <stdio.h>. + ## ## This flag was removed from h5cc as of 2009-10-17 when it was found ## that the flag broke compiling netCDF-4 code with h5cc, but kept in ## H5_CPPFLAGS because fdopen and HDfdopen fail without it. HDfdopen ## is used only by H5_debug_mask which is used only when debugging in ## H5_init_library (all in H5.c). When the flag was removed this was ## the only compile failure noted. + ## ## This was originally defined as _POSIX_SOURCE which was updated to ## _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX ## functionality so clock_gettime and CLOCK_MONOTONIC are defined - ## correctly. + ## correctly. This was later updated to 200112L so that + ## posix_memalign() is visible for the direct VFD code on Linux + ## systems. + ## ## POSIX feature information can be found in the gcc manual at: ## http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html - H5_CPPFLAGS="-D_POSIX_C_SOURCE=199506L $H5_CPPFLAGS" + H5_CPPFLAGS="-D_POSIX_C_SOURCE=200112L $H5_CPPFLAGS" + + ## Need to add this so that O_DIRECT is visible for the direct + ## VFD on Linux systems. + AM_CPPFLAGS="-D_GNU_SOURCE $AM_CPPFLAGS" ## Also add BSD support on Linux systems, so <features.h> defines ## __USE_BSD, which is required to get the prototype for strdup @@ -1732,16 +1731,6 @@ AC_TRY_COMPILE([ AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) -## check if `struct tm' has a `__tm_gmtoff' member. -AC_MSG_CHECKING([for __tm_gmtoff in struct tm]) -AC_TRY_COMPILE([ - #include <sys/time.h> - #include <time.h>], [struct tm tm; tm.__tm_gmtoff=0;], - [AC_DEFINE([HAVE___TM_GMTOFF], [1], - [Define if `__tm_gmtoff' is a member of `struct tm']) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - ## Check whether the global variable `timezone' is defined. AC_MSG_CHECKING([for global timezone variable]) @@ -1760,50 +1749,6 @@ case "`uname`" in ;; esac -## Check whether `struct timezone' is defined. -AC_STRUCT_TIMEZONE -AC_MSG_CHECKING([for struct timezone]) -AC_TRY_COMPILE([ - #include <sys/types.h> - #include <sys/time.h> - #include <time.h>], [struct timezone tz; tz.tz_minuteswest=0;], - [AC_DEFINE([HAVE_STRUCT_TIMEZONE], [1], - [Define if `struct timezone' is defined]) - have_struct_tz="yes" - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - -## If gettimeofday() is going to be used, make sure it uses the timezone struct - -if test "$have_gettime" = "yes" -a "$have_struct_tz" = "yes"; then - AC_MSG_CHECKING(whether gettimeofday() gives timezone) - AC_CACHE_VAL([hdf5_cv_gettimeofday_tz], - [AC_TRY_RUN([ - #include <time.h> - #include <sys/time.h> - int main(void) - { - struct timeval tv; - struct timezone tz; - tz.tz_minuteswest = 7777; /* Initialize to an unreasonable number */ - tz.tz_dsttime = 7; - gettimeofday(&tv, &tz); - /* Check whether the function returned any value at all */ - if(tz.tz_minuteswest == 7777 && tz.tz_dsttime == 7) - exit(1); - else exit (0); - }], - [hdf5_cv_gettimeofday_tz=yes], - [hdf5_cv_gettimeofday_tz=no])]) - - if test ${hdf5_cv_gettimeofday_tz} = "yes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([GETTIMEOFDAY_GIVES_TZ], [1], - [Define if gettimeofday() populates the tz pointer passed in]) - else - AC_MSG_RESULT([no]) - fi -fi ## ---------------------------------------------------------------------- ## Does the struct stat have the st_blocks field? This field is not Posix. @@ -1861,9 +1806,12 @@ AC_TRY_COMPILE([#include <sys/ioctl.h>],[int w=TIOCGETD;], ## ---------------------------------------------------------------------- ## Check for functions. ## -AC_CHECK_FUNCS([alarm BSDgettimeofday fork frexpf frexpl]) -AC_CHECK_FUNCS([gethostname getpwuid getrusage lstat]) -AC_CHECK_FUNCS([rand_r random setsysinfo]) +## NOTE: clock_gettime may require linking to the rt or posix4 library +## so we'll search for it before calling AC_CHECK_FUNCS. +AC_SEARCH_LIBS([clock_gettime], [rt posix4]) +AC_CHECK_FUNCS([alarm clock_gettime difftime fork frexpf frexpl]) +AC_CHECK_FUNCS([gethostname getpwuid getrusage gettimeofday]) +AC_CHECK_FUNCS([lstat rand_r random setsysinfo]) AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask]) AC_CHECK_FUNCS([snprintf srandom strdup symlink system]) AC_CHECK_FUNCS([tmpfile asprintf vasprintf waitpid]) @@ -2464,6 +2412,7 @@ if test -n "$PARALLEL"; then fi fi + ## ---------------------------------------------------------------------- ## Turn on internal I/O filters by setting macros in header files ## Internal I/O filters are contained entirely within the library and do @@ -2531,82 +2480,44 @@ if test -n "$FILTERS"; then done fi -## ---------------------------------------------------------------------- -## This is defined only when we're using CodeWarrior, since it has a -## broken "open()" call. -# -if test 1 = 2; then - AC_DEFINE([NO_SHARED_WRITING], [1], - [Define if shared writing must be disabled (CodeWarrior only)]) -fi - -## -------------------------------------------------------------------------- -## Should the Default Virtual File Driver be compiled? -## - -AC_MSG_CHECKING([for Default Virtual File Driver definition]) -AC_ARG_WITH([default-vfd], - [AS_HELP_STRING([--with-default-vfd=driver], - [Specify default file driver - [default=sec2]])],, - withval=sec2) - -if test "X$withval" = "Xsec2"; then - AC_MSG_RESULT([yes]) - default_vfd=yes - vfd_define=H5FD_SEC2 -elif test "X$withval" = "Xstdio"; then - AC_MSG_RESULT([yes]) - default_vfd=yes - vfd_define=H5FD_STDIO -else - AC_MSG_RESULT([no]) - default_vfd=no -fi - -if test "X$default_vfd" = "Xyes"; then - AC_DEFINE_UNQUOTED([DEFAULT_VFD], [$vfd_define], - [Define the default virtual file driver to compile]) -fi ## ---------------------------------------------------------------------- ## Check if Direct I/O driver is enabled by --enable-direct-vfd ## -AC_MSG_CHECKING([for Direct Virtual File Driver support]) +## Check these regardless. If the checks are moved inside the main +## direct VFD block, the output is nested. + +AC_CACHE_VAL([hdf5_cv_direct_io], + AC_CHECK_DECL([O_DIRECT], [hdf5_cv_direct_io=yes], [hdf5_cv_direct_io=no], [[#include <fcntl.h>]])) +AC_CACHE_VAL([hdf5_cv_posix_memalign], + AC_CHECK_FUNC([posix_memalign], [hdf5_cv_posix_memalign=yes], [hdf5_cv_posix_memalign=no])) + +AC_MSG_CHECKING([if the direct I/O virtual file driver (VFD) is enabled]) AC_ARG_ENABLE([direct-vfd], [AS_HELP_STRING([--enable-direct-vfd], - [Build the Direct I/O Virtual File Driver - [default=yes]])], - [DIRECT_VFD=$enableval], [DIRECT_VFD=yes]) - -if test "$DIRECT_VFD" = "yes"; then - AC_CACHE_VAL([hdf5_cv_direct_io], - [AC_TRY_RUN([ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> - int main(void) - { - int fid; - if((fid=open("tst_file", O_CREAT | O_TRUNC | O_DIRECT, 0755))<0) - exit(1); - close(fid); - remove("tst_file"); - exit (0); - }], [AC_TRY_LINK(, [posix_memalign()], [hdf5_cv_direct_io=yes], [hdf5_cv_direct_io=no])], [hdf5_cv_direct_io=no],)]) - - if test ${hdf5_cv_direct_io} = "yes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_DIRECT], [1], - [Define if the direct I/O virtual file driver should be compiled]) - else - AC_MSG_RESULT([no]) - DIRECT_VFD=no - fi + [Build the direct I/O virtual file driver (VFD). + This is based on the POSIX (sec2) VFD and + requires the open() call to take the O_DIRECT + flag. [default=no]])], + [DIRECT_VFD=$enableval], [DIRECT_VFD=no]) + +if test "X$DIRECT_VFD" = "Xyes"; then + if test ${hdf5_cv_direct_io} = "yes" && test ${hdf5_cv_posix_memalign} = "yes" ; then + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_DIRECT], [1], + [Define if the direct I/O virtual file driver (VFD) should be compiled]) + else + AC_MSG_RESULT([no]) + DIRECT_VFD=no + AC_MSG_ERROR([The direct VFD was requested but cannot be built. This is either + due to O_DIRECT not being found in fcntl.h or a lack of + posix_memalign() on your system. Please re-configure without + specifying --enable-direct-vfd.]) + fi else - AC_MSG_RESULT([suppressed]) + AC_MSG_RESULT([no]) fi AM_CONDITIONAL([DIRECT_VFD_CONDITIONAL], [test "X$DIRECT_VFD" = "Xyes"]) diff --git a/examples/Makefile.in b/examples/Makefile.in index 5327842..7400481 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -609,8 +609,9 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog $(EXTLINK_DIRS) *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 $(EXTLINK_DIRS) \ + *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example INSTALL_SCRIPT_FILES = run-c-ex.sh INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 2d0e0b7..74914fb 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -665,8 +665,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar # Subdirectories in build order, not including examples directory diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index c468739..eca49ec 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -617,8 +617,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # Compile parallel fortran examples only if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt index 8c1b45a..22a091e 100644 --- a/fortran/src/CMakeLists.txt +++ b/fortran/src/CMakeLists.txt @@ -11,6 +11,8 @@ if (WIN32) endif (NOT H5_HAVE_PARALLEL) if (NOT HDF5_ENABLE_F2003) set (H5_NOF03EXP ";") + else (NOT HDF5_ENABLE_F2003) + set (H5_F03EXP ";") endif (NOT HDF5_ENABLE_F2003) configure_file (${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def.in ${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def @ONLY) endif (MSVC) diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c index b6bcf5f..878119f 100644 --- a/fortran/src/H5Tf.c +++ b/fortran/src/H5Tf.c @@ -1738,21 +1738,23 @@ nh5tenum_create_c ( hid_t_f *parent_id , hid_t_f *new_type_id) /****if* H5Tf/h5tenum_insert_c * NAME - * h5tenum_insert_c + * h5tenum_insert_c * PURPOSE - * Call H5Tenum_insert to insert a new enumeration datatype member. + * Call H5Tenum_insert to insert a new enumeration datatype member. * INPUTS - * type_id - identifier of the datatype - * name - Name of the new member - * namelen - length of the name - * value - value of the new member + * type_id - identifier of the datatype + * name - Name of the new member + * namelen - length of the name + * value - value of the new member * RETURNS - * 0 on success, -1 on failure + * 0 on success, -1 on failure * AUTHOR * XIANGYANG SU - * Thursday, February 3, 2000 + * Thursday, February 3, 2000 * HISTORY - * + * 'value' is no longer cast into an int. If the user passes in an 8 byte integer then + * it should not be cast to an int (which might be 4 bytes). Instead the value + * is written as the size of an int_f. * SOURCE */ @@ -1761,19 +1763,18 @@ nh5tenum_insert_c(hid_t_f *type_id, _fcd name, int_f* namelen, int_f* value) /******/ { int ret_value = -1; - hid_t c_type_id; char* c_name; size_t c_namelen; - int_f c_value; herr_t error; + int_f c_value; c_namelen = *namelen; c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; - c_type_id = (hid_t)*type_id; - c_value = (int)*value; - error = H5Tenum_insert(c_type_id, c_name, &c_value); + c_value = *value; + error = H5Tenum_insert((hid_t)*type_id, c_name, &c_value); + HDfree(c_name); if(error < 0) return ret_value; @@ -2437,7 +2438,7 @@ h5tconvert_c(hid_t_f *src_id, hid_t_f *dst_id, size_t_f *nelmts, void *buf, void * 0 on success, -1 on failure * AUTHOR * M. Scot Breitenfeld - * 2/6/2015 + * February 6, 2015 * * SOURCE */ diff --git a/fortran/src/H5Tff_F03.f90 b/fortran/src/H5Tff_F03.f90 index beff717..2c9f212 100644 --- a/fortran/src/H5Tff_F03.f90 +++ b/fortran/src/H5Tff_F03.f90 @@ -118,7 +118,7 @@ CONTAINS END SUBROUTINE h5tconvert_f ! -!****s* (F03) H5T/h5tenaum_insert_f03 +!****s* (F03) H5T/h5tenum_insert_f90 ! ! NAME ! h5tenum_insert_f @@ -146,7 +146,7 @@ CONTAINS IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier CHARACTER(LEN=*), INTENT(IN) :: name !Name of the new member - INTEGER, INTENT(IN) :: value !value of the new member + INTEGER, INTENT(IN) :: value ! value of the new member INTEGER, INTENT(OUT) :: hdferr ! Error code !***** INTEGER :: namelen @@ -169,7 +169,7 @@ CONTAINS END SUBROUTINE h5tenum_insert_f90 ! -!****s* (F03) H5T/h5tenaum_insert_f03 +!****s* (F03) H5T/h5tenum_insert_f03 ! ! NAME ! h5tenum_insert_f diff --git a/fortran/src/H5Tff_F90.f90 b/fortran/src/H5Tff_F90.f90 index 8540d2b..380fbec 100644 --- a/fortran/src/H5Tff_F90.f90 +++ b/fortran/src/H5Tff_F90.f90 @@ -44,7 +44,7 @@ CONTAINS !****s* H5T/h5tenum_insert_f ! ! NAME -! h5tenaum_insert_f +! h5tenum_insert_f ! ! PURPOSE ! Inserts a new enumeration datatype member. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 7466528..cf29fed 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -726,8 +726,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in index 9a6fac5..48fb343 100644 --- a/fortran/src/hdf5_fortrandll.def.in +++ b/fortran/src/hdf5_fortrandll.def.in @@ -543,7 +543,6 @@ H5T_mp_H5TINSERT_F H5T_mp_H5TPACK_F H5T_mp_H5TARRAY_CREATE_F H5T_mp_H5TENUM_CREATE_F -H5T_PROVISIONAL_mp_H5TENUM_INSERT_F H5T_mp_H5TENUM_NAMEOF_F H5T_mp_H5TENUM_VALUEOF_F H5T_mp_H5TGET_MEMBER_VALUE_F @@ -560,6 +559,7 @@ H5T_mp_H5TGET_CREATE_PLIST_F H5T_mp_H5TCOMPILER_CONV_F H5T_mp_H5TGET_NATIVE_TYPE_F @H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TCONVERT_F +@H5_F03EXP@H5T_PROVISIONAL_mp_H5TENUM_INSERT_F @H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TENUM_INSERT_F90 @H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TENUM_INSERT_F03 ; H5Z diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 3b235d4..3395906 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${ # Add Test Lib #----------------------------------------------------------------------------- add_library (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c) +set_source_files_properties (t.c PROPERTIES LANGUAGE C) TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} " " " ") target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} @@ -18,12 +19,14 @@ target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET} H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE}) set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran + LINKER_LANGUAGE C INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) # See if the F2008 intrinsic STORAGE_SIZE and C_SIZEOF are supported. If not then # fall back to F2003. If F2003 not supported then use F90 for the tests. +set_source_files_properties (tf_F90.f90 tf_F03.f90 tf_F08.f90 tf.f90 PROPERTIES LANGUAGE Fortran) if (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF) add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F08.f90 tf.f90) elseif (HDF5_ENABLE_F2003) @@ -36,7 +39,7 @@ endif (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF) set (SHARED_LINK_FLAGS " ") if (WIN32) if (BUILD_SHARED_LIBS) - set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_DLL) + set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_TEST_DLL) if (MSVC) set (SHARED_LINK_FLAGS "/DLL") endif (MSVC) @@ -53,6 +56,7 @@ target_link_libraries (${HDF5_F90_TEST_LIB_TARGET} H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE}) set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran + LINKER_LANGUAGE Fortran INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index c2055c4..4d1e458 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -735,10 +735,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.raw +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.raw # The Fortran test library noinst_LTLIBRARIES = libh5test_fortran.la diff --git a/fortran/test/tH5T_F03.f90 b/fortran/test/tH5T_F03.f90 index d9a671c..e019d0f 100644 --- a/fortran/test/tH5T_F03.f90 +++ b/fortran/test/tH5T_F03.f90 @@ -1428,7 +1428,11 @@ SUBROUTINE t_enum(total_error) f_ptr = C_LOC(val(1)) CALL H5Tconvert_f(M_BASET, F_BASET, INT(1,SIZE_T), f_ptr, error) CALL check("H5Tconvert_f",error, total_error) - CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), val(1), error) + IF(i.GE.1)THEN ! test both F90 and F03 APIs + CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), f_ptr, error) + ELSE + CALL H5Tenum_insert_f(filetype, TRIM(names(i+1)), val(1), error) + ENDIF CALL check("H5Tenum_insert_f",error, total_error) ENDDO ! @@ -3134,7 +3138,7 @@ SUBROUTINE t_enum_conv(total_error) ENUMERATOR :: E1_RED, E1_GREEN, E1_BLUE, E1_WHITE, E1_BLACK END ENUM - INTEGER :: val + INTEGER(KIND(E1_RED)), TARGET :: val ! Enumerated data array ! Some values are out of range for testing. The library should accept them @@ -3185,19 +3189,19 @@ SUBROUTINE t_enum_conv(total_error) ! Initialize enum data. ! val = E1_RED - CALL H5Tenum_insert_f(dtype, "RED", val, error) + CALL H5Tenum_insert_f(dtype, "RED", C_LOC(val), error) CALL check("h5tenum_insert_f",error, total_error) val = E1_GREEN - CALL H5Tenum_insert_f(dtype, "GREEN", val, error) + CALL H5Tenum_insert_f(dtype, "GREEN", C_LOC(val), error) CALL check("h5tenum_insert_f",error, total_error) val = E1_BLUE - CALL H5Tenum_insert_f(dtype, "BLUE", val, error) + CALL H5Tenum_insert_f(dtype, "BLUE", C_LOC(val), error) CALL check("h5tenum_insert_f",error, total_error) val = E1_WHITE - CALL H5Tenum_insert_f(dtype, "WHITE", val, error) + CALL H5Tenum_insert_f(dtype, "WHITE", C_LOC(val), error) CALL check("h5tenum_insert_f",error, total_error) val = E1_BLACK - CALL H5Tenum_insert_f(dtype, "BLACK", val, error) + CALL H5Tenum_insert_f(dtype, "BLACK", C_LOC(val), error) CALL check("h5tenum_insert_f",error, total_error) ! ! Create dataspace. Setting maximum size to be the current size. diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90 index 063e93d..6d5911f 100644 --- a/fortran/test/tf.f90 +++ b/fortran/test/tf.f90 @@ -36,7 +36,7 @@ MODULE TH5_MISC CONTAINS !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: dreal_eq !DEC$endif LOGICAL FUNCTION dreal_eq(a,b) @@ -49,7 +49,7 @@ CONTAINS END FUNCTION dreal_eq !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: verify_real_kind_7 !DEC$endif SUBROUTINE verify_real_kind_7(string,value,correct_value,total_error) @@ -66,7 +66,7 @@ CONTAINS END SUBROUTINE verify_real_kind_7 !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: write_test_status !DEC$endif SUBROUTINE write_test_status( test_result, test_title, total_error) @@ -105,7 +105,7 @@ CONTAINS !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: check !DEC$endif SUBROUTINE check(string,error,total_error) @@ -119,7 +119,7 @@ CONTAINS END SUBROUTINE check !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: verify !DEC$endif SUBROUTINE VERIFY(string,value,correct_value,total_error) @@ -133,7 +133,7 @@ CONTAINS END SUBROUTINE verify !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: verify_Fortran_INTEGER_4 !DEC$endif SUBROUTINE verify_Fortran_INTEGER_4(string,value,correct_value,total_error) @@ -150,7 +150,7 @@ CONTAINS END SUBROUTINE verify_Fortran_INTEGER_4 !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: verifyLogical !DEC$endif SUBROUTINE verifyLogical(string,value,correct_value,total_error) @@ -165,7 +165,7 @@ CONTAINS END SUBROUTINE verifyLogical !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: verifyString !DEC$endif SUBROUTINE verifyString(string, value,correct_value,total_error) @@ -203,7 +203,7 @@ CONTAINS SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr) ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_fixname_f !DEC$endif USE H5GLOBAL @@ -263,7 +263,7 @@ CONTAINS SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr) ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_cleanup_f !DEC$endif USE H5GLOBAL @@ -315,7 +315,7 @@ CONTAINS SUBROUTINE h5_exit_f(status) ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_exit_f !DEC$endif IMPLICIT NONE @@ -352,7 +352,7 @@ CONTAINS SUBROUTINE h5_env_nocleanup_f(HDF5_NOCLEANUP) ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_env_nocleanup_f !DEC$endif IMPLICIT NONE diff --git a/fortran/test/tf_F03.f90 b/fortran/test/tf_F03.f90 index 4513783..b3f1399 100644 --- a/fortran/test/tf_F03.f90 +++ b/fortran/test/tf_F03.f90 @@ -66,7 +66,7 @@ MODULE TH5_MISC_PROVISIONAL CONTAINS !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_cmpd !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a) @@ -78,7 +78,7 @@ CONTAINS END FUNCTION H5_SIZEOF_CMPD !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_chr !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a) @@ -90,7 +90,7 @@ CONTAINS END FUNCTION H5_SIZEOF_CHR !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_i !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a) @@ -102,7 +102,7 @@ CONTAINS END FUNCTION H5_SIZEOF_I !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_sp !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a) @@ -114,7 +114,7 @@ CONTAINS END FUNCTION H5_SIZEOF_SP !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_dp !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a) diff --git a/fortran/test/tf_F08.f90 b/fortran/test/tf_F08.f90 index 5583f3f..20c2859 100644 --- a/fortran/test/tf_F08.f90 +++ b/fortran/test/tf_F08.f90 @@ -65,7 +65,7 @@ MODULE TH5_MISC_PROVISIONAL CONTAINS !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_cmpd !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a) @@ -77,7 +77,7 @@ CONTAINS END FUNCTION H5_SIZEOF_CMPD !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_chr !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a) @@ -89,7 +89,7 @@ CONTAINS END FUNCTION H5_SIZEOF_CHR !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_i !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a) @@ -102,7 +102,7 @@ CONTAINS !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_sp !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a) @@ -114,7 +114,7 @@ CONTAINS END FUNCTION H5_SIZEOF_SP !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_TEST_DLL) !DEC$attributes dllexport :: h5_sizeof_dp !DEC$endif INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a) diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 97e59ed..fb38854 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -661,10 +661,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files -CHECK_CLEANFILES = *.chkexe *.chklog *.clog parf[12].h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 parf[12].h5 # These are our main targets TEST_PROG_PARA = parallel_test diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90 index a03095a..a2e2e07 100644 --- a/fortran/testpar/hyper.f90 +++ b/fortran/testpar/hyper.f90 @@ -21,8 +21,8 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors) USE HDF5 USE TH5_MISC - USE mpi IMPLICIT NONE + INCLUDE 'mpif.h' INTEGER, INTENT(in) :: length ! array length LOGICAL, INTENT(in) :: do_collective ! use collective I/O diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90 index f24c862..7fe431b 100644 --- a/fortran/testpar/mdset.f90 +++ b/fortran/testpar/mdset.f90 @@ -21,8 +21,8 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors) USE HDF5 USE TH5_MISC - USE mpi IMPLICIT NONE + INCLUDE 'mpif.h' INTEGER, INTENT(in) :: length ! array length LOGICAL, INTENT(in) :: do_collective ! use collective I/O diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90 index 145d084..69594b0 100644 --- a/fortran/testpar/ptest.f90 +++ b/fortran/testpar/ptest.f90 @@ -19,8 +19,9 @@ PROGRAM parallel_test USE hdf5 - USE mpi + IMPLICIT NONE + INCLUDE 'mpif.h' INTEGER :: mpierror ! MPI hdferror flag INTEGER :: hdferror ! HDF hdferror flag diff --git a/hl/Makefile.in b/hl/Makefile.in index 6ca0805..f3d6c04 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -665,8 +665,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran @BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++ @BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test tools $(CXX_DIR) $(FORTRAN_DIR) diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index f16130a..0367469 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -661,8 +661,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 SUBDIRS = src test DIST_SUBDIRS = src test examples diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 83f07f2..a9ecd9e 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # These are the programs that 'make all' or 'make prog' will build and # which 'make check' will run. List them in the order they should be run. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 98110b9..7e8c4ba 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -667,8 +667,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 7e50ec4..1160548 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -664,8 +664,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 43c6e3c..92a8301 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = # Example directory diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt index d32f85f..892169c 100644 --- a/hl/fortran/CMakeLists.txt +++ b/hl/fortran/CMakeLists.txt @@ -9,9 +9,9 @@ add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src) #----------------------------------------------------------------------------- # Build the HL Fortran Examples #----------------------------------------------------------------------------- -if (HDF5_BUILD_FORTRAN_EXAMPLES) +if (HDF5_BUILD_EXAMPLES) add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples) -endif (HDF5_BUILD_FORTRAN_EXAMPLES) +endif (HDF5_BUILD_EXAMPLES) #----------------------------------------------------------------------------- # Testing diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index ff02a60..7c6f2e2 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -665,8 +665,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 SUBDIRS = src test DIST_SUBDIRS = src test examples diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 27b1dee..af5a18a 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # Compile parallel fortran examples only if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index c3a6562..f188a53 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -45,6 +45,7 @@ set (HDF5_HL_F90_F_SRCS ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.f90 ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.f90 ) +set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran) add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS}) set (SHARED_LINK_FLAGS " ") @@ -52,8 +53,8 @@ if (BUILD_SHARED_LIBS) if (WIN32) set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS - BUILD_HDF5_DLL - ) + BUILD_HDF5_HL_DLL + ) if (MSVC) set (SHARED_LINK_FLAGS "/DLL") endif (MSVC) @@ -72,6 +73,7 @@ set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE}) set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES FOLDER libraries/hl/fortran + LINKER_LANGUAGE Fortran INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) diff --git a/hl/fortran/src/H5DSff.f90 b/hl/fortran/src/H5DSff.f90 index 4fbd90a..8cb568e 100644 --- a/hl/fortran/src/H5DSff.f90 +++ b/hl/fortran/src/H5DSff.f90 @@ -48,7 +48,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsset_scale_f !DEC$endif ! @@ -106,7 +106,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsattach_scale_f !DEC$endif ! @@ -159,7 +159,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsdetach_scale_f !DEC$endif ! @@ -213,7 +213,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsis_attached_f !DEC$endif ! @@ -281,7 +281,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsis_scale_f !DEC$endif ! @@ -338,7 +338,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsset_label_f !DEC$endif ! @@ -397,7 +397,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsget_label_f !DEC$endif ! @@ -455,7 +455,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsget_scale_name_f !DEC$endif ! @@ -507,7 +507,7 @@ CONTAINS ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5dsget_num_scales_f !DEC$endif ! diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90 index 2a66597..37030ac 100644 --- a/hl/fortran/src/H5IMff.f90 +++ b/hl/fortran/src/H5IMff.f90 @@ -51,7 +51,7 @@ subroutine h5immake_image_8bit_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5immake_image_8bit_f !DEC$endif ! @@ -115,7 +115,7 @@ subroutine h5imread_image_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imread_image_f !DEC$endif ! @@ -175,7 +175,7 @@ subroutine h5immake_image_24bit_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5immake_image_24bit_f !DEC$endif ! @@ -249,7 +249,7 @@ subroutine h5imget_image_info_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_image_info_f !DEC$endif ! @@ -317,7 +317,7 @@ integer function h5imis_image_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imis_image_f !DEC$endif ! @@ -375,7 +375,7 @@ subroutine h5immake_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5immake_palette_f !DEC$endif ! @@ -436,7 +436,7 @@ subroutine h5imlink_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imlink_palette_f !DEC$endif ! @@ -497,7 +497,7 @@ subroutine h5imunlink_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imunlink_palette_f !DEC$endif ! @@ -561,7 +561,7 @@ subroutine h5imget_npalettes_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_npalettes_f !DEC$endif ! @@ -621,7 +621,7 @@ subroutine h5imget_palette_info_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_palette_info_f !DEC$endif ! @@ -684,7 +684,7 @@ subroutine h5imget_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imget_palette_f !DEC$endif ! @@ -742,7 +742,7 @@ integer function h5imis_palette_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5imis_palette_f !DEC$endif ! diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90 index b06a8fe..8df024e 100644 --- a/hl/fortran/src/H5LTff.f90 +++ b/hl/fortran/src/H5LTff.f90 @@ -163,7 +163,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int1 !DEC$endif ! @@ -229,7 +229,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int2 !DEC$endif ! @@ -297,7 +297,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int3 !DEC$endif ! @@ -360,7 +360,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int4 !DEC$endif ! @@ -423,7 +423,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int5 !DEC$endif ! @@ -486,7 +486,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int6 !DEC$endif ! @@ -549,7 +549,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_int7 !DEC$endif ! @@ -618,7 +618,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float1 !DEC$endif ! @@ -684,7 +684,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float2 !DEC$endif ! @@ -752,7 +752,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float3 !DEC$endif ! @@ -815,7 +815,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float4 !DEC$endif ! @@ -878,7 +878,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float5 !DEC$endif ! @@ -941,7 +941,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float6 !DEC$endif ! @@ -1004,7 +1004,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_float7 !DEC$endif ! @@ -1072,7 +1072,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double1 !DEC$endif ! @@ -1138,7 +1138,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double2 !DEC$endif ! @@ -1206,7 +1206,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double3 !DEC$endif ! @@ -1269,7 +1269,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double4 !DEC$endif ! @@ -1332,7 +1332,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double5 !DEC$endif ! @@ -1395,7 +1395,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double6 !DEC$endif ! @@ -1458,7 +1458,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_f_double7 !DEC$endif ! @@ -1525,7 +1525,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int1 !DEC$endif ! @@ -1588,7 +1588,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int2 !DEC$endif ! @@ -1653,7 +1653,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int3 !DEC$endif ! @@ -1714,7 +1714,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int4 !DEC$endif ! @@ -1775,7 +1775,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int5 !DEC$endif ! @@ -1836,7 +1836,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int6 !DEC$endif ! @@ -1897,7 +1897,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_int7 !DEC$endif ! @@ -1963,7 +1963,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float1 !DEC$endif ! @@ -2026,7 +2026,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float2 !DEC$endif ! @@ -2092,7 +2092,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float3 !DEC$endif ! @@ -2153,7 +2153,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float4 !DEC$endif ! @@ -2214,7 +2214,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float5 !DEC$endif ! @@ -2275,7 +2275,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float6 !DEC$endif ! @@ -2336,7 +2336,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_float7 !DEC$endif ! @@ -2402,7 +2402,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport ::h5ltread_dataset_f_double1 !DEC$endif ! @@ -2465,7 +2465,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double2 !DEC$endif ! @@ -2530,7 +2530,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double3 !DEC$endif ! @@ -2591,7 +2591,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double4 !DEC$endif ! @@ -2652,7 +2652,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double5 !DEC$endif ! @@ -2713,7 +2713,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double6 !DEC$endif ! @@ -2774,7 +2774,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_f_double7 !DEC$endif ! @@ -2839,7 +2839,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_1 !DEC$endif ! @@ -2903,7 +2903,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_2 !DEC$endif ! @@ -2971,7 +2971,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_3 !DEC$endif ! @@ -3034,7 +3034,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_4 !DEC$endif ! @@ -3097,7 +3097,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_5 !DEC$endif ! @@ -3160,7 +3160,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_6 !DEC$endif ! @@ -3223,7 +3223,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_int_f_7 !DEC$endif ! @@ -3290,7 +3290,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_1 !DEC$endif ! @@ -3354,7 +3354,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_2 !DEC$endif ! @@ -3420,7 +3420,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_3 !DEC$endif ! @@ -3482,7 +3482,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_4 !DEC$endif ! @@ -3544,7 +3544,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_5 !DEC$endif ! @@ -3606,7 +3606,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_6 !DEC$endif ! @@ -3668,7 +3668,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_float_f_7 !DEC$endif ! @@ -3735,7 +3735,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_1 !DEC$endif ! @@ -3802,7 +3802,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_2 !DEC$endif ! @@ -3868,7 +3868,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_3 !DEC$endif ! @@ -3930,7 +3930,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_4 !DEC$endif ! @@ -3992,7 +3992,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5 !DEC$endif ! @@ -4054,7 +4054,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5 !DEC$endif ! @@ -4116,7 +4116,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5 !DEC$endif ! @@ -4181,7 +4181,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_1 !DEC$endif ! @@ -4245,7 +4245,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_2 !DEC$endif ! @@ -4308,7 +4308,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_3 !DEC$endif ! @@ -4367,7 +4367,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_4 !DEC$endif ! @@ -4426,7 +4426,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_5 !DEC$endif ! @@ -4485,7 +4485,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_6 !DEC$endif ! @@ -4544,7 +4544,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_int_f_7 !DEC$endif ! @@ -4608,7 +4608,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_1 !DEC$endif ! @@ -4672,7 +4672,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_2 !DEC$endif ! @@ -4735,7 +4735,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_3 !DEC$endif ! @@ -4794,7 +4794,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_4 !DEC$endif ! @@ -4853,7 +4853,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_5 !DEC$endif ! @@ -4912,7 +4912,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_6 !DEC$endif ! @@ -4971,7 +4971,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_float_f_7 !DEC$endif ! @@ -5034,7 +5034,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_1 !DEC$endif ! @@ -5098,7 +5098,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_2 !DEC$endif ! @@ -5161,7 +5161,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_3 !DEC$endif ! @@ -5220,7 +5220,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_4 !DEC$endif ! @@ -5279,7 +5279,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_5 !DEC$endif ! @@ -5338,7 +5338,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_6 !DEC$endif ! @@ -5397,7 +5397,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_double_f_7 !DEC$endif ! @@ -5460,7 +5460,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltmake_dataset_string_f !DEC$endif ! @@ -5520,7 +5520,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltread_dataset_string_f !DEC$endif ! @@ -5587,7 +5587,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_int_f !DEC$endif ! @@ -5654,7 +5654,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_float_f !DEC$endif ! @@ -5721,7 +5721,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_double_f !DEC$endif ! @@ -5788,7 +5788,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltset_attribute_string_f !DEC$endif ! @@ -5857,7 +5857,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_int_f !DEC$endif ! @@ -5922,7 +5922,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_float_f !DEC$endif ! @@ -5986,7 +5986,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_double_f !DEC$endif ! @@ -6050,7 +6050,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_string_f !DEC$endif ! @@ -6121,7 +6121,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_dataset_ndims_f !DEC$endif ! @@ -6178,7 +6178,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltfind_dataset_f !DEC$endif ! @@ -6236,7 +6236,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_dataset_info_f !DEC$endif ! @@ -6304,7 +6304,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_ndims_f !DEC$endif ! @@ -6371,7 +6371,7 @@ CONTAINS ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltget_attribute_info_f !DEC$endif ! @@ -6434,7 +6434,7 @@ CONTAINS IMPLICIT NONE ! !This definition is needed for Windows DLLs - !DEC$if defined(BUILD_HDF5_DLL) + !DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5ltpath_valid_f !DEC$endif ! diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90 index 76bf77c..8d31a93 100644 --- a/hl/fortran/src/H5TBff.f90 +++ b/hl/fortran/src/H5TBff.f90 @@ -96,7 +96,7 @@ SUBROUTINE h5tbmake_table_f(table_title,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbmake_table_f !DEC$endif ! @@ -219,7 +219,7 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_int !DEC$endif ! @@ -295,7 +295,7 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_float !DEC$endif ! @@ -373,7 +373,7 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_double !DEC$endif ! @@ -449,7 +449,7 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_name_f_string !DEC$endif ! @@ -526,7 +526,7 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_int !DEC$endif ! @@ -602,7 +602,7 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_float !DEC$endif ! @@ -678,7 +678,7 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_double !DEC$endif ! @@ -754,7 +754,7 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_name_f_string !DEC$endif ! @@ -831,7 +831,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_int !DEC$endif ! @@ -903,7 +903,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_float !DEC$endif ! @@ -977,7 +977,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_double !DEC$endif ! @@ -1049,7 +1049,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbwrite_field_index_f_string !DEC$endif ! @@ -1122,7 +1122,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport ::h5tbread_field_index_f_int !DEC$endif ! @@ -1194,7 +1194,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_index_f_float !DEC$endif ! @@ -1266,7 +1266,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_index_f_double !DEC$endif ! @@ -1338,7 +1338,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbread_field_index_f_string !DEC$endif ! @@ -1409,7 +1409,7 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_int !DEC$endif ! @@ -1483,7 +1483,7 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_float !DEC$endif ! @@ -1557,7 +1557,7 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_double !DEC$endif ! @@ -1632,7 +1632,7 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbinsert_field_f_string !DEC$endif ! @@ -1704,7 +1704,7 @@ SUBROUTINE h5tbdelete_field_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbdelete_field_f !DEC$endif ! @@ -1771,7 +1771,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,& ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbget_table_info_f !DEC$endif ! @@ -1836,7 +1836,7 @@ SUBROUTINE h5tbget_field_info_f(loc_id,& IMPLICIT NONE ! !This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) +!DEC$if defined(BUILD_HDF5_HL_DLL) !DEC$attributes dllexport :: h5tbget_field_info_f !DEC$endif ! diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 6979867..3ccfb9d 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -682,8 +682,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 50b8780..e1b28a5 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -673,11 +673,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog dsetf[1-5].h5 f1img.h5 \ - f1tab.h5 tstds.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 dsetf[1-5].h5 \ + f1img.h5 f1tab.h5 tstds.h5 # Our main target, the test programs TEST_PROG = tstds tstlite tstimage tsttable diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index ed725a3..9d6123b 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1981,7 +1981,8 @@ find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo, * cause the iterator to immediately return that positive value, * indicating short-circuit success */ - if(HDstrncmp(name, (char *)op_data, HDstrlen((char *)op_data)) == 0) + + if(HDstrncmp(name, (char *)op_data, MAX(HDstrlen((char *)op_data),HDstrlen(name))) == 0) ret = H5_ITER_STOP; return ret; diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c index 7a0bc20..6ed1ac0 100644 --- a/hl/src/H5PT.c +++ b/hl/src/H5PT.c @@ -130,6 +130,9 @@ hid_t H5PTcreate_fl ( hid_t loc_id, if((table->type_id = H5Tcopy(dtype_id)) < 0) goto out; + if((table->type_id = H5Tget_native_type(table->type_id, H5T_DIR_DEFAULT)) < 0) + goto out; + H5PT_create_index(table); table->size = 0; diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index d69d673..490f639 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -663,8 +663,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index b0651ad..9bb1593 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -714,14 +714,14 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. These files are the ones created by running `make test'. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog combine_tables[1-2].h5 \ - test_ds[1-9].h5 test_ds10.h5 test_image[1-3].h5 \ - file_img[1-2].h5 test_lite[1-4].h5 test_table.h5 \ - test_packet_table.h5 test_packet_compress.h5 test_detach.h5 \ - test_dectris.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 \ + combine_tables[1-2].h5 test_ds[1-9].h5 test_ds10.h5 \ + test_image[1-3].h5 file_img[1-2].h5 test_lite[1-4].h5 \ + test_table.h5 test_packet_table.h5 test_packet_compress.h5 \ + test_detach.h5 test_dectris.h5 # Test script TEST_SCRIPT = test_ld.sh diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index d61d6cf..19d3759 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -36,10 +36,12 @@ #define DIM 6 +#define ATTR_NAME_SUB "att" #define ATTR1_NAME "attr string" #define ATTR2_NAME "attr char" #define ATTR3_NAME "attr short" #define ATTR4_NAME "attr int" +#define ATTR_NAME_EXT "att int ext" #define ATTR5_NAME "attr long" #define ATTR6_NAME "attr uchar" #define ATTR7_NAME "attr ushort" @@ -646,6 +648,14 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name ) if ( H5LTset_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_in, (size_t)5 ) < 0 ) return -1; + /* Set the attribute which is a substring of an existing attribute */ + if ( H5LTset_attribute_int( loc_id, obj_name, ATTR_NAME_SUB, attr_int_in, (size_t)5 ) < 0 ) + return -1; + + /* Set the attribute which is an extension of an existing attribute */ + if ( H5LTset_attribute_int( loc_id, obj_name, ATTR_NAME_EXT, attr_int_in, (size_t)5 ) < 0 ) + return -1; + PASSED(); /*------------------------------------------------------------------------- @@ -666,6 +676,26 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name ) } } + if ( H5LTget_attribute_int( loc_id, obj_name, ATTR_NAME_SUB, attr_int_out ) < 0 ) + return -1; + + for (i = 0; i < 5; i++) + { + if ( attr_int_in[i] != attr_int_out[i] ) { + return -1; + } + } + + if ( H5LTget_attribute_int( loc_id, obj_name, ATTR_NAME_EXT, attr_int_out ) < 0 ) + return -1; + + for (i = 0; i < 5; i++) + { + if ( attr_int_in[i] != attr_int_out[i] ) { + return -1; + } + } + /* Get the attribute */ if ( H5LTget_attribute( loc_id, obj_name, ATTR4_NAME, H5T_NATIVE_INT, attr_int_out ) < 0 ) return -1; diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c index 9d3074d..c7a1c27 100644 --- a/hl/test/test_packet.c +++ b/hl/test/test_packet.c @@ -895,6 +895,92 @@ error: return -1; } +/*------------------------------------------------------------------------- + * test_rw_non-native_dt + * + * test reading and writing packet table using datatypes that are not + * native. + * + *------------------------------------------------------------------------- + */ +static int test_rw_nonnative_dt(hid_t fid) +{ + hid_t ptable; /* Packet table identifier */ + + herr_t err; /* Function return status */ + hsize_t count; /* Number of records in the table */ + + int x; /* Loop variable */ + + /* Buffers to hold data */ + int writeBuffer[5]; + int readBuffer[5]; + + TESTING("reading/writing non-native packet table"); + + /* Initialize buffers */ + for(x=0; x<5; x++) { + writeBuffer[x]=x; + readBuffer[x] = -1; + } + + /* Create a fixed-length packet table within the file */ + /* This table's "packets" will be simple integers and it will use no compression */ + if(H5Tget_order(H5T_NATIVE_INT) == H5T_ORDER_LE) { + ptable = H5PTcreate_fl(fid, "Packet Test Dataset, Non-native", H5T_STD_I32BE, (hsize_t)100, -1); + } else { + ptable = H5PTcreate_fl(fid, "Packet Test Dataset, Non-native", H5T_STD_I32LE, (hsize_t)100, -1); + } + if(ptable == H5I_INVALID_HID) + goto out; + + /* Write one packet to the packet table */ + if( (err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]))) < 0 ) + goto out; + + /* Write several packets to the packet table */ + if( (err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]))) < 0) + goto out; + + if( (err = H5PTclose(ptable)) < 0) + goto out; + + /* Open the Packet table */ + if( (ptable = H5PTopen(fid, "Packet Test Dataset, Non-native")) < 0) + goto out; + + /* Get the number of packets in the packet table. This should be five. */ + if( (err = H5PTget_num_packets(ptable, &count)) < 0) + goto out; + + if( (int)count != 5 ) + goto out; + + /* Initialize packet table's "current record" */ + if( (err = H5PTcreate_index(ptable)) < 0) + goto out; + + /* Iterate through packets, read each one back */ + for(x=0; x<5; x++) { + if( (err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]))) < 0) + goto out; + if( x != readBuffer[x]) + goto out; + } + + /* Close the packet table */ + if( (err = H5PTclose(ptable)) < 0) + goto out; + + PASSED(); + return 0; + + out: + H5_FAILED(); + if( H5PTis_valid(ptable) < 0) + H5PTclose(ptable); + return -1; +} /*------------------------------------------------------------------------- * test_error @@ -1035,6 +1121,7 @@ static int test_packet_table(hid_t fid) test_read(fid); test_get_next(fid); test_big_table(fid); + test_rw_nonnative_dt(fid); #ifdef VLPT_REMOVED test_varlen(fid); #endif /* VLPT_REMOVED */ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 2490588..60ed15793 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -662,8 +662,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 CONFIG = ordered # All subdirectories diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 2317975..b8fdd3a 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -676,8 +676,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.gif +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.gif # These are our main targets, the tools TEST_SCRIPT = h52giftest.sh diff --git a/hl/tools/h5watch/Makefile.in b/hl/tools/h5watch/Makefile.in index c76798f..9f0dba0 100644 --- a/hl/tools/h5watch/Makefile.in +++ b/hl/tools/h5watch/Makefile.in @@ -673,9 +673,9 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # These are our main targets, the tools TEST_SCRIPT = testh5watch.sh diff --git a/m4/aclocal_fc.m4 b/m4/aclocal_fc.m4 index 03bd026..cda2fee 100644 --- a/m4/aclocal_fc.m4 +++ b/m4/aclocal_fc.m4 @@ -156,13 +156,13 @@ dnl HAVE_F2003_REQUIREMENTS="no" AC_LINK_IFELSE([AC_LANG_PROGRAM([],[ - USE iso_c_binding - IMPLICIT NONE - TYPE(C_PTR) :: ptr - TYPE(C_FUNPTR) :: funptr - CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr + USE iso_c_binding + IMPLICIT NONE + TYPE(C_PTR) :: ptr + TYPE(C_FUNPTR) :: funptr + CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr - ptr = C_LOC(ichr(1:1)) + ptr = C_LOC(ichr(1:1)) ])],[AC_MSG_RESULT([yes]) HAVE_F2003_REQUIREMENTS=[yes]], @@ -268,7 +268,7 @@ dnl Try link a simple MPI program. AC_MSG_CHECKING([whether a simple MPI-IO Fortran program can be linked]) AC_LINK_IFELSE([ PROGRAM main - USE mpi + INCLUDE 'mpif.h' INTEGER :: comm, amode, info, fh, ierror CHARACTER(LEN=1) :: filename CALL MPI_File_open( comm, filename, amode, info, fh, ierror) @@ -52,7 +52,9 @@ /* Local Prototypes */ /********************/ static void H5_debug_mask(const char*); - +#ifdef H5_HAVE_PARALLEL +static int H5_mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *flag); +#endif /*H5_HAVE_PARALLEL*/ /*********************/ /* Package Variables */ @@ -109,6 +111,43 @@ H5_init_library(void) herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(FAIL) + +#ifdef H5_HAVE_PARALLEL + { + int mpi_initialized; + int mpi_code; + + MPI_Initialized(&mpi_initialized); + +#ifdef H5_HAVE_MPE + /* Initialize MPE instrumentation library. */ + if (!H5_MPEinit_g) + { + int mpe_code; + if (mpi_initialized){ + mpe_code = MPE_Init_log(); + HDassert(mpe_code >=0); + H5_MPEinit_g = TRUE; + } + } +#endif /*H5_HAVE_MPE*/ + + /* add an attribute on MPI_COMM_SELF to call H5_term_library + when it is destroyed, i.e. on MPI_Finalize */ + if (mpi_initialized) { + int key_val; + + if(MPI_SUCCESS != (mpi_code = MPI_Comm_create_keyval(MPI_NULL_COPY_FN, + (MPI_Comm_delete_attr_function *)H5_mpi_delete_cb, + &key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_create_keyval failed", mpi_code) + + if(MPI_SUCCESS != (mpi_code = MPI_Comm_set_attr(MPI_COMM_SELF, key_val, NULL))) + HMPI_GOTO_ERROR(FAIL, "MPI_Comm_set_attr failed", mpi_code) + } + } +#endif /*H5_HAVE_PARALLEL*/ + /* * Make sure the package information is updated. */ @@ -132,24 +171,6 @@ H5_init_library(void) H5_debug_g.pkg[H5_PKG_V].name = "v"; H5_debug_g.pkg[H5_PKG_Z].name = "z"; -#ifdef H5_HAVE_MPE - /* Initialize MPE instrumentation library. May need to move this - * up earlier if any of the above initialization involves using - * the instrumentation code. - */ - if (!H5_MPEinit_g) - { - int mpe_code; - int mpi_initialized; - MPI_Initialized(&mpi_initialized); - if (mpi_initialized){ - mpe_code = MPE_Init_log(); - HDassert(mpe_code >=0); - H5_MPEinit_g = TRUE; - } - } -#endif - /* * Install atexit() library cleanup routines unless the H5dont_atexit() * has been called. Once we add something to the atexit() list it stays @@ -580,6 +601,27 @@ H5_debug_mask(const char *s) } } /* end H5_debug_mask() */ +#ifdef H5_HAVE_PARALLEL + +/*------------------------------------------------------------------------- + * Function: H5_mpi_delete_cb + * + * Purpose: Callback attribute on MPI_COMM_SELF to terminate the HDF5 + * library when the communicator is destroyed, i.e. on MPI_Finalize. + * + * Return: MPI_SUCCESS + * + * Programmer: Mohamad Chaarawi, February 2015 + * + *------------------------------------------------------------------------- + */ +static int H5_mpi_delete_cb(MPI_Comm UNUSED comm, int UNUSED keyval, void UNUSED *attr_val, int UNUSED *flag) +{ + H5_term_library(); + return MPI_SUCCESS; +} +#endif /*H5_HAVE_PARALLEL*/ + /*------------------------------------------------------------------------- * Function: H5get_libversion diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c index 3e9444b..6a83745 100644 --- a/src/H5Edeprec.c +++ b/src/H5Edeprec.c @@ -152,6 +152,7 @@ H5Eget_major(H5E_major_t maj) char *ret_value; /* Return value */ FUNC_ENTER_API_NOCLEAR(NULL) + H5TRACE1("*s", "i", maj); /* Get the message object */ if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG))) @@ -204,6 +205,7 @@ H5Eget_minor(H5E_minor_t min) char *ret_value; /* Return value */ FUNC_ENTER_API_NOCLEAR(NULL) + H5TRACE1("*s", "i", min); /* Get the message object */ if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG))) @@ -886,6 +886,7 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) H5FD_t *ret_value=NULL; FUNC_ENTER_API(NULL) + H5TRACE4("*x", "*sIuia", name, flags, fapl_id, maxaddr); /* Check arguments */ if(H5P_DEFAULT == fapl_id) @@ -952,6 +952,7 @@ H5Iobject_verify(hid_t id, H5I_type_t id_type) void * ret_value; /* Return value */ FUNC_ENTER_API(NULL) + H5TRACE2("*x", "iIt", id, id_type); if(H5I_IS_LIB_TYPE(id_type)) HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type") @@ -1092,6 +1093,7 @@ H5Iremove_verify(hid_t id, H5I_type_t id_type) void * ret_value; /* Return value */ FUNC_ENTER_API(NULL) + H5TRACE2("*x", "iIt", id, id_type); if(H5I_IS_LIB_TYPE(id_type)) HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type") @@ -1940,6 +1942,7 @@ H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key) void *ret_value; /* Return value */ FUNC_ENTER_API(NULL) + H5TRACE3("*x", "Itx*x", type, func, key); /* Check arguments */ if(H5I_IS_LIB_TYPE(type)) diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 612d656..c9375f9 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -200,8 +200,8 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, /* decode */ for(i = 0; i < 14; i++) - if(!HDisdigit(p[i])) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message") + if(!HDisdigit(p[i])) + HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message") /* * Convert YYYYMMDDhhmmss UTC to a time_t. This is a little problematic @@ -219,36 +219,14 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, tm.tm_sec = (p[12]-'0')*10 + (p[13]-'0'); tm.tm_isdst = -1; /*figure it out*/ if((time_t)-1 == (the_time = HDmktime(&tm))) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message") + HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message") #if defined(H5_HAVE_TM_GMTOFF) - /* FreeBSD, OSF 4.0 */ + /* BSD-like systems */ the_time += tm.tm_gmtoff; -#elif defined(H5_HAVE___TM_GMTOFF) - /* Linux libc-4 */ - the_time += tm.__tm_gmtoff; #elif defined(H5_HAVE_TIMEZONE) - /* Linux libc-5 */ - the_time -= timezone - (tm.tm_isdst?3600:0); -#elif defined(H5_HAVE_BSDGETTIMEOFDAY) && defined(H5_HAVE_STRUCT_TIMEZONE) - /* Irix5.3 */ - { - struct timezone tz; - - if(HDBSDgettimeofday(NULL, &tz) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to obtain local timezone information") - the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); - } -#elif defined(H5_HAVE_GETTIMEOFDAY) && defined(H5_HAVE_STRUCT_TIMEZONE) && defined(H5_GETTIMEOFDAY_GIVES_TZ) - { - struct timezone tz; - struct timeval tv; /* Used as a placebo; some systems don't like NULL */ - - if(HDgettimeofday(&tv, &tz) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to obtain local timezone information") - - the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); - } + /* GNU/Linux systems */ + the_time -= timezone - (tm.tm_isdst ? 3600 : 0); #else /* * The catch-all. If we can't convert a character string universal @@ -257,14 +235,12 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, * only way a user can get the modification time is from our internal * query routines, which can gracefully recover. */ - - /* Irix64 */ HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to obtain local timezone information") #endif /* The return value */ if(NULL == (mesg = H5FL_MALLOC(time_t))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") *mesg = the_time; /* Set return value */ diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 9ca8436..875cd56 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -308,7 +308,7 @@ H5O_sdspace_copy(const void *_mesg, void *_dest) /* check args */ HDassert(mesg); - if(!dest && NULL == (dest = H5FL_MALLOC(H5S_extent_t))) + if(!dest && NULL == (dest = H5FL_CALLOC(H5S_extent_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Copy extent information */ @@ -463,7 +463,7 @@ H5O_sdspace_pre_copy_file(H5F_t UNUSED *file_src, const void *mesg_src, */ if(udata) { /* Allocate copy of dataspace extent */ - if(NULL == (udata->src_space_extent = H5FL_MALLOC(H5S_extent_t))) + if(NULL == (udata->src_space_extent = H5FL_CALLOC(H5S_extent_t))) HGOTO_ERROR(H5E_DATASPACE, H5E_NOSPACE, FAIL, "dataspace extent allocation failed") /* Create a copy of the dataspace extent */ @@ -1596,6 +1596,7 @@ H5Pget_class_name(hid_t pclass_id) char *ret_value; /* return value */ FUNC_ENTER_API(NULL) + H5TRACE1("*s", "i", pclass_id); /* Check arguments. */ if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS))) diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 089bfb9..7a44e86 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -920,6 +920,7 @@ H5Pget_driver_info(hid_t plist_id) void *ret_value; /* Return value */ FUNC_ENTER_API(NULL) + H5TRACE1("*x", "i", plist_id); if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list") @@ -291,7 +291,7 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5 H5F_addr_encode(loc->oloc->file, &p, obj_loc.oloc->addr); /* Serialize the selection into heap buffer */ - if(H5S_SELECT_SERIALIZE(space, p) < 0) + if(H5S_SELECT_SERIALIZE(space, &p) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOPY, FAIL, "Unable to serialize selection") /* Save the serialized buffer for later */ @@ -659,7 +659,7 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref) HGOTO_ERROR(H5E_DATASPACE, H5E_NOTFOUND, NULL, "not found") /* Unserialize the selection */ - if(H5S_select_deserialize(ret_value, p) < 0) + if(H5S_SELECT_DESERIALIZE(&ret_value, &p) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, NULL, "can't deserialize selection") done: @@ -509,6 +509,10 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max) FUNC_ENTER_NOAPI(FAIL) + /* Release destination extent before we copy over it */ + if(H5S_extent_release(dst) < 0) + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace extent") + /* Copy the regular fields */ dst->type = src->type; dst->version = src->version; @@ -583,7 +587,7 @@ H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max) FUNC_ENTER_NOAPI(NULL) - if(NULL == (dst = H5FL_MALLOC(H5S_t))) + if(NULL == (dst = H5FL_CALLOC(H5S_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Copy the source dataspace's extent */ @@ -1536,7 +1540,7 @@ H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc) buf += extent_size; /* Encode the selection part of dataspace. */ - if(H5S_SELECT_SERIALIZE(obj, buf) < 0) + if(H5S_SELECT_SERIALIZE(obj, &buf) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode select space") } /* end else */ @@ -1655,7 +1659,7 @@ H5S_decode(const unsigned char *buf) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, NULL, "unable to set all selection") /* Decode the select part of dataspace. I believe this part always exists. */ - if(H5S_SELECT_DESERIALIZE(ds, buf) < 0) + if(H5S_SELECT_DESERIALIZE(&ds, &buf) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDECODE, NULL, "can't decode space selection") /* Set return value */ diff --git a/src/H5Sall.c b/src/H5Sall.c index 24caad2..1105915 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -39,8 +39,8 @@ static herr_t H5S_all_get_seq_list(const H5S_t *space, unsigned flags, static herr_t H5S_all_release(H5S_t *space); static htri_t H5S_all_is_valid(const H5S_t *space); static hssize_t H5S_all_serial_size(const H5S_t *space); -static herr_t H5S_all_serialize(const H5S_t *space, uint8_t *buf); -static herr_t H5S_all_deserialize(H5S_t *space, const uint8_t *buf); +static herr_t H5S_all_serialize(const H5S_t *space, uint8_t **p); +static herr_t H5S_all_deserialize(H5S_t *space, const uint8_t **p); static herr_t H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); static herr_t H5S_all_offset(const H5S_t *space, hsize_t *off); static htri_t H5S_all_is_contiguous(const H5S_t *space); @@ -496,9 +496,11 @@ H5S_all_serial_size (const H5S_t UNUSED *space) PURPOSE Serialize the current selection into a user-provided buffer. USAGE - herr_t H5S_all_serialize(space, buf) - H5S_t *space; IN: Dataspace pointer of selection to serialize - uint8 *buf; OUT: Buffer to put serialized selection into + herr_t H5S_all_serialize(space, p) + const H5S_t *space; IN: Dataspace with selection to serialize + uint8_t **p; OUT: Pointer to buffer to put serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -510,17 +512,19 @@ H5S_all_serial_size (const H5S_t UNUSED *space) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_all_serialize (const H5S_t *space, uint8_t *buf) +H5S_all_serialize (const H5S_t *space, uint8_t **p) { FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(space); + HDassert(p); + HDassert(*p); /* Store the preamble information */ - UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ - UINT32ENCODE(buf, (uint32_t)1); /* Store the version number */ - UINT32ENCODE(buf, (uint32_t)0); /* Store the un-used padding */ - UINT32ENCODE(buf, (uint32_t)0); /* Store the additional information length */ + UINT32ENCODE(*p, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ + UINT32ENCODE(*p, (uint32_t)1); /* Store the version number */ + UINT32ENCODE(*p, (uint32_t)0); /* Store the un-used padding */ + UINT32ENCODE(*p, (uint32_t)0); /* Store the additional information length */ FUNC_LEAVE_NOAPI(SUCCEED) } /* H5S_all_serialize() */ @@ -532,9 +536,12 @@ H5S_all_serialize (const H5S_t *space, uint8_t *buf) PURPOSE Deserialize the current selection from a user-provided buffer. USAGE - herr_t H5S_all_deserialize(space, buf) - H5S_t *space; IN/OUT: Dataspace pointer to place selection into - uint8 *buf; IN: Buffer to retrieve serialized selection from + herr_t H5S_all_deserialize(space, p) + H5S_t *space; IN/OUT: Dataspace pointer to place + selection into + uint8 **p; OUT: Pointer to buffer holding serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -546,16 +553,18 @@ H5S_all_serialize (const H5S_t *space, uint8_t *buf) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_all_deserialize(H5S_t *space, const uint8_t UNUSED *buf) +H5S_all_deserialize(H5S_t *space, const uint8_t UNUSED **p) { - herr_t ret_value; /* return value */ + herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI(FAIL) HDassert(space); + HDassert(p); + HDassert(*p); /* Change to "all" selection */ - if((ret_value = H5S_select_all(space, TRUE)) < 0) + if(H5S_select_all(space, TRUE) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection") done: diff --git a/src/H5Shyper.c b/src/H5Shyper.c index c97c9b6..9b1562f 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -54,8 +54,8 @@ static herr_t H5S_hyper_get_seq_list(const H5S_t *space, unsigned flags, static herr_t H5S_hyper_release(H5S_t *space); static htri_t H5S_hyper_is_valid(const H5S_t *space); static hssize_t H5S_hyper_serial_size(const H5S_t *space); -static herr_t H5S_hyper_serialize(const H5S_t *space, uint8_t *buf); -static herr_t H5S_hyper_deserialize(H5S_t *space, const uint8_t *buf); +static herr_t H5S_hyper_serialize(const H5S_t *space, uint8_t **p); +static herr_t H5S_hyper_deserialize(H5S_t *space, const uint8_t **p); static herr_t H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); static herr_t H5S_hyper_offset(const H5S_t *space, hsize_t *offset); static htri_t H5S_hyper_is_contiguous(const H5S_t *space); @@ -1994,7 +1994,7 @@ H5S_hyper_serial_size(const H5S_t *space) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, hsize_t *end, hsize_t rank, uint8_t **buf) +H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, hsize_t *end, hsize_t rank, uint8_t **p) { H5S_hyper_span_t *curr; /* Pointer to current hyperslab span */ hsize_t u; /* Index variable */ @@ -2007,7 +2007,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, HDassert(start); HDassert(end); HDassert(rank < H5O_LAYOUT_NDIMS); - HDassert(buf && *buf); + HDassert(p && *p); /* Walk through the list of spans, recursing or outputing them */ curr=spans->head; @@ -2019,7 +2019,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, end[rank]=curr->high; /* Recurse down to the next dimension */ - if(H5S_hyper_serialize_helper(curr->down,start,end,rank+1,buf)<0) + if(H5S_hyper_serialize_helper(curr->down,start,end,rank+1,p)<0) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release hyperslab spans") } /* end if */ else { @@ -2027,17 +2027,17 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start, /* Encode previous starting points */ for(u=0; u<rank; u++) - UINT32ENCODE(*buf, (uint32_t)start[u]); + UINT32ENCODE(*p, (uint32_t)start[u]); /* Encode starting point for this span */ - UINT32ENCODE(*buf, (uint32_t)curr->low); + UINT32ENCODE(*p, (uint32_t)curr->low); /* Encode previous ending points */ for(u=0; u<rank; u++) - UINT32ENCODE(*buf, (uint32_t)end[u]); + UINT32ENCODE(*p, (uint32_t)end[u]); /* Encode starting point for this span */ - UINT32ENCODE(*buf, (uint32_t)curr->high); + UINT32ENCODE(*p, (uint32_t)curr->high); } /* end else */ /* Advance to next node */ @@ -2055,9 +2055,11 @@ done: PURPOSE Serialize the current selection into a user-provided buffer. USAGE - herr_t H5S_hyper_serialize(space, buf) - H5S_t *space; IN: Dataspace pointer of selection to serialize - uint8 *buf; OUT: Buffer to put serialized selection into + herr_t H5S_hyper_serialize(space, p) + const H5S_t *space; IN: Dataspace with selection to serialize + uint8_t **p; OUT: Pointer to buffer to put serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -2069,7 +2071,7 @@ done: REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) +H5S_hyper_serialize (const H5S_t *space, uint8_t **p) { const H5S_hyper_dim_t *diminfo; /* Alias for dataspace's diminfo information */ hsize_t tmp_count[H5O_LAYOUT_NDIMS]; /* Temporary hyperslab counts */ @@ -2089,14 +2091,14 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) HDassert(space); /* Store the preamble information */ - UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ - UINT32ENCODE(buf, (uint32_t)1); /* Store the version number */ - UINT32ENCODE(buf, (uint32_t)0); /* Store the un-used padding */ - lenp = buf; /* keep the pointer to the length location for later */ - buf += 4; /* skip over space for length */ + UINT32ENCODE(*p, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ + UINT32ENCODE(*p, (uint32_t)1); /* Store the version number */ + UINT32ENCODE(*p, (uint32_t)0); /* Store the un-used padding */ + lenp = *p; /* keep the pointer to the length location for later */ + *p += 4; /* skip over space for length */ /* Encode number of dimensions */ - UINT32ENCODE(buf, (uint32_t)space->extent.rank); + UINT32ENCODE(*p, (uint32_t)space->extent.rank); len += 4; /* Check for a "regular" hyperslab selection */ @@ -2114,7 +2116,7 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) /* Encode number of hyperslabs */ H5_CHECK_OVERFLOW(block_count, hsize_t, uint32_t); - UINT32ENCODE(buf, (uint32_t)block_count); + UINT32ENCODE(*p, (uint32_t)block_count); len+=4; /* Now serialize the information for the regular hyperslab */ @@ -2137,11 +2139,11 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) /* Encode hyperslab starting location */ for(u = 0; u < ndims; u++) - UINT32ENCODE(buf, (uint32_t)offset[u]); + UINT32ENCODE(*p, (uint32_t)offset[u]); /* Encode hyperslab ending location */ for(u = 0; u < ndims; u++) - UINT32ENCODE(buf, (uint32_t)(offset[u] + (diminfo[u].block - 1))); + UINT32ENCODE(*p, (uint32_t)(offset[u] + (diminfo[u].block - 1))); /* Move the offset to the next sequence to start */ offset[fast_dim]+=diminfo[fast_dim].stride; @@ -2192,15 +2194,15 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) /* Encode number of hyperslabs */ block_count = H5S_hyper_span_nblocks(space->select.sel_info.hslab->span_lst); H5_CHECK_OVERFLOW(block_count, hsize_t, uint32_t); - UINT32ENCODE(buf, (uint32_t)block_count); + UINT32ENCODE(*p, (uint32_t)block_count); len+=4; /* Add 8 bytes times the rank for each hyperslab selected */ H5_CHECK_OVERFLOW((8 * space->extent.rank * block_count), hsize_t, size_t); - len += (size_t)(8 * space->extent.rank * block_count); + len += (uint32_t)(8 * space->extent.rank * block_count); /* Encode each hyperslab in selection */ - H5S_hyper_serialize_helper(space->select.sel_info.hslab->span_lst, start, end, (hsize_t)0, &buf); + H5S_hyper_serialize_helper(space->select.sel_info.hslab->span_lst, start, end, (hsize_t)0, p); } /* end else */ /* Encode length */ @@ -2216,9 +2218,12 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) PURPOSE Deserialize the current selection from a user-provided buffer. USAGE - herr_t H5S_hyper_deserialize(space, buf) - H5S_t *space; IN/OUT: Dataspace pointer to place selection into - uint8 *buf; IN: Buffer to retrieve serialized selection from + herr_t H5S_hyper_deserialize(space, p) + H5S_t *space; IN/OUT: Dataspace pointer to place + selection into + uint8 **p; OUT: Pointer to buffer holding serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -2230,9 +2235,9 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf) +H5S_hyper_deserialize (H5S_t *space, const uint8_t **p) { - uint32_t rank; /* rank of points */ + unsigned rank; /* rank of points */ size_t num_elem=0; /* number of elements in selection */ hsize_t start[H5O_LAYOUT_NDIMS]; /* hyperslab start information */ hsize_t end[H5O_LAYOUT_NDIMS]; /* hyperslab end information */ @@ -2251,14 +2256,13 @@ H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf) /* Check args */ HDassert(space); - HDassert(buf); + HDassert(p); + HDassert(*p); /* Deserialize slabs to select */ - buf+=16; /* Skip over selection header */ - UINT32DECODE(buf,rank); /* decode the rank of the point selection */ - if(rank!=space->extent.rank) - HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "rank of pointer does not match dataspace") - UINT32DECODE(buf,num_elem); /* decode the number of points */ + /* (The header and rank have already beed decoded) */ + rank = space->extent.rank; /* Retrieve rank from space */ + UINT32DECODE(*p,num_elem); /* decode the number of points */ /* Set the count & stride for all blocks */ for(tcount=count,tstride=stride,j=0; j<rank; j++,tstride++,tcount++) { @@ -2270,14 +2274,14 @@ H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf) for(i=0; i<num_elem; i++) { /* Decode the starting points */ for(tstart=start,j=0; j<rank; j++,tstart++) - UINT32DECODE(buf, *tstart); + UINT32DECODE(*p, *tstart); /* Decode the ending points */ for(tend=end,j=0; j<rank; j++,tend++) - UINT32DECODE(buf, *tend); + UINT32DECODE(*p, *tend); /* Change the ending points into blocks */ - for(tblock=block,tstart=start,tend=end,j=0; j<(unsigned)rank; j++,tstart++,tend++,tblock++) + for(tblock=block,tstart=start,tend=end,j=0; j<rank; j++,tstart++,tend++,tblock++) *tblock=(*tend-*tstart)+1; /* Select or add the hyperslab to the current selection */ @@ -8856,3 +8860,109 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned UNUSED flags, H5S_sel_iter_t FUNC_LEAVE_NOAPI(ret_value) } /* end H5S_hyper_get_seq_list() */ + +/*-------------------------------------------------------------------------- + NAME + H5Sis_regular_hyperslab + PURPOSE + Determine if a hyperslab selection is regular + USAGE + htri_t H5Sis_regular_hyperslab(dsid) + hid_t dsid; IN: Dataspace ID of hyperslab selection to query + RETURNS + TRUE/FALSE for hyperslab selection, FAIL on error or when querying other + selection types. + DESCRIPTION + If a hyperslab can be represented as a single call to H5Sselect_hyperslab, + with the H5S_SELECT_SET option, it is regular. If the hyperslab selection + would require multiple calls to H5Sselect_hyperslab, it is irregular. + GLOBAL VARIABLES + COMMENTS, BUGS, ASSUMPTIONS + EXAMPLES + REVISION LOG +--------------------------------------------------------------------------*/ +htri_t +H5Sis_regular_hyperslab(hid_t spaceid) +{ + H5S_t *space; /* Dataspace to query */ + htri_t ret_value; /* Return value */ + + FUNC_ENTER_API(FAIL) + H5TRACE1("t", "i", spaceid); + + /* Check args */ + if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace") + if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_HYPERSLABS) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a hyperslab selection") + + ret_value = H5S_hyper_is_regular(space); + +done: + FUNC_LEAVE_API(ret_value) +} /* H5Sis_regular_hyperslab() */ + + +/*-------------------------------------------------------------------------- + NAME + H5Sgetregular_hyperslab + PURPOSE + Retrieve a regular hyperslab selection + USAGE + herr_t H5Sget_regular_hyperslab(dsid, start, stride, block, count) + hid_t dsid; IN: Dataspace ID of hyperslab selection to query + hsize_t start[]; OUT: Offset of start of hyperslab + hsize_t stride[]; OUT: Hyperslab stride + hsize_t count[]; OUT: Number of blocks included in hyperslab + hsize_t block[]; OUT: Size of block in hyperslab + RETURNS + Non-negative on success/Negative on failure. (It is an error to query + the regular hyperslab selections for non-regular hyperslab selections) + DESCRIPTION + Retrieve the start/stride/count/block for a regular hyperslab selection. + GLOBAL VARIABLES + COMMENTS, BUGS, ASSUMPTIONS + Note that if a hyperslab is originally regular, then becomes irregular + through selection operations, and then becomes regular again, the new + final regular selection may be equivalent but not identical to the + original regular selection. + EXAMPLES + REVISION LOG +--------------------------------------------------------------------------*/ +herr_t +H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[], hsize_t stride[], + hsize_t count[], hsize_t block[]) +{ + H5S_t *space; /* Dataspace to query */ + unsigned u; /* Local index variable */ + herr_t ret_value = SUCCEED; /* Return value */ + + FUNC_ENTER_API(FAIL) + H5TRACE5("e", "i*h*h*h*h", spaceid, start, stride, count, block); + + /* Check args */ + if(NULL == (space = (H5S_t *)H5I_object_verify(spaceid, H5I_DATASPACE))) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace") + if(H5S_GET_SELECT_TYPE(space) != H5S_SEL_HYPERSLABS) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a hyperslab selection") + if(TRUE != H5S_hyper_is_regular(space)) + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a regular hyperslab selection") + + /* Retrieve hyperslab parameters */ + if(start) + for(u = 0; u < space->extent.rank; u++) + start[u] = space->select.sel_info.hslab->app_diminfo[u].start; + if(stride) + for(u = 0; u < space->extent.rank; u++) + stride[u] = space->select.sel_info.hslab->app_diminfo[u].stride; + if(count) + for(u = 0; u < space->extent.rank; u++) + count[u] = space->select.sel_info.hslab->app_diminfo[u].count; + if(block) + for(u = 0; u < space->extent.rank; u++) + block[u] = space->select.sel_info.hslab->app_diminfo[u].block; + +done: + FUNC_LEAVE_API(ret_value) +} /* H5Sget_regular_hyperslab() */ + diff --git a/src/H5Snone.c b/src/H5Snone.c index 3c5eccc..c5ec2de 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -40,8 +40,8 @@ static herr_t H5S_none_get_seq_list(const H5S_t *space, unsigned flags, static herr_t H5S_none_release(H5S_t *space); static htri_t H5S_none_is_valid(const H5S_t *space); static hssize_t H5S_none_serial_size(const H5S_t *space); -static herr_t H5S_none_serialize(const H5S_t *space, uint8_t *buf); -static herr_t H5S_none_deserialize(H5S_t *space, const uint8_t *buf); +static herr_t H5S_none_serialize(const H5S_t *space, uint8_t **p); +static herr_t H5S_none_deserialize(H5S_t *space, const uint8_t **p); static herr_t H5S_none_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); static herr_t H5S_none_offset(const H5S_t *space, hsize_t *off); static htri_t H5S_none_is_contiguous(const H5S_t *space); @@ -464,9 +464,11 @@ H5S_none_serial_size(const H5S_t UNUSED *space) PURPOSE Serialize the current selection into a user-provided buffer. USAGE - herr_t H5S_none_serialize(space, buf) - H5S_t *space; IN: Dataspace pointer of selection to serialize - uint8 *buf; OUT: Buffer to put serialized selection into + herr_t H5S_none_serialize(space, p) + const H5S_t *space; IN: Dataspace with selection to serialize + uint8_t **p; OUT: Pointer to buffer to put serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -478,17 +480,17 @@ H5S_none_serial_size(const H5S_t UNUSED *space) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_none_serialize(const H5S_t *space, uint8_t *buf) +H5S_none_serialize(const H5S_t *space, uint8_t **p) { FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(space); /* Store the preamble information */ - UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ - UINT32ENCODE(buf, (uint32_t)1); /* Store the version number */ - UINT32ENCODE(buf, (uint32_t)0); /* Store the un-used padding */ - UINT32ENCODE(buf, (uint32_t)0); /* Store the additional information length */ + UINT32ENCODE(*p, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ + UINT32ENCODE(*p, (uint32_t)1); /* Store the version number */ + UINT32ENCODE(*p, (uint32_t)0); /* Store the un-used padding */ + UINT32ENCODE(*p, (uint32_t)0); /* Store the additional information length */ FUNC_LEAVE_NOAPI(SUCCEED) } /* H5S_none_serialize() */ @@ -500,9 +502,12 @@ H5S_none_serialize(const H5S_t *space, uint8_t *buf) PURPOSE Deserialize the current selection from a user-provided buffer. USAGE - herr_t H5S_none_deserialize(space, buf) - H5S_t *space; IN/OUT: Dataspace pointer to place selection into - uint8 *buf; IN: Buffer to retrieve serialized selection from + herr_t H5S_none_deserialize(space, p) + H5S_t *space; IN/OUT: Dataspace pointer to place + selection into + uint8 **p; OUT: Pointer to buffer holding serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -514,13 +519,15 @@ H5S_none_serialize(const H5S_t *space, uint8_t *buf) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_none_deserialize(H5S_t *space, const uint8_t UNUSED *buf) +H5S_none_deserialize(H5S_t *space, const uint8_t UNUSED **p) { herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI_NOINIT HDassert(space); + HDassert(p); + HDassert(*p); /* Change to "none" selection */ if(H5S_select_none(space) < 0) diff --git a/src/H5Spkg.h b/src/H5Spkg.h index 0a9df69..5f84717 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -130,9 +130,9 @@ typedef htri_t (*H5S_sel_is_valid_func_t)(const H5S_t *space); /* Method to determine number of bytes required to store current selection */ typedef hssize_t (*H5S_sel_serial_size_func_t)(const H5S_t *space); /* Method to store current selection in "serialized" form (a byte sequence suitable for storing on disk) */ -typedef herr_t (*H5S_sel_serialize_func_t)(const H5S_t *space, uint8_t *buf); +typedef herr_t (*H5S_sel_serialize_func_t)(const H5S_t *space, uint8_t **p); /* Method to store create selection from "serialized" form (a byte sequence suitable for storing on disk) */ -typedef herr_t (*H5S_sel_deserialize_func_t)(H5S_t *space, const uint8_t *buf); +typedef herr_t (*H5S_sel_deserialize_func_t)(H5S_t *space, const uint8_t **p); /* Method to determine smallest n-D bounding box containing the current selection */ typedef herr_t (*H5S_sel_bounds_func_t)(const H5S_t *space, hsize_t *start, hsize_t *end); /* Method to determine linear offset of initial element in selection within dataspace */ diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 70842df..44e0510 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -41,8 +41,8 @@ static herr_t H5S_point_get_seq_list(const H5S_t *space, unsigned flags, static herr_t H5S_point_release(H5S_t *space); static htri_t H5S_point_is_valid(const H5S_t *space); static hssize_t H5S_point_serial_size(const H5S_t *space); -static herr_t H5S_point_serialize(const H5S_t *space, uint8_t *buf); -static herr_t H5S_point_deserialize(H5S_t *space, const uint8_t *buf); +static herr_t H5S_point_serialize(const H5S_t *space, uint8_t **p); +static herr_t H5S_point_deserialize(H5S_t *space, const uint8_t **p); static herr_t H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); static herr_t H5S_point_offset(const H5S_t *space, hsize_t *off); static htri_t H5S_point_is_contiguous(const H5S_t *space); @@ -804,9 +804,11 @@ H5S_point_serial_size (const H5S_t *space) PURPOSE Serialize the current selection into a user-provided buffer. USAGE - herr_t H5S_point_serialize(space, buf) - H5S_t *space; IN: Dataspace pointer of selection to serialize - uint8 *buf; OUT: Buffer to put serialized selection into + herr_t H5S_point_serialize(space, p) + const H5S_t *space; IN: Dataspace with selection to serialize + uint8_t **p; OUT: Pointer to buffer to put serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -818,7 +820,7 @@ H5S_point_serial_size (const H5S_t *space) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_point_serialize (const H5S_t *space, uint8_t *buf) +H5S_point_serialize (const H5S_t *space, uint8_t **p) { H5S_pnt_node_t *curr; /* Point information nodes */ uint8_t *lenp; /* pointer to length location for later storage */ @@ -830,18 +832,18 @@ H5S_point_serialize (const H5S_t *space, uint8_t *buf) HDassert(space); /* Store the preamble information */ - UINT32ENCODE(buf, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ - UINT32ENCODE(buf, (uint32_t)1); /* Store the version number */ - UINT32ENCODE(buf, (uint32_t)0); /* Store the un-used padding */ - lenp=buf; /* keep the pointer to the length location for later */ - buf+=4; /* skip over space for length */ + UINT32ENCODE(*p, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */ + UINT32ENCODE(*p, (uint32_t)1); /* Store the version number */ + UINT32ENCODE(*p, (uint32_t)0); /* Store the un-used padding */ + lenp=*p; /* keep the pointer to the length location for later */ + *p+=4; /* skip over space for length */ /* Encode number of dimensions */ - UINT32ENCODE(buf, (uint32_t)space->extent.rank); + UINT32ENCODE(*p, (uint32_t)space->extent.rank); len+=4; /* Encode number of elements */ - UINT32ENCODE(buf, (uint32_t)space->select.num_elem); + UINT32ENCODE(*p, (uint32_t)space->select.num_elem); len+=4; /* Encode each point in selection */ @@ -852,7 +854,7 @@ H5S_point_serialize (const H5S_t *space, uint8_t *buf) /* Encode each point */ for(u=0; u<space->extent.rank; u++) - UINT32ENCODE(buf, (uint32_t)curr->pnt[u]); + UINT32ENCODE(*p, (uint32_t)curr->pnt[u]); curr=curr->next; } /* end while */ @@ -870,9 +872,12 @@ H5S_point_serialize (const H5S_t *space, uint8_t *buf) PURPOSE Deserialize the current selection from a user-provided buffer. USAGE - herr_t H5S_point_deserialize(space, buf) - H5S_t *space; IN/OUT: Dataspace pointer to place selection into - uint8 *buf; IN: Buffer to retrieve serialized selection from + herr_t H5S_point_deserialize(space, p) + H5S_t *space; IN/OUT: Dataspace pointer to place + selection into + uint8 **p; OUT: Pointer to buffer holding serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -884,10 +889,10 @@ H5S_point_serialize (const H5S_t *space, uint8_t *buf) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_point_deserialize (H5S_t *space, const uint8_t *buf) +H5S_point_deserialize (H5S_t *space, const uint8_t **p) { H5S_seloper_t op=H5S_SELECT_SET; /* Selection operation */ - uint32_t rank; /* Rank of points */ + unsigned rank; /* Rank of points */ size_t num_elem=0; /* Number of elements in selection */ hsize_t *coord=NULL, *tcoord; /* Pointer to array of elements */ unsigned i, j; /* local counting variables */ @@ -897,14 +902,13 @@ H5S_point_deserialize (H5S_t *space, const uint8_t *buf) /* Check args */ HDassert(space); - HDassert(buf); + HDassert(p); + HDassert(*p); /* Deserialize points to select */ - buf += 16; /* Skip over selection header */ - UINT32DECODE(buf, rank); /* decode the rank of the point selection */ - if(rank != space->extent.rank) - HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "rank of pointer does not match dataspace") - UINT32DECODE(buf, num_elem); /* decode the number of points */ + /* (The header and rank have already beed decoded) */ + rank = space->extent.rank; /* Retrieve rank from space */ + UINT32DECODE(*p, num_elem); /* decode the number of points */ /* Allocate space for the coordinates */ if(NULL == (coord = (hsize_t *)H5MM_malloc(num_elem * rank * sizeof(hsize_t)))) @@ -913,7 +917,7 @@ H5S_point_deserialize (H5S_t *space, const uint8_t *buf) /* Retrieve the coordinates from the buffer */ for(tcoord = coord, i = 0; i < num_elem; i++) for(j = 0; j < (unsigned)rank; j++, tcoord++) - UINT32DECODE(buf, *tcoord); + UINT32DECODE(*p, *tcoord); /* Select points */ if(H5S_select_elements(space, op, num_elem, (const hsize_t *)coord) < 0) diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 44cd6c3..7b7b8c6 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -206,7 +206,7 @@ H5_DLL int H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t H5_DLL htri_t H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2); /* Operations on selections */ -H5_DLL herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf); +H5_DLL herr_t H5S_select_deserialize(H5S_t **space, const uint8_t **p); H5_DLL H5S_sel_type H5S_get_select_type(const H5S_t *space); H5_DLL herr_t H5S_select_iterate(void *buf, hid_t type_id, const H5S_t *space, H5D_operator_t op, void *operator_data); @@ -227,7 +227,7 @@ H5_DLL herr_t H5S_select_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len); H5_DLL hssize_t H5S_select_serial_size(const H5S_t *space); -H5_DLL herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf); +H5_DLL herr_t H5S_select_serialize(const H5S_t *space, uint8_t **p); H5_DLL htri_t H5S_select_is_contiguous(const H5S_t *space); H5_DLL htri_t H5S_select_is_single(const H5S_t *space); H5_DLL htri_t H5S_select_is_regular(const H5S_t *space); diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 0a39ce1..37d3866 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -137,6 +137,9 @@ H5_DLL herr_t H5Sselect_all(hid_t spaceid); H5_DLL herr_t H5Sselect_none(hid_t spaceid); H5_DLL herr_t H5Soffset_simple(hid_t space_id, const hssize_t *offset); H5_DLL htri_t H5Sselect_valid(hid_t spaceid); +H5_DLL htri_t H5Sis_regular_hyperslab(hid_t spaceid); +H5_DLL htri_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[], + hsize_t stride[], hsize_t count[], hsize_t block[]); H5_DLL hssize_t H5Sget_select_hyper_nblocks(hid_t spaceid); H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid); H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 2cb4b38..a4f13d7 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -239,9 +239,11 @@ H5S_select_serial_size(const H5S_t *space) PURPOSE Serialize the selection for a dataspace into a buffer USAGE - herr_t H5S_select_serialize(space, buf) + herr_t H5S_select_serialize(space, p) const H5S_t *space; IN: Dataspace with selection to serialize - uint8_t *buf; OUT: Buffer to put serialized selection + uint8_t **p; OUT: Pointer to buffer to put serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -256,17 +258,17 @@ H5S_select_serial_size(const H5S_t *space) REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5S_select_serialize(const H5S_t *space, uint8_t *buf) +H5S_select_serialize(const H5S_t *space, uint8_t **p) { herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(space); - HDassert(buf); + HDassert(p); /* Call the selection type's serialize function */ - ret_value=(*space->select.type->serialize)(space,buf); + ret_value=(*space->select.type->serialize)(space,p); FUNC_LEAVE_NOAPI(ret_value) } /* end H5S_select_serialize() */ @@ -428,9 +430,13 @@ H5S_select_valid(const H5S_t *space) Deserialize the current selection from a user-provided buffer into a real selection in the dataspace. USAGE - herr_t H5S_select_deserialize(space, buf) - H5S_t *space; IN/OUT: Dataspace pointer to place selection into - uint8 *buf; IN: Buffer to retrieve serialized selection from + herr_t H5S_select_deserialize(space, p) + H5S_t **space; IN/OUT: Dataspace pointer to place + selection into. Will be allocated if not + provided. + uint8 **p; OUT: Pointer to buffer holding serialized + selection. Will be advanced to end of + serialized selection. RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -444,42 +450,81 @@ H5S_select_valid(const H5S_t *space) REVISION LOG --------------------------------------------------------------------------*/ herr_t -H5S_select_deserialize (H5S_t *space, const uint8_t *buf) +H5S_select_deserialize (H5S_t **space, const uint8_t **p) { - const uint8_t *tbuf; /* Temporary pointer to the selection type */ - uint32_t sel_type; /* Pointer to the selection type */ + H5S_t *tmp_space; /* Pointer to actual dataspace to use, either + *space or a newly allocated one */ + uint32_t sel_type; /* Pointer to the selection type */ herr_t ret_value=FAIL; /* return value */ FUNC_ENTER_NOAPI(FAIL) HDassert(space); - tbuf=buf; - UINT32DECODE(tbuf, sel_type); + /* Allocate space if not provided */ + if(!*space) { + if(NULL == (tmp_space = H5S_create(H5S_SIMPLE))) + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't create dataspace") + } /* end if */ + else + tmp_space = *space; + + /* Decode selection type */ + UINT32DECODE(*p, sel_type); + + /* Skip over the remainder of the header */ + *p += 12; + + /* Decode and check or patch rank for point and hyperslab selections */ + if((sel_type == H5S_SEL_POINTS) || (sel_type == H5S_SEL_HYPERSLABS)) { + uint32_t rank; /* Rank of dataspace */ + + /* Decode the rank of the point selection */ + UINT32DECODE(*p,rank); + + if(!*space) + /* Patch the rank of the allocated dataspace */ + tmp_space->extent.rank = rank; + else + /* Verify the rank of the provided dataspace */ + if(rank != tmp_space->extent.rank) + HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "rank of serialized selection does not match dataspace") + } /* end if */ + + /* Make routine for selection type */ switch(sel_type) { case H5S_SEL_POINTS: /* Sequence of points selected */ - ret_value=(*H5S_sel_point->deserialize)(space,buf); + ret_value = (*H5S_sel_point->deserialize)(tmp_space, p); break; case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */ - ret_value=(*H5S_sel_hyper->deserialize)(space,buf); + ret_value = (*H5S_sel_hyper->deserialize)(tmp_space, p); break; case H5S_SEL_ALL: /* Entire extent selected */ - ret_value=(*H5S_sel_all->deserialize)(space,buf); + ret_value = (*H5S_sel_all->deserialize)(tmp_space, p); break; case H5S_SEL_NONE: /* Nothing selected */ - ret_value=(*H5S_sel_none->deserialize)(space,buf); + ret_value = (*H5S_sel_none->deserialize)(tmp_space, p); break; default: break; } - if(ret_value<0) + if(ret_value < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTLOAD, FAIL, "can't deserialize selection") + /* Return space to the caller if allocated */ + if(!*space) + *space = tmp_space; + done: + /* Free temporary space if not passed to caller (only happens on error) */ + if(!*space && tmp_space) + if(H5S_close(tmp_space) < 0) + HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "can't close dataspace") + FUNC_LEAVE_NOAPI(ret_value) } /* H5S_select_deserialize() */ diff --git a/src/H5Tfields.c b/src/H5Tfields.c index 0e0d4e7..fb186fb 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -163,6 +163,7 @@ H5Tget_member_name(hid_t type_id, unsigned membno) char *ret_value; FUNC_ENTER_API(NULL) + H5TRACE2("*s", "iIu", type_id, membno); /* Check args */ if (NULL == (dt = (H5T_t *)H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5Topaque.c b/src/H5Topaque.c index d68e659..e93bf65 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -121,6 +121,7 @@ H5Tget_tag(hid_t type_id) char *ret_value; FUNC_ENTER_API(NULL) + H5TRACE1("*s", "i", type_id); /* Check args */ if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE))) diff --git a/src/H5config.h.in b/src/H5config.h.in index cc8a59c..42dfcfb 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -20,9 +20,6 @@ /* Define the default plugins path to compile */ #undef DEFAULT_PLUGINDIR -/* Define the default virtual file driver to compile */ -#undef DEFAULT_VFD - /* Define if `dev_t' is a scalar */ #undef DEV_T_IS_SCALAR @@ -52,9 +49,6 @@ long long values. */ #undef FP_TO_ULLONG_RIGHT_MAXIMUM -/* Define if gettimeofday() populates the tz pointer passed in */ -#undef GETTIMEOFDAY_GIVES_TZ - /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM @@ -64,9 +58,6 @@ /* Define if the __attribute__(()) extension is present */ #undef HAVE_ATTRIBUTE -/* Define to 1 if you have the `BSDgettimeofday' function. */ -#undef HAVE_BSDGETTIMEOFDAY - /* Define if the compiler understands C99 designated initialization of structs and unions */ #undef HAVE_C99_DESIGNATED_INITIALIZER @@ -83,14 +74,10 @@ /* Define if Darwin or Mac OS X */ #undef HAVE_DARWIN -/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. - */ -#undef HAVE_DECL_TZNAME - /* Define to 1 if you have the `difftime' function. */ #undef HAVE_DIFFTIME -/* Define if the direct I/O virtual file driver should be compiled */ +/* Define if the direct I/O virtual file driver (VFD) should be compiled */ #undef HAVE_DIRECT /* Define to 1 if you have the <dirent.h> header file. */ @@ -313,12 +300,6 @@ /* Define if `struct text_info' is defined */ #undef HAVE_STRUCT_TEXT_INFO -/* Define if `struct timezone' is defined */ -#undef HAVE_STRUCT_TIMEZONE - -/* Define to 1 if `tm_zone' is a member of `struct tm'. */ -#undef HAVE_STRUCT_TM_TM_ZONE - /* Define if `struct videoconfig' is defined */ #undef HAVE_STRUCT_VIDEOCONFIG @@ -379,14 +360,6 @@ /* Define if `tm_gmtoff' is a member of `struct tm' */ #undef HAVE_TM_GMTOFF -/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use - `HAVE_STRUCT_TM_TM_ZONE' instead. */ -#undef HAVE_TM_ZONE - -/* Define to 1 if you don't have `tm_zone' but do have the external array - `tzname'. */ -#undef HAVE_TZNAME - /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H @@ -414,9 +387,6 @@ /* Define to 1 if you have the `_scrsize' function. */ #undef HAVE__SCRSIZE -/* Define if `__tm_gmtoff' is a member of `struct tm' */ -#undef HAVE___TM_GMTOFF - /* Define if your system can't handle converting floating-point values to long long. */ #undef HW_FP_TO_LLONG_NOT_WORKS @@ -470,9 +440,6 @@ /* Define if deprecated public API symbols are disabled */ #undef NO_DEPRECATED_SYMBOLS -/* Define if shared writing must be disabled (CodeWarrior only) */ -#undef NO_SHARED_WRITING - /* Name of package */ #undef PACKAGE @@ -627,9 +594,6 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME -/* Define to 1 if your <sys/time.h> declares `struct tm'. */ -#undef TM_IN_SYS_TIME - /* Define if your system can compile unsigned long long to floating-point casts. */ #undef ULLONG_TO_FP_CAST_WORKS diff --git a/src/H5private.h b/src/H5private.h index 9c66296..336d84a 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -160,6 +160,10 @@ #include <dirent.h> #endif +/* Define the default VFD for this platform. + * Since the removal of the Windows VFD, this is sec2 for all platforms. + */ +#define H5_DEFAULT_VFD H5FD_SEC2 #ifdef H5_HAVE_WIN32_API /* The following two defines must be before any windows headers are included */ @@ -567,9 +571,6 @@ typedef struct { #ifndef HDatol #define HDatol(S) atol(S) #endif /* HDatol */ -#ifndef HDBSDgettimeofday - #define HDBSDgettimeofday(S,P) BSDgettimeofday(S,P) -#endif /* HDBSDgettimeofday */ #ifndef HDbsearch #define HDbsearch(K,B,N,Z,F) bsearch(K,B,N,Z,F) #endif /* HDbsearch */ diff --git a/src/Makefile.in b/src/Makefile.in index 6abbec1..6c01edd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -728,8 +728,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. diff --git a/test/Makefile.in b/test/Makefile.in index 108b089..a24232e 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1156,18 +1156,18 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. These files are the ones created by setting the # HDF5_NOCLEANUP environment variable and running `make test' without # specifying a file prefix or low-level driver. Changing the file # prefix or low-level driver with environment variables will influence # the temporary file name in ways that the makefile is not aware of. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog accum.h5 cmpd_dset.h5 \ - compact_dataset.h5 dataset.h5 dset_offset.h5 chunk_fixed.h5 \ - max_compact_dataset.h5 simple.h5 set_local.h5 random_chunks.h5 \ - huge_chunks.h5 chunk_cache.h5 big_chunk.h5 chunk_fast.h5 \ - chunk_expand.h5 layout_extend.h5 swmr_fail.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 accum.h5 \ + cmpd_dset.h5 compact_dataset.h5 dataset.h5 dset_offset.h5 \ + chunk_fixed.h5 max_compact_dataset.h5 simple.h5 set_local.h5 \ + random_chunks.h5 huge_chunks.h5 chunk_cache.h5 big_chunk.h5 \ + chunk_fast.h5 chunk_expand.h5 layout_extend.h5 swmr_fail.h5 \ partial_chunks.h5 copy_dcpl_newfile.h5 extend.h5 istore.h5 \ extlinks*.h5 frspace.h5 links*.h5 sys_file1 tfile[1-7].h5 \ th5s[1-4].h5 lheap.h5 fheap.h5 ohdr.h5 stab.h5 extern_[1-3].h5 \ diff --git a/test/tfile.c b/test/tfile.c index 58785eb..aba5d6d 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -3861,9 +3861,7 @@ test_file(void) test_file_create(); /* Test file creation(also creation templates)*/ test_file_open(); /* Test file opening */ -#ifndef H5_NO_SHARED_WRITING test_file_close(); /* Test file close behavior */ -#endif /* H5_NO_SHARED_WRITING */ test_get_file_id(); /* Test H5Iget_file_id */ test_get_obj_ids(); /* Test H5Fget_obj_ids for Jira Issue 8528 */ test_file_perm(); /* Test file access permissions */ diff --git a/test/th5s.c b/test/th5s.c index 43ad1bb..d3a651c 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -2207,6 +2207,97 @@ test_h5s_extent_equal(void) /**************************************************************** ** +** test_h5s_extent_copy(): Exercise extent copy code +** +****************************************************************/ +static void +test_h5s_extent_copy(void) +{ + hid_t spaces[14] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; /* Array of all dataspaces */ + hid_t tmp_space = -1; + hsize_t d1_dims1[1] = {10}, /* 1-D dimensions */ + d1_dims2[1] = {20}, + d1_dims3[1] = {H5S_UNLIMITED}; + hsize_t d2_dims1[2] = {10, 10}, /* 2-D dimensions */ + d2_dims2[2] = {20, 20}, + d2_dims3[2] = {H5S_UNLIMITED, H5S_UNLIMITED}; + hsize_t d3_dims1[3] = {10, 10, 10}, /* 3-D dimensions */ + d3_dims2[3] = {20, 20, 20}, + d3_dims3[3] = {H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED}; + htri_t ext_equal; /* Whether two dataspace extents are equal */ + const unsigned num_spaces = sizeof(spaces) / sizeof(spaces[0]); + unsigned i, j; + herr_t ret; /* Generic error return */ + + /* Create dataspaces */ + spaces[0] = H5Screate(H5S_NULL); + CHECK(spaces[0], FAIL, "H5Screate"); + + spaces[1] = H5Screate(H5S_SCALAR); + CHECK(spaces[1], FAIL, "H5Screate"); + + spaces[2] = H5Screate_simple(1, d1_dims1, NULL); + CHECK(spaces[2], FAIL, "H5Screate"); + spaces[3] = H5Screate_simple(1, d1_dims2, NULL); + CHECK(spaces[3], FAIL, "H5Screate"); + spaces[4] = H5Screate_simple(1, d1_dims1, d1_dims2); + CHECK(spaces[4], FAIL, "H5Screate"); + spaces[5] = H5Screate_simple(1, d1_dims1, d1_dims3); + CHECK(spaces[5], FAIL, "H5Screate"); + + spaces[6] = H5Screate_simple(2, d2_dims1, NULL); + CHECK(spaces[6], FAIL, "H5Screate"); + spaces[7] = H5Screate_simple(2, d2_dims2, NULL); + CHECK(spaces[7], FAIL, "H5Screate"); + spaces[8] = H5Screate_simple(2, d2_dims1, d2_dims2); + CHECK(spaces[8], FAIL, "H5Screate"); + spaces[9] = H5Screate_simple(2, d2_dims1, d2_dims3); + CHECK(spaces[9], FAIL, "H5Screate"); + + spaces[10] = H5Screate_simple(3, d3_dims1, NULL); + CHECK(spaces[10], FAIL, "H5Screate"); + spaces[11] = H5Screate_simple(3, d3_dims2, NULL); + CHECK(spaces[11], FAIL, "H5Screate"); + spaces[12] = H5Screate_simple(3, d3_dims1, d3_dims2); + CHECK(spaces[12], FAIL, "H5Screate"); + spaces[13] = H5Screate_simple(3, d3_dims1, d3_dims3); + CHECK(spaces[13], FAIL, "H5Screate"); + + tmp_space = H5Screate(H5S_NULL); + CHECK(tmp_space, FAIL, "H5Screate"); + + /* Copy between all dataspace combinations. Note there are a few + * duplicates. */ + for(i = 0; i < num_spaces; i++) + for(j = i; j < num_spaces; j++) { + /* Copy from i to j, unless the inner loop just restarted, in which + * case i and j are the same, so the second call to H5Sextent_copy() + * will test copying from i/j to i/j */ + ret = H5Sextent_copy(tmp_space, spaces[j]); + CHECK(ret, FAIL, "H5Sextent_copy"); + ext_equal = H5Sextent_equal(tmp_space, spaces[j]); + VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + + /* Copy from j to i */ + ret = H5Sextent_copy(tmp_space, spaces[i]); + CHECK(ret, FAIL, "H5Sextent_copy"); + ext_equal = H5Sextent_equal(tmp_space, spaces[i]); + VERIFY(ext_equal, TRUE, "H5Sextent_equal"); + } /* end for */ + + /* Close dataspaces */ + for(i = 0; i < num_spaces; i++) { + ret = H5Sclose(spaces[i]); + CHECK(ret, FAIL, "H5Sclose"); + spaces[i] = -1; + } /* end for */ + + ret = H5Sclose(tmp_space); + CHECK(ret, FAIL, "H5Sclose"); +} /* test_h5s_extent_copy() */ + +/**************************************************************** +** ** test_h5s(): Main H5S (dataspace) testing routine. ** ****************************************************************/ @@ -2230,6 +2321,7 @@ test_h5s(void) test_h5s_chunk(); /* Exercise bug fix for chunked I/O */ test_h5s_extent_equal(); /* Test extent comparison code */ + test_h5s_extent_copy(); /* Test extent copy code */ } /* test_h5s() */ diff --git a/test/tselect.c b/test/tselect.c index d5a1f4c..b34d095 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -162,6 +162,12 @@ /* #defines for shape same / different rank tests */ #define SS_DR_MAX_RANK 5 +/* Information for regular hyperslab query test */ +#define SPACE13_RANK 3 +#define SPACE13_DIM1 50 +#define SPACE13_DIM2 50 +#define SPACE13_DIM3 50 +#define SPACE13_NPOINTS 4 /* Location comparison function */ @@ -13069,6 +13075,161 @@ test_select_bounds(void) /**************************************************************** ** +** test_hyper_regular(): Tests query operations on regular hyperslabs +** +****************************************************************/ +static void +test_hyper_regular(void) +{ + hid_t sid; /* Dataspace ID */ + const hsize_t dims[SPACE13_RANK] = {SPACE13_DIM1, SPACE13_DIM2, SPACE13_DIM3}; /* Dataspace dimensions */ + hsize_t coord[SPACE13_NPOINTS][SPACE13_RANK]; /* Coordinates for point selection */ + hsize_t start[SPACE13_RANK]; /* The start of the hyperslab */ + hsize_t stride[SPACE13_RANK]; /* The stride between block starts for the hyperslab */ + hsize_t count[SPACE13_RANK]; /* The number of blocks for the hyperslab */ + hsize_t block[SPACE13_RANK]; /* The size of each block for the hyperslab */ + hsize_t t_start[SPACE13_RANK]; /* Temporary start of the hyperslab */ + hsize_t t_count[SPACE13_RANK]; /* Temporary number of blocks for the hyperslab */ + hsize_t q_start[SPACE13_RANK]; /* The queried start of the hyperslab */ + hsize_t q_stride[SPACE13_RANK]; /* The queried stride between block starts for the hyperslab */ + hsize_t q_count[SPACE13_RANK]; /* The queried number of blocks for the hyperslab */ + hsize_t q_block[SPACE13_RANK]; /* The queried size of each block for the hyperslab */ + htri_t is_regular; /* Whether a hyperslab selection is regular */ + unsigned u; /* Local index variable */ + herr_t ret; /* Generic return value */ + + /* Output message about test being performed */ + MESSAGE(6, ("Testing queries on regular hyperslabs\n")); + + /* Create dataspace */ + sid = H5Screate_simple(SPACE13_RANK, dims, NULL); + CHECK(sid, FAIL, "H5Screate_simple"); + + /* Query if 'all' selection is regular hyperslab (should fail) */ + H5E_BEGIN_TRY { + is_regular = H5Sis_regular_hyperslab(sid); + } H5E_END_TRY; + VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab"); + + /* Query regular hyperslab selection info (should fail) */ + H5E_BEGIN_TRY { + ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); + } H5E_END_TRY; + VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); + + /* Set 'none' selection */ + ret = H5Sselect_none(sid); + CHECK(ret, FAIL, "H5Sselect_none"); + + /* Query if 'none' selection is regular hyperslab (should fail) */ + H5E_BEGIN_TRY { + is_regular = H5Sis_regular_hyperslab(sid); + } H5E_END_TRY; + VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab"); + + /* Query regular hyperslab selection info (should fail) */ + H5E_BEGIN_TRY { + ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); + } H5E_END_TRY; + VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); + + /* Set point selection */ + coord[0][0] = 3; coord[0][1] = 3; coord[0][2] = 3; + coord[1][0] = 3; coord[1][1] = 48; coord[1][2] = 48; + coord[2][0] = 48; coord[2][1] = 3; coord[2][2] = 3; + coord[3][0] = 48; coord[3][1] = 48; coord[3][2] = 48; + ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)SPACE13_NPOINTS, (const hsize_t *)coord); + CHECK(ret, FAIL, "H5Sselect_elements"); + + /* Query if 'point' selection is regular hyperslab (should fail) */ + H5E_BEGIN_TRY { + is_regular = H5Sis_regular_hyperslab(sid); + } H5E_END_TRY; + VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab"); + + /* Query regular hyperslab selection info (should fail) */ + H5E_BEGIN_TRY { + ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); + } H5E_END_TRY; + VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); + + /* Set "regular" hyperslab selection */ + start[0] = 2; start[1] = 2; start[2] = 2; + stride[0] = 5; stride[1] = 5; stride[2] = 5; + count[0] = 3; count[1] = 3; count[2] = 3; + block[0] = 4; block[1] = 4; block[2] = 4; + ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); + + /* Query if 'hyperslab' selection is regular hyperslab (should be TRUE) */ + is_regular = H5Sis_regular_hyperslab(sid); + VERIFY(is_regular, TRUE, "H5Sis_regular_hyperslab"); + + /* Retrieve the hyperslab parameters */ + ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); + CHECK(ret, FAIL, "H5Sget_regular_hyperslab"); + + /* Verify the hyperslab parameters */ + for(u = 0; u < SPACE13_RANK; u++) { + if(start[u] != q_start[u]) + ERROR("H5Sget_regular_hyperslab, start"); + if(stride[u] != q_stride[u]) + ERROR("H5Sget_regular_hyperslab, stride"); + if(count[u] != q_count[u]) + ERROR("H5Sget_regular_hyperslab, count"); + if(block[u] != q_block[u]) + ERROR("H5Sget_regular_hyperslab, block"); + } /* end for */ + + /* 'OR' in another point */ + t_start[0] = 0; t_start[1] = 0; t_start[2] = 0; + t_count[0] = 1; t_count[1] = 1; t_count[2] = 1; + ret = H5Sselect_hyperslab(sid, H5S_SELECT_OR, t_start, NULL, t_count, NULL); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); + + /* Query if 'hyperslab' selection is regular hyperslab (should be FALSE) */ + is_regular = H5Sis_regular_hyperslab(sid); + VERIFY(is_regular, FALSE, "H5Sis_regular_hyperslab"); + + /* Query regular hyperslab selection info (should fail) */ + H5E_BEGIN_TRY { + ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); + } H5E_END_TRY; + VERIFY(ret, FAIL, "H5Sget_regular_hyperslab"); + + /* 'XOR' in the point again, to remove it, which should make it regular again */ + t_start[0] = 0; t_start[1] = 0; t_start[2] = 0; + t_count[0] = 1; t_count[1] = 1; t_count[2] = 1; + ret = H5Sselect_hyperslab(sid, H5S_SELECT_XOR, t_start, NULL, t_count, NULL); + CHECK(ret, FAIL, "H5Sselect_hyperslab"); + + /* Query if 'hyperslab' selection is regular hyperslab (should be TRUE) */ + is_regular = H5Sis_regular_hyperslab(sid); + VERIFY(is_regular, TRUE, "H5Sis_regular_hyperslab"); + + /* Retrieve the hyperslab parameters */ + ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block); + CHECK(ret, FAIL, "H5Sget_regular_hyperslab"); + + /* Verify the hyperslab parameters */ + for(u = 0; u < SPACE13_RANK; u++) { + if(start[u] != q_start[u]) + ERROR("H5Sget_regular_hyperslab, start"); + if(stride[u] != q_stride[u]) + ERROR("H5Sget_regular_hyperslab, stride"); + if(count[u] != q_count[u]) + ERROR("H5Sget_regular_hyperslab, count"); + if(block[u] != q_block[u]) + ERROR("H5Sget_regular_hyperslab, block"); + } /* end for */ + + /* Close the dataspace */ + ret = H5Sclose(sid); + CHECK(ret, FAIL, "H5Sclose"); +} /* test_hyper_regular() */ + +/**************************************************************** +** ** test_select(): Main H5S selection testing routine. ** ****************************************************************/ @@ -13228,6 +13389,9 @@ test_select(void) /* Test selection bounds with & without offsets */ test_select_bounds(); + /* Test 'regular' hyperslab query routines */ + test_hyper_regular(); + } /* test_select() */ diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index 11437c0..d1db0b7 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -46,6 +46,8 @@ set (H5P_TESTS t_cache t_pflush1 t_pflush2 + t_pshutdown + t_prestart t_shapesame ) diff --git a/testpar/Makefile.am b/testpar/Makefile.am index 448f745..1eae439 100644 --- a/testpar/Makefile.am +++ b/testpar/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs. These are our main targets. # -TEST_PROG_PARA=t_mpi testphdf5 t_cache t_pflush1 t_pflush2 t_shapesame +TEST_PROG_PARA=t_mpi testphdf5 t_cache t_pflush1 t_pflush2 t_pshutdown t_prestart t_shapesame check_PROGRAMS = $(TEST_PROG_PARA) @@ -39,7 +39,8 @@ LDADD = $(LIBH5TEST) $(LIBHDF5) # Temporary files # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf +# shutdown.h5 is from t_pshutdown # go is used for debugging. See testphdf5.c. -CHECK_CLEANFILES+=MPItest.h5 Para*.h5 CacheTestDummy.h5 go +CHECK_CLEANFILES+=MPItest.h5 Para*.h5 CacheTestDummy.h5 shutdown.h5 go include $(top_srcdir)/config/conclude.am diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 8857d47..23ae44a 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -112,7 +112,8 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = t_mpi$(EXEEXT) testphdf5$(EXEEXT) t_cache$(EXEEXT) \ - t_pflush1$(EXEEXT) t_pflush2$(EXEEXT) t_shapesame$(EXEEXT) + t_pflush1$(EXEEXT) t_pflush2$(EXEEXT) t_pshutdown$(EXEEXT) \ + t_prestart$(EXEEXT) t_shapesame$(EXEEXT) t_cache_SOURCES = t_cache.c t_cache_OBJECTS = t_cache.$(OBJEXT) t_cache_LDADD = $(LDADD) @@ -133,6 +134,14 @@ t_pflush2_SOURCES = t_pflush2.c t_pflush2_OBJECTS = t_pflush2.$(OBJEXT) t_pflush2_LDADD = $(LDADD) t_pflush2_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) +t_prestart_SOURCES = t_prestart.c +t_prestart_OBJECTS = t_prestart.$(OBJEXT) +t_prestart_LDADD = $(LDADD) +t_prestart_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) +t_pshutdown_SOURCES = t_pshutdown.c +t_pshutdown_OBJECTS = t_pshutdown.$(OBJEXT) +t_pshutdown_LDADD = $(LDADD) +t_pshutdown_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) t_shapesame_SOURCES = t_shapesame.c t_shapesame_OBJECTS = t_shapesame.$(OBJEXT) t_shapesame_LDADD = $(LDADD) @@ -179,10 +188,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c t_shapesame.c \ - $(testphdf5_SOURCES) -DIST_SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c t_shapesame.c \ - $(testphdf5_SOURCES) +SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c t_prestart.c \ + t_pshutdown.c t_shapesame.c $(testphdf5_SOURCES) +DIST_SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c t_prestart.c \ + t_pshutdown.c t_shapesame.c $(testphdf5_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -682,18 +691,19 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf +# shutdown.h5 is from t_pshutdown # go is used for debugging. See testphdf5.c. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog MPItest.h5 Para*.h5 \ - CacheTestDummy.h5 go +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 MPItest.h5 \ + Para*.h5 CacheTestDummy.h5 shutdown.h5 go # Test programs. These are our main targets. # -TEST_PROG_PARA = t_mpi testphdf5 t_cache t_pflush1 t_pflush2 t_shapesame +TEST_PROG_PARA = t_mpi testphdf5 t_cache t_pflush1 t_pflush2 t_pshutdown t_prestart t_shapesame testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \ t_ph5basic.c t_coll_chunk.c t_span_tree.c t_chunk_alloc.c t_filter_read.c \ t_prop.c @@ -782,6 +792,14 @@ t_pflush2$(EXEEXT): $(t_pflush2_OBJECTS) $(t_pflush2_DEPENDENCIES) $(EXTRA_t_pfl @rm -f t_pflush2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(t_pflush2_OBJECTS) $(t_pflush2_LDADD) $(LIBS) +t_prestart$(EXEEXT): $(t_prestart_OBJECTS) $(t_prestart_DEPENDENCIES) $(EXTRA_t_prestart_DEPENDENCIES) + @rm -f t_prestart$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(t_prestart_OBJECTS) $(t_prestart_LDADD) $(LIBS) + +t_pshutdown$(EXEEXT): $(t_pshutdown_OBJECTS) $(t_pshutdown_DEPENDENCIES) $(EXTRA_t_pshutdown_DEPENDENCIES) + @rm -f t_pshutdown$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(t_pshutdown_OBJECTS) $(t_pshutdown_LDADD) $(LIBS) + t_shapesame$(EXEEXT): $(t_shapesame_OBJECTS) $(t_shapesame_DEPENDENCIES) $(EXTRA_t_shapesame_DEPENDENCIES) @rm -f t_shapesame$(EXEEXT) $(AM_V_CCLD)$(LINK) $(t_shapesame_OBJECTS) $(t_shapesame_LDADD) $(LIBS) @@ -808,7 +826,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pflush1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pflush2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_ph5basic.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_prestart.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_prop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pshutdown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_shapesame.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_span_tree.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testphdf5.Po@am__quote@ diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 7fa88c1..99cbd3b 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -4245,7 +4245,6 @@ setup_rand(void) unsigned predefined_seeds[3] = {33402, 33505, 33422}; unsigned seed; struct timeval tv; - struct timezone tz; if ( ( use_predefined_seeds ) && ( world_mpi_size == num_predefined_seeds ) ) { @@ -4261,7 +4260,7 @@ setup_rand(void) } else { - if ( HDgettimeofday(&tv, &tz) != 0 ) { + if ( HDgettimeofday(&tv, NULL) != 0 ) { nerrors++; if ( verbose ) { diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c index ebe5c38..1bcfeb8 100644 --- a/testpar/t_pflush1.c +++ b/testpar/t_pflush1.c @@ -164,12 +164,9 @@ main(int argc, char* argv[]) } /* end else */ /* - * Some systems like Linux with mpich, if you just _exit without MPI_Finalize - * called, it would terminate but left the launching process waiting forever. - * OTHO, some systems like AIX do not like files not closed when MPI_Finalize - * is called. So, we need to get the MPI file handles, close them by hand, - * then MPI_Finalize. Then the _exit is still needed to stop at_exit from - * happening in some systems. + * Some systems like AIX do not like files not closed when MPI_Finalize + * is called. So, we need to get the MPI file handles, close them by hand. + * Then the _exit is still needed to stop at_exit from happening in some systems. * Note that MPIO VFD returns the address of the file-handle in the VFD struct * because MPI_File_close wants to modify the file-handle variable. */ @@ -195,13 +192,11 @@ main(int argc, char* argv[]) fflush(stdout); fflush(stderr); - MPI_Finalize(); HD_exit(0); error: fflush(stdout); fflush(stderr); - MPI_Finalize(); HD_exit(1); } diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c index 743a3d3..03f7c82 100644 --- a/testpar/t_pflush2.c +++ b/testpar/t_pflush2.c @@ -101,13 +101,17 @@ check_file(char* name, hid_t fapl) if(H5Dclose(dset) < 0) goto error; if(H5Fclose(file) < 0) goto error; if(H5Pclose(plist) < 0) goto error; + if(H5Sclose(space) < 0) goto error; return 0; error: H5E_BEGIN_TRY { - H5Fclose(file); H5Pclose(plist); + H5Gclose(groups); + H5Dclose(dset); + H5Fclose(file); + H5Sclose(space); } H5E_END_TRY; return 1; } diff --git a/testpar/t_prestart.c b/testpar/t_prestart.c new file mode 100644 index 0000000..fab4a7c --- /dev/null +++ b/testpar/t_prestart.c @@ -0,0 +1,138 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF5. The full HDF5 copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the files COPYING and Copyright.html. COPYING can be found at the root * + * of the source code distribution tree; Copyright.html can be found at the * + * root level of an installed copy of the electronic HDF5 document set and * + * is linked from the top-level documents page. It can also be found at * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/* + * Programmer: Mohamad Chaarawi + * February 2015 + * + * Purpose: This test opens a file created by the t_pshutdown program + * and makes sure the objects created are there. + */ + +#include "testphdf5.h" + +int nerrors = 0; /* errors count */ + +const char *FILENAME[] = { + "shutdown", + NULL +}; + +int +main (int argc, char **argv) +{ + hid_t file_id, dset_id, grp_id; + hid_t fapl, sid, mem_dataspace; + herr_t ret; + char filename[1024]; + int mpi_size, mpi_rank, ndims, i, j; + MPI_Comm comm = MPI_COMM_WORLD; + MPI_Info info = MPI_INFO_NULL; + hsize_t dims[RANK]; + hsize_t start[RANK]; + hsize_t count[RANK]; + hsize_t stride[RANK]; + hsize_t block[RANK]; + DATATYPE *data_array = NULL, *dataptr; /* data buffer */ + + MPI_Init(&argc, &argv); + MPI_Comm_size(comm, &mpi_size); + MPI_Comm_rank(comm, &mpi_rank); + + if(MAINPROCESS) + TESTING("proper shutdown of HDF5 library"); + + /* Set up file access property list with parallel I/O access */ + fapl = H5Pcreate(H5P_FILE_ACCESS); + VRFY((fapl >= 0), "H5Pcreate succeeded"); + ret = H5Pset_fapl_mpio(fapl, comm, info); + VRFY((ret >= 0), ""); + + h5_fixname(FILENAME[0], fapl, filename, sizeof filename); + file_id = H5Fopen(filename, H5F_ACC_RDONLY, fapl); + VRFY((file_id >= 0), "H5Fopen succeeded"); + + grp_id = H5Gopen2(file_id, "Group", H5P_DEFAULT); + VRFY((grp_id >= 0), "H5Gopen succeeded"); + + dset_id = H5Dopen2(grp_id, "Dataset", H5P_DEFAULT); + VRFY((dset_id >= 0), "H5Dopen succeeded"); + + sid = H5Dget_space(dset_id); + VRFY((dset_id >= 0), "H5Dget_space succeeded"); + + ndims = H5Sget_simple_extent_dims(sid, dims, NULL); + VRFY((ndims == 2), "H5Sget_simple_extent_dims succeeded"); + VRFY(dims[0] == ROW_FACTOR*mpi_size, "Wrong dataset dimensions"); + VRFY(dims[1] == COL_FACTOR*mpi_size, "Wrong dataset dimensions"); + + /* allocate memory for data buffer */ + data_array = (DATATYPE *)HDmalloc(dims[0]*dims[1]*sizeof(DATATYPE)); + VRFY((data_array != NULL), "data_array HDmalloc succeeded"); + + /* Each process takes a slabs of rows. */ + block[0] = dims[0]/mpi_size; + block[1] = dims[1]; + stride[0] = block[0]; + stride[1] = block[1]; + count[0] = 1; + count[1] = 1; + start[0] = mpi_rank*block[0]; + start[1] = 0; + + ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block); + VRFY((ret >= 0), "H5Sset_hyperslab succeeded"); + + /* create a memory dataspace independently */ + mem_dataspace = H5Screate_simple (RANK, block, NULL); + VRFY((mem_dataspace >= 0), ""); + + /* write data independently */ + ret = H5Dread(dset_id, H5T_NATIVE_INT, mem_dataspace, sid, + H5P_DEFAULT, data_array); + VRFY((ret >= 0), "H5Dwrite succeeded"); + + dataptr = data_array; + + for (i=0; i < block[0]; i++){ + for (j=0; j < block[1]; j++){ + if(*dataptr != mpi_rank+1) { + printf("Dataset Verify failed at [%lu][%lu](row %lu, col %lu): expect %d, got %d\n", + (unsigned long)i, (unsigned long)j, + (unsigned long)(i+start[0]), (unsigned long)(j+start[1]), + mpi_rank+1, *(dataptr)); + nerrors ++; + } + dataptr++; + } + } + MPI_Finalize(); + HDremove(filename); + + /* release data buffers */ + if(data_array) + HDfree(data_array); + + nerrors += GetTestNumErrs(); + + if(MAINPROCESS) { + if(0 == nerrors) + PASSED() + else + H5_FAILED() + } + + return (nerrors!=0); +} diff --git a/testpar/t_pshutdown.c b/testpar/t_pshutdown.c new file mode 100644 index 0000000..be9734f --- /dev/null +++ b/testpar/t_pshutdown.c @@ -0,0 +1,127 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Copyright by The HDF Group. * + * Copyright by the Board of Trustees of the University of Illinois. * + * All rights reserved. * + * * + * This file is part of HDF5. The full HDF5 copyright notice, including * + * terms governing use, modification, and redistribution, is contained in * + * the files COPYING and Copyright.html. COPYING can be found at the root * + * of the source code distribution tree; Copyright.html can be found at the * + * root level of an installed copy of the electronic HDF5 document set and * + * is linked from the top-level documents page. It can also be found at * + * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from help@hdfgroup.org. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/* + * Programmer: Mohamad Chaarawi + * February 2015 + * + * Purpose: This test creates a file and a bunch of objects in the + * file and then calls MPI_Finalize without closing anything. The + * library should exercise the attribute callback destroy attached to + * MPI_COMM_SELF and terminate the HDF5 library closing all open + * objects. The t_prestart test will read back the file and make sure + * all created objects are there. + */ + +#include "testphdf5.h" + +int nerrors = 0; /* errors count */ + +const char *FILENAME[] = { + "shutdown", + NULL +}; + +int +main (int argc, char **argv) +{ + hid_t file_id, dset_id, grp_id; + hid_t fapl, sid, mem_dataspace; + hsize_t dims[RANK], i; + herr_t ret; + char filename[1024]; + int mpi_size, mpi_rank; + MPI_Comm comm = MPI_COMM_WORLD; + MPI_Info info = MPI_INFO_NULL; + hsize_t start[RANK]; + hsize_t count[RANK]; + hsize_t stride[RANK]; + hsize_t block[RANK]; + DATATYPE *data_array = NULL; /* data buffer */ + + MPI_Init(&argc, &argv); + MPI_Comm_size(comm, &mpi_size); + MPI_Comm_rank(comm, &mpi_rank); + + if(MAINPROCESS) + TESTING("proper shutdown of HDF5 library"); + + /* Set up file access property list with parallel I/O access */ + fapl = H5Pcreate(H5P_FILE_ACCESS); + VRFY((fapl >= 0), "H5Pcreate succeeded"); + ret = H5Pset_fapl_mpio(fapl, comm, info); + VRFY((ret >= 0), ""); + + h5_fixname(FILENAME[0], fapl, filename, sizeof filename); + file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); + VRFY((file_id >= 0), "H5Fcreate succeeded"); + grp_id = H5Gcreate2(file_id, "Group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + VRFY((grp_id >= 0), "H5Gcreate succeeded"); + + dims[0] = ROW_FACTOR*mpi_size; + dims[1] = COL_FACTOR*mpi_size; + sid = H5Screate_simple (RANK, dims, NULL); + VRFY((sid >= 0), "H5Screate_simple succeeded"); + + dset_id = H5Dcreate2(grp_id, "Dataset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + VRFY((dset_id >= 0), "H5Dcreate succeeded"); + + /* allocate memory for data buffer */ + data_array = (DATATYPE *)HDmalloc(dims[0]*dims[1]*sizeof(DATATYPE)); + VRFY((data_array != NULL), "data_array HDmalloc succeeded"); + + /* Each process takes a slabs of rows. */ + block[0] = dims[0]/mpi_size; + block[1] = dims[1]; + stride[0] = block[0]; + stride[1] = block[1]; + count[0] = 1; + count[1] = 1; + start[0] = mpi_rank*block[0]; + start[1] = 0; + + /* put some trivial data in the data_array */ + for(i=0 ; i<dims[0]*dims[1]; i++) + data_array[i] = mpi_rank + 1; + + ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block); + VRFY((ret >= 0), "H5Sset_hyperslab succeeded"); + + /* create a memory dataspace independently */ + mem_dataspace = H5Screate_simple (RANK, block, NULL); + VRFY((mem_dataspace >= 0), ""); + + /* write data independently */ + ret = H5Dwrite(dset_id, H5T_NATIVE_INT, mem_dataspace, sid, + H5P_DEFAULT, data_array); + VRFY((ret >= 0), "H5Dwrite succeeded"); + + /* release data buffers */ + if(data_array) + HDfree(data_array); + + MPI_Finalize(); + + nerrors += GetTestNumErrs(); + + if(MAINPROCESS) { + if(0 == nerrors) + PASSED() + else + H5_FAILED() + } + + return (nerrors!=0); +} diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index d167687..9088470 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -5142,10 +5142,7 @@ int main(int argc, char **argv) printf("Shape Same tests finished with no errors\n"); printf("===================================\n"); } - /* close HDF5 library */ - H5close(); - /* MPI_Finalize must be called AFTER H5close which may use MPI calls */ MPI_Finalize(); /* cannot just return (nerrors) because exit code is limited to 1byte */ diff --git a/tools/Makefile.in b/tools/Makefile.in index ef0d6ab..4bd80af 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -662,8 +662,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 CONFIG = ordered # All subdirectories diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 2cb3a1e..e9a5e62 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -670,11 +670,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 # Test programs and scripts TEST_PROG = h5copygentest diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 860590c..29543a4 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -677,11 +677,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5diff. They should # be copied to the testfiles/ directory if update is required -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 expect_sorted \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 expect_sorted \ actual_sorted # Always build and test h5diff but build and test ph5diff only if parallel diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 287713d..fb8cc9b 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -676,11 +676,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.bin # Test programs and scripts TEST_PROG = h5dumpgentest diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 7b9eadc..ed26aab 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -670,10 +670,10 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files from h5importtest -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.bin +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.bin # Test programs and scripts TEST_PROG = h5importtest diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 4c40784..855b708 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -682,12 +682,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 testfiles/h5jam-*-sav \ - testfiles/h5unjam-*-sav +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ + testfiles/h5jam-*-sav testfiles/h5unjam-*-sav TEST_SCRIPT = testh5jam.sh # Add h5jam and h5unjam specific linker flags here diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index bd1244c..0a33e29 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -662,8 +662,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Test programs and scripts TEST_SCRIPT = testh5ls.sh diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 9edb827..698b8a3 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -694,11 +694,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5repack. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.bin \ testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5 # Test programs and scripts diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 9e9a6aa..993a226 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -672,12 +672,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5repart_gentest. They should # copied to the testfiles/ directory if update is required. fst_family*.h5 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 #test script and program diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 26e88ee..607f1ed 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -659,8 +659,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # This is our main target, the h5tools library. noinst_LTLIBRARIES = libh5tools.la diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 3981b1e..c00f45b 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -2472,7 +2472,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_ /* Close array base type */ if(H5Tclose(super) < 0) HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed"); - } + } else HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tget_super failed"); @@ -2846,17 +2846,13 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, } + /*------------------------------------------------------------------------- * Function: dump_fill_value * * Purpose: prints the fill value * * Return: void - * - * Programmer: pvn - * - * Modifications: - * *------------------------------------------------------------------------- */ void @@ -2887,15 +2883,11 @@ h5tools_print_fill_value(h5tools_str_t *buffer/*in,out*/, const h5tool_format_t * Purpose: prints several dataset create property list properties * * Return: void - * - * Modifications: pvn, March 28, 2008 - * Add a COMPRESSION ratio information for cases when filters are present - * *------------------------------------------------------------------------- */ void h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, - h5tools_context_t *ctx, hid_t dcpl_id,hid_t type_id, hid_t obj_id) + h5tools_context_t *ctx, hid_t dcpl_id, hid_t type_id, hid_t obj_id) { int nfilters; /* number of filters */ int rank; /* rank */ @@ -2909,16 +2901,18 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, H5D_fill_value_t fvstatus; H5D_alloc_time_t at; H5D_fill_time_t ft; - size_t ncols = 80; /* available output width */ + H5D_layout_t stl; + size_t ncols = 80; /* available output width */ size_t cd_nelmts; /* filter client number of values */ off_t offset; /* offset of external file */ char f_name[256]; /* filter name */ - char name[256]; /* external file name */ + char name[256]; /* external or virtual file name */ + char dsetname[256]; /* virtual datset name */ hsize_t chsize[64]; /* chunk size in elements */ hsize_t size; /* size of external file */ hsize_t storage_size; - hsize_t curr_pos = 0; /* total data element position */ - h5tools_str_t buffer; /* string into which to render */ + hsize_t curr_pos = 0; /* total data element position */ + h5tools_str_t buffer; /* string into which to render */ /* setup */ HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -2940,216 +2934,172 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_str_append(&buffer, "%s %s", STORAGE_LAYOUT, BEGIN); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - if(H5D_CHUNKED == H5Pget_layout(dcpl_id)) { - ctx->indent_level++; + ctx->indent_level++; - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s ", CHUNKED); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - rank = H5Pget_chunk(dcpl_id,(int)NELMTS(chsize),chsize); - h5tools_str_append(&buffer, "%s " HSIZE_T_FORMAT, h5tools_dump_header_format->dataspacedimbegin, chsize[0]); - for(i = 1; i < rank; i++) - h5tools_str_append(&buffer, ", " HSIZE_T_FORMAT, chsize[i]); - h5tools_str_append(&buffer, " %s", h5tools_dump_header_format->dataspacedimend); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + stl = H5Pget_layout(dcpl_id); + switch (stl) { + case H5D_CHUNKED: + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s ", CHUNKED); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); + rank = H5Pget_chunk(dcpl_id, (int) NELMTS(chsize), chsize); + h5tools_str_append(&buffer, "%s " HSIZE_T_FORMAT, h5tools_dump_header_format->dataspacedimbegin, chsize[0]); + for(i = 1; i < rank; i++) + h5tools_str_append(&buffer, ", " HSIZE_T_FORMAT, chsize[i]); + h5tools_str_append(&buffer, " %s", h5tools_dump_header_format->dataspacedimend); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); - /* if there are filters, print a compression ratio */ - if(nfilters) { - hsize_t dims[H5S_MAX_RANK]; - hsize_t nelmts = 1; - double ratio = 0; - int ok = 0; - - hid_t tid = H5Dget_type(obj_id); - hid_t sid = H5Dget_space(obj_id); - size_t datum_size = H5Tget_size(tid); - int ndims = H5Sget_simple_extent_dims(sid, dims, NULL); - - /* only print the compression ratio for these filters */ - for(i = 0; i < nfilters && !ok; i++) { - cd_nelmts = NELMTS(cd_values); - filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts, - cd_values, sizeof(f_name), f_name, NULL); - ok = (filtn>=0); - - /* this following code will not show compression ratio for - user defined filter. For example, see HDFFV-8344 --xcao@hdfgroup.org - switch(filtn) { - case H5Z_FILTER_DEFLATE: - case H5Z_FILTER_SZIP: - case H5Z_FILTER_NBIT: - case H5Z_FILTER_SCALEOFFSET: - ok = 1; - break; - } - */ - } + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - if(ndims && ok) { - hsize_t uncomp_size; + h5tools_str_reset(&buffer); - for(i = 0; i < ndims; i++) { - nelmts *= dims[i]; + /* if there are filters, print a compression ratio */ + if (nfilters) { + hsize_t dims[H5S_MAX_RANK]; + hsize_t nelmts = 1; + double ratio = 0; + int ok = 0; + + hid_t tid = H5Dget_type(obj_id); + hid_t sid = H5Dget_space(obj_id); + size_t datum_size = H5Tget_size(tid); + int ndims = H5Sget_simple_extent_dims(sid, dims, NULL); + + /* only print the compression ratio for these filters */ + for (i = 0; i < nfilters && !ok; i++) { + cd_nelmts = NELMTS(cd_values); + filtn = H5Pget_filter2(dcpl_id, (unsigned) i, &filt_flags, &cd_nelmts, cd_values, sizeof(f_name), + f_name, NULL); + ok = (filtn >= 0); } - uncomp_size = nelmts * datum_size; - /* compression ratio = uncompressed size / compressed size */ + if(ndims && ok) { + hsize_t uncomp_size; - if(storage_size != 0) - ratio = (double) uncomp_size / (double) storage_size; + for(i = 0; i < ndims; i++) { + nelmts *= dims[i]; + } + uncomp_size = nelmts * datum_size; - h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT" (%.3f:1 COMPRESSION)", storage_size, ratio); + /* compression ratio = uncompressed size / compressed size */ - } - else - h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size); + if(storage_size != 0) + ratio = (double) uncomp_size / (double) storage_size; - H5Sclose(sid); - H5Tclose(tid); + h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT" (%.3f:1 COMPRESSION)", storage_size, ratio); - } - else { - h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size); - } - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + } + else + h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size); - ctx->indent_level--; + H5Sclose(sid); + H5Tclose(tid); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s",END); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - } - else if(H5D_COMPACT == H5Pget_layout(dcpl_id)) { - ctx->indent_level++; + } + else { + h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size); + } + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); + break; + case H5D_COMPACT: + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s", COMPACT); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s", COMPACT); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "SIZE " HSIZE_T_FORMAT, storage_size); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); + break; + case H5D_CONTIGUOUS: + { + int next; - ctx->indent_level--; + next = H5Pget_external_count(dcpl_id); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s",END); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - } - else if(H5D_CONTIGUOUS == H5Pget_layout(dcpl_id)) { - int next; + /*------------------------------------------------------------------------- + * EXTERNAL_FILE + *------------------------------------------------------------------------- + */ + if (next) { + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s", CONTIGUOUS); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); - next = H5Pget_external_count(dcpl_id); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - /*------------------------------------------------------------------------- - * EXTERNAL_FILE - *------------------------------------------------------------------------- - */ - if(next) { - ctx->indent_level++; + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s %s", EXTERNAL, BEGIN); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s", CONTIGUOUS); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->indent_level++; + for (j = 0; j < (unsigned) next; j++) { + H5Pget_external(dcpl_id, j, sizeof(name), name, &offset, &size); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s %s", EXTERNAL, BEGIN); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->indent_level++; - for(j = 0; j < (unsigned)next; j++) { - H5Pget_external(dcpl_id, j, sizeof(name), name, &offset, &size); + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "FILENAME %s SIZE " HSIZE_T_FORMAT, name, size); + h5tools_str_append(&buffer, " OFFSET %ld", offset); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); + } + ctx->indent_level--; - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "FILENAME %s SIZE " HSIZE_T_FORMAT, name, size); - h5tools_str_append(&buffer, " OFFSET %ld", offset); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - } - ctx->indent_level--; + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s",END); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s", END); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); + } + else { + haddr_t ioffset; - ctx->indent_level--; + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s", CONTIGUOUS); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s",END); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - } - else { - haddr_t ioffset; + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->indent_level++; + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer,"SIZE " HSIZE_T_FORMAT, storage_size); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s", CONTIGUOUS); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - + h5tools_str_reset(&buffer); + ioffset = H5Dget_offset(obj_id); + h5tools_str_append(&buffer, "OFFSET "H5_PRINTF_HADDR_FMT, ioffset); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); + } + } + break; + default: h5tools_str_reset(&buffer); - h5tools_str_append(&buffer,"SIZE " HSIZE_T_FORMAT, storage_size); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + h5tools_str_append(&buffer, "%s", "Unknown layout"); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t) ncols, (hsize_t) 0, (hsize_t) 0); + }/*switch*/ - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - ioffset = H5Dget_offset(obj_id); - h5tools_str_append(&buffer,"OFFSET "H5_PRINTF_HADDR_FMT, ioffset); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->indent_level--; - ctx->indent_level--; + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s",END); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - } - } - /*------------------------------------------------------------------------- + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s", END); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + + /*------------------------------------------------------------------------- * FILTERS *------------------------------------------------------------------------- */ @@ -3169,7 +3119,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts, cd_values, sizeof(f_name), f_name, NULL); - if (filtn<0) + if (filtn < 0) continue; /* nothing to print for invalid filter */ ctx->need_prefix = TRUE; @@ -3190,70 +3140,68 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); break; case H5Z_FILTER_SZIP: - { - szip_options_mask = cd_values[0];; - szip_pixels_per_block = cd_values[1]; + szip_options_mask = cd_values[0];; + szip_pixels_per_block = cd_values[1]; - h5tools_str_append(&buffer, "%s %s",SZIP, BEGIN); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + h5tools_str_append(&buffer, "%s %s", SZIP, BEGIN); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->indent_level++; + ctx->indent_level++; - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - if(szip_options_mask & H5_SZIP_CHIP_OPTION_MASK) - h5tools_str_append(&buffer, "MODE %s", "HARDWARE"); - else if(szip_options_mask & H5_SZIP_ALLOW_K13_OPTION_MASK) - h5tools_str_append(&buffer, "MODE %s", "K13"); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - if(szip_options_mask & H5_SZIP_EC_OPTION_MASK) - h5tools_str_append(&buffer, "CODING %s", "ENTROPY"); - else if(szip_options_mask & H5_SZIP_NN_OPTION_MASK) - h5tools_str_append(&buffer, "CODING %s", "NEAREST NEIGHBOUR"); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - if(szip_options_mask & H5_SZIP_LSB_OPTION_MASK) - h5tools_str_append(&buffer, "BYTE_ORDER %s", "LSB"); - else if(szip_options_mask & H5_SZIP_MSB_OPTION_MASK) - h5tools_str_append(&buffer, "BYTE_ORDER %s", "MSB"); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + h5tools_str_reset(&buffer); + if(szip_options_mask & H5_SZIP_CHIP_OPTION_MASK) + h5tools_str_append(&buffer, "MODE %s", "HARDWARE"); + else if(szip_options_mask & H5_SZIP_ALLOW_K13_OPTION_MASK) + h5tools_str_append(&buffer, "MODE %s", "K13"); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - if(szip_options_mask & H5_SZIP_RAW_OPTION_MASK) { - ctx->need_prefix = TRUE; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - - h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "HEADER %s", "RAW"); - h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - } + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); + + h5tools_str_reset(&buffer); + if(szip_options_mask & H5_SZIP_EC_OPTION_MASK) + h5tools_str_append(&buffer, "CODING %s", "ENTROPY"); + else if(szip_options_mask & H5_SZIP_NN_OPTION_MASK) + h5tools_str_append(&buffer, "CODING %s", "NEAREST NEIGHBOUR"); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); - ctx->indent_level--; + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); + h5tools_str_reset(&buffer); + if(szip_options_mask & H5_SZIP_LSB_OPTION_MASK) + h5tools_str_append(&buffer, "BYTE_ORDER %s", "LSB"); + else if(szip_options_mask & H5_SZIP_MSB_OPTION_MASK) + h5tools_str_append(&buffer, "BYTE_ORDER %s", "MSB"); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); + + if(szip_options_mask & H5_SZIP_RAW_OPTION_MASK) { ctx->need_prefix = TRUE; h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "%s",END); + h5tools_str_append(&buffer, "HEADER %s", "RAW"); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); } + + ctx->indent_level--; + + ctx->need_prefix = TRUE; + h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); + + h5tools_str_reset(&buffer); + h5tools_str_append(&buffer, "%s", END); + h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); break; case H5Z_FILTER_NBIT: h5tools_str_append(&buffer, "%s", NBIT); @@ -3264,7 +3212,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0); break; default: - /* filter do not have to be avaiable for showing registered filter info. + /* filters do not have to be available for showing registered filter info. see HDFFV-8346 for details. --xcao@hdfgroup.org if(H5Zfilter_avail(filtn)) h5tools_str_append(&buffer, "%s %s", "USER_REGISTERED_FILTER", BEGIN); diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 06396f8..e11838f 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -697,12 +697,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. +# *.clog and *.clog2 are from the MPE option. # Temporary files. *.h5 are generated by h5repart_gentest. They should # copied to the testfiles/ directory if update is required. fst_family*.h5 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 #test script and program diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in index 728ce45..1f903c5 100644 --- a/tools/perform/Makefile.in +++ b/tools/perform/Makefile.in @@ -701,8 +701,8 @@ TRACE = perl $(top_srcdir)/bin/trace # .chkexe files are used to mark tests that have run successfully. # .chklog files are output from those tests. -# *.clog are from the MPE option. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog +# *.clog and *.clog2 are from the MPE option. +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 # Add h5perf and h5perf_serial specific linker flags here h5perf_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) diff --git a/tools/perform/perf.c b/tools/perform/perf.c index 7d329f0..1bd33b6 100644 --- a/tools/perform/perf.c +++ b/tools/perform/perf.c @@ -390,7 +390,7 @@ die_jar_jar_die: free(tmp); if (opt_correct) free(tmp2); - + MPI_Finalize(); return(0); diff --git a/tools/perform/sio_standalone.h b/tools/perform/sio_standalone.h index b2f8220..4eb1ded 100644 --- a/tools/perform/sio_standalone.h +++ b/tools/perform/sio_standalone.h @@ -87,7 +87,6 @@ #define HDatof(S) atof(S) #define HDatoi(S) atoi(S) #define HDatol(S) atol(S) -#define HDBSDgettimeofday(S,P) BSDgettimeofday(S,P) #define HDbsearch(K,B,N,Z,F) bsearch(K,B,N,Z,F) #define HDcalloc(N,Z) calloc(N,Z) #define HDceil(X) ceil(X) diff --git a/vms/COPYING b/vms/COPYING deleted file mode 100644 index 6903daf..0000000 --- a/vms/COPYING +++ /dev/null @@ -1,16 +0,0 @@ - - Copyright by The HDF Group and - The Board of Trustees of the University of Illinois. - All rights reserved. - - The files and subdirectories in this directory are part of HDF5. - The full HDF5 copyright notice, including terms governing use, - modification, and redistribution, is contained in the files COPYING - and Copyright.html. COPYING can be found at the root of the source - code distribution tree; Copyright.html can be found at the root - level of an installed copy of the electronic HDF5 document set and - is linked from the top-level documents page. It can also be found - at http://www.hdfgroup.org/HDF5/doc/Copyright.html. If you do not - have access to either file, you may request a copy from - help@hdfgroup.org. - diff --git a/vms/build.com b/vms/build.com deleted file mode 100644 index c6b972a..0000000 --- a/vms/build.com +++ /dev/null @@ -1,65 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$! -$! This file builds C, Fortran, C++ HDF5 libraries and runs the tests -$! Specify location of the top HDF5 source directory -$ -$ hdf5top == "disk$user:[hdfgroup.hdf5]" -$ len = F$LENGTH(hdf5top) -$ tmp = F$EXTRACT(0, len-1, hdf5top) -$ hdf5vms = tmp + ".VMS]" -$ hdf5ctest = tmp + ".TEST]" -$ hdf5f90test = tmp + ".FORTRAN.TEST]" -$ hdf5cxxtest = tmp + ".C__.TEST]" -$ hdf5toolstest = tmp + ".TOOLS.TESTFILES]" -$ hdf5toolstest_h5diff = tmp + ".TOOLS.H5DIFF.TESTFILES]" -$ hdf5toolstest_h5repack = tmp + ".TOOLS.H5REPACK.TESTFILES]" -$ hdf5toolstest_h5copy = tmp + ".TOOLS.H5COPY.TESTFILES]" -$ hdf5toolstest_h5import = tmp + ".TOOLS.H5IMPORT.TESTFILES]" -$ hdf5toolstest_h5jam = tmp + ".TOOLS.H5JAM.TESTFILES]" -$ set def 'hdf5vms' -$@make -$ set def 'hdf5ctest' -$@check -$ set def 'hdf5f90test' -$@check -$ set def 'hdf5cxxtest' -$@check -$ set def 'hdf5toolstest' -$ copy [-.h5dump]check_h5dump.com check_h5dump.com -$ copy [-.h5ls]check_h5ls.com check_h5ls.com -$@check_h5dump.com -$@check_h5ls.com -$ set def 'hdf5toolstest_h5diff' -$ copy [-]check_h5diff.com check_h5diff.com -$@check_h5diff.com -$ set def 'hdf5toolstest_h5repack' -$ copy [-]check_h5repack.com check_h5repack.com -$@check_h5repack.com -$! -$ set def 'hdf5toolstest_h5copy' -$ copy [-]check_h5copy.com check_h5copy.com -$@check_h5copy.com -$! -$ set def 'hdf5toolstest_h5import' -$ copy [.-]check_h5import.com check_h5import.com -$@check_h5import.com -$! -$ set def 'hdf5toolstest_h5jam' -$ copy [.-]check_h5jam.com check_h5jam.com -$@check_h5jam.com -$ -$ exit diff --git a/vms/c++/examples/check.com b/vms/c++/examples/check.com deleted file mode 100644 index 0149819..0000000 --- a/vms/c++/examples/check.com +++ /dev/null @@ -1,53 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$! Command file to run C++ examples -$! -$! -$ type sys$input - - Running create -$ run create -$! -$ type sys$input - - Running readdata -$ run readdata -$! -$ type sys$input - - Running writedata -$ run writedata -$! -$ type sys$input - - Running compound -$ run compound -$! -$ type sys$input - - Running extend_ds -$ run extend_ds -$! -$ type sys$input - - Running chunks -$ run chunks -$! -$ type sys$input - - Running h5group -$ run h5group -$ exit diff --git a/vms/c++/examples/make.com b/vms/c++/examples/make.com deleted file mode 100644 index 45d74ce..0000000 --- a/vms/c++/examples/make.com +++ /dev/null @@ -1,79 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$! Make HDF5 C++ examples -$! -$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee] -$ cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS/include=zlib_dir" -$ ccc := cxx 'cxxopt /include=([-.-.include]) -$! -$! -$ cxxobj= "chunks.cxx, compound.cxx, create.cxx, extend_ds.cxx, h5group.cxx, "+- - "readdata.cxx, writedata.cxx" -$! -$! -$ ccc 'cxxobj -$ type sys$input - - Creating chunks -$ cxxlink chunks, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - - Creating compound -$ cxxlink compound, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - - Creating create -$ cxxlink create, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - - Creating extend_ds -$ cxxlink extend_ds, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - - Creating h5group -$ cxxlink h5group, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - - Creating readdata -$ cxxlink readdata, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - - Creating writedata -$ cxxlink writedata, - - [-.-.lib]hdf5_cplus.olb/lib, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input -$! -$ exit diff --git a/vms/c++/src/make.com b/vms/c++/src/make.com deleted file mode 100644 index 37525bc..0000000 --- a/vms/c++/src/make.com +++ /dev/null @@ -1,85 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 C++ library -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS" -$ ccc := cxx 'cxxopt /include=([-.-.src]) -$! -$! type sys$input -$! Creating HDF5 C++ library -$! -$ lib/create/object hdf5_cplus.olb -$ ccc H5AbstractDs.cxx -$ lib/insert/object hdf5_cplus H5AbstractDs -$ ccc H5ArrayType.cxx -$ lib/insert/object hdf5_cplus H5ArrayType -$ ccc H5AtomType.cxx -$ lib/insert/object hdf5_cplus H5AtomType -$ ccc H5Attribute.cxx -$ lib/insert/object hdf5_cplus H5Attribute -$ ccc H5CommonFG.cxx -$ lib/insert/object hdf5_cplus H5CommonFG -$ ccc H5CompType.cxx -$ lib/insert/object hdf5_cplus H5CompType -$ ccc H5DataSet.cxx -$ lib/insert/object hdf5_cplus H5DataSet -$ ccc H5DataSpace.cxx -$ lib/insert/object hdf5_cplus H5DataSpace -$ ccc H5DataType.cxx -$ lib/insert/object hdf5_cplus H5DataType -$ ccc H5DcreatProp.cxx -$ lib/insert/object hdf5_cplus H5DcreatProp -$ ccc H5DxferProp.cxx -$ lib/insert/object hdf5_cplus H5DxferProp -$ ccc H5EnumType.cxx -$ lib/insert/object hdf5_cplus H5EnumType -$ ccc H5Exception.cxx -$ lib/insert/object hdf5_cplus H5Exception -$ ccc H5FaccProp.cxx -$ lib/insert/object hdf5_cplus H5FaccProp -$ ccc H5FcreatProp.cxx -$ lib/insert/object hdf5_cplus H5FcreatProp -$ ccc H5File.cxx -$ lib/insert/object hdf5_cplus H5File -$ ccc H5FloatType.cxx -$ lib/insert/object hdf5_cplus H5FloatType -$ ccc H5Group.cxx -$ lib/insert/object hdf5_cplus H5Group -$ ccc H5IdComponent.cxx -$ lib/insert/object hdf5_cplus H5IdComponent -$ ccc H5IntType.cxx -$ lib/insert/object hdf5_cplus H5IntType -$ ccc H5Library.cxx -$ lib/insert/object hdf5_cplus H5Library -$ ccc H5Object.cxx -$ lib/insert/object hdf5_cplus H5Object -$ ccc H5PredType.cxx -$ lib/insert/object hdf5_cplus H5PredType -$ ccc H5PropList.cxx -$ lib/insert/object hdf5_cplus H5PropList -$ ccc H5StrType.cxx -$ lib/insert/object hdf5_cplus H5StrType -$ ccc H5VarLenType.cxx -$ lib/insert/object hdf5_cplus H5VarLenType -$! -$ type sys$input - Done -$ exit diff --git a/vms/c++/test/check.com b/vms/c++/test/check.com deleted file mode 100644 index cd523c3..0000000 --- a/vms/c++/test/check.com +++ /dev/null @@ -1,23 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Command file to run C++ tests -$! -$ type sys$input - Running C++ tests -$! -$ run testhdf5 -$ exit diff --git a/vms/c++/test/make.com b/vms/c++/test/make.com deleted file mode 100644 index 7016a18..0000000 --- a/vms/c++/test/make.com +++ /dev/null @@ -1,49 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 C++ library tests -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! cxxopt = "/float=ieee_float/standard=strict_ansi/define=H5_VMS" -$ -$ ccc := cxx 'cxxopt /include=([-.-.src], [-.-.test], [-.src]) -$! -$! -$! -$ ccc h5cpputil -$ ccc dsets -$ ccc tattr -$ ccc tcompound -$ ccc testhdf5 -$ ccc tfile -$ ccc tfilter -$ ccc th5s -$ ccc tlinks -$ ccc trefer -$ ccc ttypes -$ ccc tvlstr -$ type sys$input - Creating testhdf5 -$ cxxlink testhdf5, dsets, h5cpputil, tattr, tcompound, tfile, tfilter, th5s, - - tlinks, trefer, ttypes, tvlstr, - - [-.src]hdf5_cplus.olb/lib, [-.-.test]libh5test.olb/lib, - - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Done -$ exit diff --git a/vms/examples/check.com b/vms/examples/check.com deleted file mode 100644 index e78dcf5..0000000 --- a/vms/examples/check.com +++ /dev/null @@ -1,31 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$ type sys$input - Running examples -$ run h5_write -$ run h5_read -$ run h5_extend_write -$ run h5_chunk_read -$ run h5_compound -$ run h5_group -$ run h5_select -$ run h5_attribute -$ run h5_mount -$ run h5_reference -$ run h5_ref2reg -$ run h5_drivers -$ exit diff --git a/vms/examples/make.com b/vms/examples/make.com deleted file mode 100644 index 2de398e..0000000 --- a/vms/examples/make.com +++ /dev/null @@ -1,79 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 C examples -$! -$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee] -$ ccopt = "/float=ieee_float/nowarnings/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.include]) -$ type sys$input - Compiling C examples -$! -$ cobj= "h5_write.c, h5_read.c, h5_extend_write.c, h5_chunk_read.c, "+- - "h5_compound.c, h5_group.c, h5_select.c, h5_attribute.c, "+- - "h5_mount.c, h5_ref2reg.c, h5_reference.c, h5_drivers.c " -$! -$ ccc 'cobj -$ -$ type sys$input - Creating h5_write -$ link h5_write, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_read -$ link h5_read, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_extend_write -$ link h5_extend_write, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_chunk_read -$ link h5_chunk_read, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_compound -$ link h5_compound, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_group -$ link h5_group, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_select -$ link h5_select, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_attribute -$ link h5_attribute, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_mount -$ link h5_mount, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_reference -$ link h5_reference, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_ref2reg -$ link h5_ref2reg, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Creating h5_drivers -$ link h5_drivers, - - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ exit diff --git a/vms/fortran/examples/check.com b/vms/fortran/examples/check.com deleted file mode 100644 index 63c1c25..0000000 --- a/vms/fortran/examples/check.com +++ /dev/null @@ -1,94 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Command file to run Fortran examples; examples need to run in a defined -$! order due to file dependencies. -$! -$ type sys$input - - - Running Fortran examples - -$ type sys$input - - Running dsetexample -$ run dsetexample -$ -$ type sys$input - - Running fileexample -$ run fileexample -$ -$ type sys$input - - Running rwdsetexample -$ run rwdsetexample -$ -$ type sys$input - - Running attrexample -$ run attrexample -$ -$ type sys$input - - Running groupexample -$ run groupexample -$ -$ type sys$input - - Running grpsexample -$ run grpsexample -$ -$ type sys$input - - Running grpdsetexample -$ run grpdsetexample -$ -$ type sys$input - - Running hyperslab -$ run hyperslab -$ -$ type sys$input - - Running selectele -$ run selectele -$ -$ type sys$input - - Running grpit -$ run grpit -$ -$ type sys$input - - Running refobjexample -$ run refobjexample -$ -$ type sys$input - - Running refregexample -$ run refregexample -$ -$ type sys$input - - Running mountexample -$ run mountexample -$ -$ type sys$input - - Running compound -$ run compound -$ exit diff --git a/vms/fortran/examples/make.com b/vms/fortran/examples/make.com deleted file mode 100644 index 6c5bfe7..0000000 --- a/vms/fortran/examples/make.com +++ /dev/null @@ -1,117 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 Fortran examples -$! -$ fcopt = "/float=ieee_float/define=H5_VMS" -$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee] -$ fff := fortran 'fcopt /module=[-.-.include] -$ -$ type sys$input - Compiling HDF5 Fortran examples -$! -$ ffiles="dsetexample.f90, fileexample.f90, rwdsetexample.f90, "+- - "attrexample.f90, groupexample.f90, grpsexample.f90, "+- - "grpdsetexample.f90, hyperslab.f90, selectele.f90, grpit.f90,"+- - "refobjexample.f90, refregexample.f90, mountexample.f90,"+- - "compound.f90" -$! -$ fff 'ffiles -$ type sys$input - - Creating dsetexample -$ link dsetexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating fileexample -$ link fileexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating rwdsetexample -$ link rwdsetexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating attrexample -$ link attrexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating groupexample -$ link groupexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating grpsexample -$ link grpsexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating grpdsetexample -$ link grpdsetexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating hyperslab -$ link hyperslab ,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating selectele -$ link selectele,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating grpit -$ link grpit,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating refobjexample -$ link refobjexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating refregexample -$ link refregexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating mountexample -$ link mountexample,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - - Creating compound -$ link compound,- - [-.-.lib]hdf5_fortran.olb/lib,- - [-.-.lib]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ exit diff --git a/vms/fortran/src/make.com b/vms/fortran/src/make.com deleted file mode 100644 index 5ad89ff..0000000 --- a/vms/fortran/src/make.com +++ /dev/null @@ -1,75 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 Fortran library -$! -$! The thre two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir" -$! fcopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir" -$ ccc := cc 'ccopt /include=[-.-.src] -$ fff := fortran 'fcopt -$ type sys$input - Creating and running H5test_kind to generate H5fortran_detect.f90 -$! -$ fff H5test_kind_sizeof.f90 -$ link H5test_kind_sizeof -$ define/user_mode sys$output H5fortran_detect.f90 -$ run H5test_kind_sizeof -$! -$ type sys$input - Creating and running H5fortran_detect.f90 to generate H5fort_type_defines.h -$! -$ fff H5fortran_detect.f90 -$ link H5fortran_detect -$ define/user_mode sys$output H5fort_type_defines.h -$ run H5fortran_detect -$! -$ type sys$input - Creating and running H5match_types to generate H5fortran_types.f90 -$! -$ ccc H5match_types.c -$ link H5match_types -$ run H5match_types -$! -$! -$ type sys$input - Creating HDF5 Fortran library -$! -$ cobj="H5f90kit, H5_f, H5Af, H5Df, H5Ef, H5Ff, H5Gf, "+- - "H5If, H5Lf, H5Of, H5Pf, H5Rf, H5Sf, H5Tf, H5Zf" -$ ffiles= "H5_ff.f90, H5Aff.f90, H5Dff.f90, H5Eff.f90,"+- - "H5Lff.f90, H5Off.f90,"+- - "H5Fff.f90, H5Gff.f90, H5Iff.f90, H5Pff.f90, H5Rff.f90, H5Sff.f90,"+- - "H5Tff.f90, H5Zff.f90, H5_DBLE_InterfaceInclude.f90, HDF5.f90" -$ fobj="H5f90global, "+- - "H5fortran_types, H5_ff, H5Aff, H5Dff, H5Eff,"+- - "H5Fff, H5Gff, H5Iff, H5Lff, H5Off, H5Pff, H5Rff, H5Sff,"+- - "H5Tff, H5Zff, H5_DBLE_InterfaceInclude, HDF5" -$! -$ ccc 'cobj -$ fff H5fortran_types.f90 -$ fff H5f90global.f90 -$ -$ fff 'ffiles -$ library/create []hdf5_fortran 'cobj -$ library/replace []hdf5_fortran 'fobj -$ type sys$input - Done -$ exit diff --git a/vms/fortran/test/check.com b/vms/fortran/test/check.com deleted file mode 100644 index 0a53e20..0000000 --- a/vms/fortran/test/check.com +++ /dev/null @@ -1,26 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Command file to run Fortran tests -$! -$! -$ type sys$input - Running Fortran tests -$ run fortranlib_test -$ run fortranlib_test_1_8 -$ run fflush1 -$ run fflush2 -$ exit diff --git a/vms/fortran/test/make.com b/vms/fortran/test/make.com deleted file mode 100644 index 478c64c..0000000 --- a/vms/fortran/test/make.com +++ /dev/null @@ -1,69 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 Fortran tests -$! -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir" -$! fcopt = "/float=ieee_float/define=H5_VMS/debug/nooptimize/include=zlib_dir" -$ ccc := cc 'ccopt /include=[-.-.src] -$ fff := fortran 'fcopt /module=[-.src] -$ -$ type sys$input - Creating HDF5 Fortran tests -$! -$ cobj="t " -$ ffiles="fortranlib_test.f90, tH5F.f90, tH5D.f90, "+- - "tH5R.f90, tH5S.f90, tH5T.f90, tH5VL.f90, tH5Z.f90, tH5Sselect.f90,"+- - "tH5P.f90, tH5A.f90, tH5I.f90, tH5G.f90, tH5E.f90, tf.f90" -$ ffiles18="fortranlib_test_1_8.f90, tH5F.f90, tH5O.f90,"+- - "tH5A_1_8.f90, tH5G_1_8.f90" - -$ fobj="fortranlib_test, tH5F, tH5D, "+- - "tH5R, tH5S, tH5T, tH5VL, tH5Z, tH5Sselect,"+- - "tH5P, tH5A, tH5I, tH5G, tH5E, tf" -$ fobj18="fortranlib_test_1_8, tH5F, tH5O, tH5A_1_8, tH5G_1_8" -$! -$ ccc 'cobj -$ fff 'ffiles -$ fff 'ffiles18 -$ fff fflush1.f90 -$ fff fflush2.f90 -$ library/create []h5test_fortran t, tf -$ link fflush1,h5test_fortran.olb/lib,- - [-.-.test]libh5test.olb/lib, - - [-.src]hdf5_fortran.olb/lib,- - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ link fflush2,h5test_fortran.olb/lib,- - [-.-.test]libh5test.olb/lib, - - [-.src]hdf5_fortran.olb/lib,- - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ link/exec=fortranlib_test.exe - - fortranlib_test.obj, tH5F.obj, tH5D.obj, - - tH5R.obj, tH5S.obj, tH5T.obj, tH5VL.obj, tH5Z.obj, tH5Sselect.obj, - - tH5P.obj, tH5A.obj, tH5I.obj, tH5G.obj, tH5E.obj,- - h5test_fortran.olb/lib,[-.-.test]libh5test.olb/lib, - - [-.src]hdf5_fortran.olb/lib,- - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ link/exec=fortranlib_test_1_8.exe - - fortranlib_test_1_8.obj, tH5F.obj, tH5O.obj, tH5A_1_8.obj, tH5G_1_8.obj,- - h5test_fortran.olb/lib,[-.-.test]libh5test.olb/lib, - - [-.src]hdf5_fortran.olb/lib,- - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created HDF5 Fortran tests -$! -$ exit diff --git a/vms/install.com b/vms/install.com deleted file mode 100644 index f1f9304..0000000 --- a/vms/install.com +++ /dev/null @@ -1,166 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$! -$! This command file installs built binaries, header files, examples and -$! scripts under [.hdf5] directory in the main distribution -$! -$ -$! -$! -$ hdf5top = F$DIRECTORY() -$ len = F$LENGTH(hdf5top) -$ hdf5top_dir = F$EXTRACT(0, len-4, hdf5top) -$! -$ hdf5src = hdf5top_dir + "SRC]" -$ hdf5examples = hdf5top_dir + "EXAMPLES]" -$ hdf5tools_h5copy = hdf5top_dir + "TOOLS.H5COPY]" -$ hdf5tools_h5diff = hdf5top_dir + "TOOLS.H5DIFF]" -$ hdf5tools_h5dump = hdf5top_dir + "TOOLS.H5DUMP]" -$ hdf5tools_h5ls = hdf5top_dir + "TOOLS.H5LS]" -$ hdf5tools_h5repack = hdf5top_dir + "TOOLS.H5REPACK]" -$ hdf5tools_h5jam = hdf5top_dir + "TOOLS.H5JAM]" -$ hdf5tools_h5import = hdf5top_dir + "TOOLS.H5IMPORT]" -$ hdf5tools_h5stat = hdf5top_dir + "TOOLS.H5STAT]" -$ hdf5tools_h5misc = hdf5top_dir + "TOOLS.H5MISC]" -$ hdf5fortran_examples = hdf5top_dir + "FORTRAN.EXAMPLES]" -$ hdf5fortran_src = hdf5top_dir + "FORTRAN.SRC]" -$ hdf5cxx_src = hdf5top_dir + "C__.SRC]" -$ hdf5cxx_examples = hdf5top_dir + "C__.EXAMPLES]" -$! -$ hdf5install = hdf5top_dir + "HDF5]" -$ hdf5install_include = hdf5top_dir + "HDF5.INCLUDE]" -$ hdf5install_examples = hdf5top_dir + "HDF5.EXAMPLES]" -$ hdf5install_examples_c = hdf5top_dir + "HDF5.EXAMPLES.C]" -$ hdf5install_examples_f90 = hdf5top_dir + "HDF5.EXAMPLES.F90]" -$ hdf5install_examples_cxx = hdf5top_dir + "HDF5.EXAMPLES.CXX]" -$ hdf5install_lib = hdf5top_dir + "HDF5.LIB]" -$ hdf5install_bin = hdf5top_dir + "HDF5.BIN]" -$ -$ if F$SEARCH(hdf5install) .NES. "" -$ then write sys$output "''hdf5install' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install'..." -$ create/dir 'hdf5install' -$ endif -$ -$ if F$SEARCH(hdf5install_include) .NES. "" -$ then write sys$output "''hdf5install_include' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_include'..." -$ create/dir 'hdf5install_include' -$ endif -$ if F$SEARCH(hdf5install_lib) .NES. "" -$ then write sys$output "''hdf5install_lib' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_lib'..." -$ create/dir 'hdf5install_lib' -$ endif -$ if F$SEARCH(hdf5install_bin) .NES. "" -$ then write sys$output "''hdf5install_bin' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_bin'..." -$ create/dir 'hdf5install_bin' -$ endif -$ if F$SEARCH(hdf5install_examples) .NES. "" -$ then write sys$output "''hdf5install_examples' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_examples'..." -$ create/dir 'hdf5install_examples' -$ endif -$ if F$SEARCH(hdf5install_examples_c) .NES. "" -$ then write sys$output "''hdf5install_examples_c' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_examples_c'..." -$ create/dir 'hdf5install_examples_c' -$ endif -$ if F$SEARCH(hdf5install_examples_f90) .NES. "" -$ then write sys$output "''hdf5install_examples_f90' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_examples_f90'..." -$ create/dir 'hdf5install_examples_f90' -$ endif -$ if F$SEARCH(hdf5install_examples_cxx) .NES. "" -$ then write sys$output "''hdf5install_examples_cxx' directory exists, will not create" -$ else -$ write sys$output "Creating ''hdf5install_examples_cxx'..." -$ create/dir 'hdf5install_examples_cxx' -$ endif - -$! -$ write sys$output "Installing C library and header files" -$ set def 'hdf5src' -$ copy HDF5.olb 'hdf5install_lib' -$ copy *.h 'hdf5install_include' -$ del 'hdf5install_include'*private*.*;* -$! -$ write sys$output "Installing Fortran library module files" -$ set def 'hdf5fortran_src' -$ copy HDF5_FORTRAN.olb 'hdf5install_lib' -$ copy *.F90$MOD 'hdf5install_include' -$! -$ write sys$output "Installing C++ library and header files" -$ set def 'hdf5cxx_src' -$ copy HDF5_CPLUS.olb 'hdf5install_lib' -$ copy *.h 'hdf5install_include' -$! -$ write sys$output "Installing utilties" -$ set def 'hdf5tools_h5copy' -$ copy h5copy.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5diff' -$ copy h5diff.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5dump' -$ copy h5dump.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5repack' -$ copy h5repack.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5ls' -$ copy h5ls.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5jam' -$ copy h5jam.exe 'hdf5install_bin' -$ copy h5unjam.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5import' -$ copy h5import.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5stat' -$ copy h5stat.exe 'hdf5install_bin' -$! -$ set def 'hdf5tools_h5misc' -$ copy h5debug.exe 'hdf5install_bin' -$ copy h5mkgrp.exe 'hdf5install_bin' -$! -$ write sys$output "Installing examples" -$ set def 'hdf5examples' -$ copy *.c 'hdf5install_examples_c' -$! -$ set def 'hdf5fortran_examples' -$ copy *.f90 'hdf5install_examples_f90' -$! -$ set def 'hdf5cxx_examples' -$ copy *.cpp 'hdf5install_examples_cxx' -$ rename 'hdf5install_examples_cxx'*.cpp 'hdf5install_examples_cxx'*.cxx -$ -$ -$! -$ set def 'hdf5top' -$ copy [.examples]*.com 'hdf5install_examples_c' -$ copy [.fortran.examples]*.com 'hdf5install_examples_f90' -$ copy [.c__.examples]*.com 'hdf5install_examples_cxx' -$ exit diff --git a/vms/make.com b/vms/make.com deleted file mode 100644 index 4be8784..0000000 --- a/vms/make.com +++ /dev/null @@ -1,145 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$! -$! This file copies all make files from the VMS directory to the -$! source directories and builds libraries, tests, and utilties -$! -$ copy [.c__.src]make.com [-.c__.src] -$ copy [.c__.test]*.com [-.c__.test] -$ copy [.fortran.src]make.com [-.fortran.src] -$ copy [.fortran.test]*.com [-.fortran.test] -$ copy [.src]make.com [-.src] -$ copy [.src]h5pubconf.h [-.src] -$ copy [.test]*.com [-.test] -$ copy [.tools.h5copy]*.com [-.tools.h5copy] -$ copy [.tools.h5dump]*.com [-.tools.h5dump] -$ copy [.tools.h5ls]*.com [-.tools.h5ls] -$ copy [.tools.h5diff]*.com [-.tools.h5diff] -$ copy [.tools.h5repack]*.com [-.tools.h5repack] -$ copy [.tools.h5import]*.com [-.tools.h5import] -$ copy [.tools.h5jam]*.com [-.tools.h5jam] -$ copy [.tools.h5stat]*.com [-.tools.h5stat] -$ copy [.tools.lib]make.com [-.tools.lib] -$ copy [.tools.testfiles]*.ddl [-.tools.testfiles] -$ copy [.tools.misc]make.com [-.tools.misc] -$! -$! Define location of ZLIB library. If you do not have it on your system, download -$! source code from http://www.zlib.net/, build and install on your system -$ define zlib_dir disk$user:[hdfgroup.zlib-1_2_5_ieee] -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3-ieee] -$! -$! Set up compilation flags here -$! Do not remove define=H5_VMS and standard=strict_ansi qualifiers. -$! -$ ccopt == "/float=ieee_float/define=(_LARGEFILE,H5_VMS)/debug/nooptimize/include=zlib_dir" -$ fcopt == "/float=ieee_float/define=(_LARGEFILE,H5_VMS)/debug/nooptimize/include=zlib_dir" -$ cxxopt == "/float=ieee_float/define=(_LARGEFILE,H5_VMS)/debug/nooptimize/"+- - "standard=strict_ansi/include=zlib_dir" -$! -$! -$ hdf5top = F$DIRECTORY() -$ len = F$LENGTH(hdf5top) -$ hdf5top_dir = F$EXTRACT(0, len-4, hdf5top) -$! -$ hdf5src = hdf5top_dir + "SRC]" -$ hdf5test = hdf5top_dir + "TEST]" -$ hdf5examples = hdf5top_dir + "EXAMPLES]" -$ hdf5tools_lib = hdf5top_dir + "TOOLS.LIB]" -$ hdf5tools_h5copy = hdf5top_dir + "TOOLS.H5COPY]" -$ hdf5tools_h5diff = hdf5top_dir + "TOOLS.H5DIFF]" -$ hdf5tools_h5dump = hdf5top_dir + "TOOLS.H5DUMP]" -$ hdf5tools_h5import = hdf5top_dir + "TOOLS.H5IMPORT]" -$ hdf5tools_h5jam = hdf5top_dir + "TOOLS.H5JAM]" -$ hdf5tools_h5ls = hdf5top_dir + "TOOLS.H5LS]" -$ hdf5tools_h5repack = hdf5top_dir + "TOOLS.H5REPACK]" -$ hdf5tools_h5stat = hdf5top_dir + "TOOLS.H5STAT]" -$ hdf5tools_misc = hdf5top_dir + "TOOLS.MISC]" -$ hdf5fortran_examples = hdf5top_dir + "FORTRAN.EXAMPLES]" -$ hdf5fortran_src = hdf5top_dir + "FORTRAN.SRC]" -$ hdf5fortran_test = hdf5top_dir + "FORTRAN.TEST]" -$ hdf5cxx_src = hdf5top_dir + "C__.SRC]" -$ hdf5cxx_test = hdf5top_dir + "C__.TEST]" -$ hdf5cxx_examples = hdf5top_dir + "C__.EXAMPLES]" -$! -$ write sys$output "Building C library" -$ set def 'hdf5src' -$ @make.com -$! -$! -$ write sys$output "Building C library tests" -$ set def 'hdf5test' -$ @make.com -$! -$ write sys$output "Building tools library" -$ set def 'hdf5tools_lib' -$ @make.com -$! -$ write sys$output "Building h5copy" -$ set def 'hdf5tools_h5copy' -$ @make.com -$! -$ write sys$output "Building h5diff" -$ set def 'hdf5tools_h5diff' -$ @make.com -$! -$ write sys$output "Building h5dump" -$ set def 'hdf5tools_h5dump' -$ @make.com -$! -$ write sys$output "Building h5import" -$ set def 'hdf5tools_h5import' -$ @make.com -$! -$ write sys$output "Building h5jam" -$ set def 'hdf5tools_h5jam' -$ @make.com -$! -$ write sys$output "Building h5ls" -$ set def 'hdf5tools_h5ls' -$ @make.com -$! -$ write sys$output "Building h5repack" -$ set def 'hdf5tools_h5repack' -$ @make.com -$! -$ write sys$output "Building h5stat" -$ set def 'hdf5tools_h5stat' -$ @make.com -$! -$ write sys$output "Building misc" -$ set def 'hdf5tools_misc' -$ @make.com -$! -$ write sys$output "Building Fortran library" -$ set def 'hdf5fortran_src' -$ @make.com -$! -$ write sys$output "Building Fortran library tests" -$ set def 'hdf5fortran_test' -$ @make.com -$! -$ write sys$output "Building C++ library" -$ set def 'hdf5cxx_src' -$ copy *.cpp *.cxx -$ @make.com -$! -$ write sys$output "Building C++ library tests" -$ set def 'hdf5cxx_test' -$ copy *.cpp *.cxx -$ @make.com -$! -$ set def 'hdf5top' -$ exit diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h deleted file mode 100644 index bb1eb8b..0000000 --- a/vms/src/h5pubconf.h +++ /dev/null @@ -1,719 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* src/H5config.h. Generated from H5config.h.in by configure. */ -/* src/H5config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if building universal (internal helper macro) */ -/* #undef H5_AC_APPLE_UNIVERSAL_BUILD */ - -/* Define if your system generates wrong code for log2 routine. */ -/* #undef H5_BAD_LOG2_CODE_GENERATED */ - -/* Define if the memory buffers being written to disk should be cleared before - writing. */ -#define H5_CLEAR_MEMORY 1 - -/* Define if your system can handle converting denormalized floating-point - values. */ -#define H5_CONVERT_DENORMAL_FLOAT 1 - -/* Define if C++ compiler recognizes offsetof */ -#define H5_CXX_HAVE_OFFSETOF 1 - -/* Define the default virtual file driver to compile */ -#define H5_DEFAULT_VFD H5FD_SEC2 - -/* Define if `dev_t' is a scalar */ -#define H5_DEV_T_IS_SCALAR 1 - -/* Define to dummy `main' function (if any) required to link to the Fortran - libraries. */ -/* #undef H5_FC_DUMMY_MAIN */ - -/* Define if F77 and FC dummy `main' functions are identical. */ -/* #undef H5_FC_DUMMY_MAIN_EQ_F77 */ - -/* Define to a macro mangling the given C identifier (in lower and upper - case), which must not contain underscores, for linking with Fortran. */ -/* #undef H5_FC_FUNC */ - -/* As FC_FUNC, but for C identifiers containing underscores. */ -/* #undef H5_FC_FUNC_ */ - -/* Define if your system can handle overflow converting floating-point to - integer values. */ -#define H5_FP_TO_INTEGER_OVERFLOW_WORKS 1 - -/* Define if your system roundup accurately converting floating-point to - unsigned long long values. */ -#define H5_FP_TO_ULLONG_ACCURATE 1 - -/* Define if your system has right maximum convert floating-point to unsigned - long long values. */ -#define H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1 - -/* Define if gettimeofday() populates the tz pointer passed in */ -/* #undef H5_GETTIMEOFDAY_GIVES_TZ */ - -/* Define to 1 if you have the `alarm' function. */ -#define H5_HAVE_ALARM 1 - -/* Define if the __attribute__(()) extension is present */ -/* #undef H5_HAVE_ATTRIBUTE */ - -/* Define to 1 if you have the `BSDgettimeofday' function. */ -/* #undef H5_HAVE_BSDGETTIMEOFDAY */ - -/* Define if the compiler understands C99 designated initialization of structs - and unions */ -#define H5_HAVE_C99_DESIGNATED_INITIALIZER 1 - -/* Define if the compiler understands the __func__ keyword */ -#define H5_HAVE_C99_FUNC 1 - -/* Define to 1 if you have the `clock_gettime' function. */ -#define H5_HAVE_CLOCK_GETTIME 1 - -/* Define if the function stack tracing code is to be compiled in */ -/* #undef H5_HAVE_CODESTACK */ - -/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. - */ -/* #undef H5_HAVE_DECL_TZNAME */ - -/* Define to 1 if you have the `difftime' function. */ -#define H5_HAVE_DIFFTIME 1 - -/* Define if the direct I/O virtual file driver should be compiled */ -/* #undef H5_HAVE_DIRECT */ - -/* Define to 1 if you have the <dirent.h> header file. */ -#define H5_HAVE_DIRENT_H 1 - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#define H5_HAVE_DLFCN_H 1 - -/* Define to 1 if you have the <dmalloc.h> header file. */ -/* #undef H5_HAVE_DMALLOC_H */ - -/* Define if library information should be embedded in the executables */ -/* #undef H5_HAVE_EMBEDDED_LIBINFO */ - -/* Define to 1 if you have the <features.h> header file. */ -/* #undef H5_HAVE_FEATURES_H */ - -/* Define if support for deflate (zlib) filter is enabled */ -#define H5_HAVE_FILTER_DEFLATE 1 - -/* Define if support for Fletcher32 checksum is enabled */ -#define H5_HAVE_FILTER_FLETCHER32 1 - -/* Define if support for nbit filter is enabled */ -#define H5_HAVE_FILTER_NBIT 1 - -/* Define if support for scaleoffset filter is enabled */ -#define H5_HAVE_FILTER_SCALEOFFSET 1 - -/* Define if support for shuffle filter is enabled */ -#define H5_HAVE_FILTER_SHUFFLE 1 - -/* Define if support for szip filter is enabled */ -/* #undef H5_HAVE_FILTER_SZIP */ - -/* Define to 1 if you have the `fork' function. */ -/* #undef H5_HAVE_FORK */ - -/* Define to 1 if you have the `frexpf' function. */ -#define H5_HAVE_FREXPF 1 - -/* Define to 1 if you have the `frexpl' function. */ -#define H5_HAVE_FREXPL 1 - -/* Define to 1 if you have the `fseeko' function. */ -#define H5_HAVE_FSEEKO 1 - -/* Define to 1 if you have the `fseek64' function. */ -/* #undef H5_HAVE_FSEEKO64 */ - -/* Define to 1 if you have the `fstat64' function. */ -/* #undef H5_HAVE_FSTAT64 */ - -/* Define to 1 if you have the `ftello' function. */ -#define H5_HAVE_FTELLO 1 - -/* Define to 1 if you have the `ftruncate64' function. */ -/* #undef H5_HAVE_FTRUNCATE64 */ - -/* Define if the compiler understands the __FUNCTION__ keyword */ -/* #undef H5_HAVE_FUNCTION */ - -/* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */ -/* #undef H5_HAVE_GETCONSOLESCREENBUFFERINFO */ - -/* Define to 1 if you have the `gethostname' function. */ -#define H5_HAVE_GETHOSTNAME 1 - -/* Define to 1 if you have the `getpwuid' function. */ -/* #undef H5_HAVE_GETPWUID */ - -/* Define to 1 if you have the `getrusage' function. */ -/* #undef H5_HAVE_GETRUSAGE */ - -/* Define to 1 if you have the `gettextinfo' function. */ -/* #undef H5_HAVE_GETTEXTINFO */ - -/* Define to 1 if you have the `gettimeofday' function. */ -#define H5_HAVE_GETTIMEOFDAY 1 - -/* Define to 1 if you have the `get_fpc_csr' function. */ -/* #undef H5_HAVE_GET_FPC_CSR */ - -/* Define if library will contain instrumentation to detect correct - optimization operation */ -#define H5_HAVE_INSTRUMENTED_LIBRARY 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define H5_HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `ioctl' function. */ -#define H5_HAVE_IOCTL 1 - -/* Define to 1 if you have the <io.h> header file. */ -/* #undef H5_HAVE_IO_H */ - -/* Define to 1 if you have the `dl' library (-ldl). */ -#define H5_HAVE_LIBDL 1 - -/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ -/* #undef H5_HAVE_LIBDMALLOC */ - -/* Define to 1 if you have the `lmpe' library (-llmpe). */ -/* #undef H5_HAVE_LIBLMPE */ - -/* Define to 1 if you have the `m' library (-lm). */ -#define H5_HAVE_LIBM 1 - -/* Define to 1 if you have the `mpe' library (-lmpe). */ -/* #undef H5_HAVE_LIBMPE */ - -/* Define to 1 if you have the `mpi' library (-lmpi). */ -/* #undef H5_HAVE_LIBMPI */ - -/* Define to 1 if you have the `mpich' library (-lmpich). */ -/* #undef H5_HAVE_LIBMPICH */ - -/* Define to 1 if you have the `mpio' library (-lmpio). */ -/* #undef H5_HAVE_LIBMPIO */ - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef H5_HAVE_LIBNSL */ - -/* Define to 1 if you have the `pthread' library (-lpthread). */ -/* #undef H5_HAVE_LIBPTHREAD */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef H5_HAVE_LIBSOCKET */ - -/* Define to 1 if you have the `sz' library (-lsz). */ -/* #undef H5_HAVE_LIBSZ */ - -/* Define to 1 if you have the `z' library (-lz). */ -/* #undef H5_HAVE_LIBZ */ - -/* Define to 1 if you have the `longjmp' function. */ -#define H5_HAVE_LONGJMP 1 - -/* Define to 1 if you have the `lseek64' function. */ -/* #undef H5_HAVE_LSEEK64 */ - -/* Define to 1 if you have the `lstat' function. */ -/* #undef H5_HAVE_LSTAT */ - -/* Define to 1 if you have the <mach/mach_time.h> header file. */ -/* #undef H5_HAVE_MACH_MACH_TIME_H */ - -/* Define to 1 if you have the <memory.h> header file. */ -/* #undef H5_HAVE_MEMORY_H */ - -/* Define if we have MPE support */ -/* #undef H5_HAVE_MPE */ - -/* Define to 1 if you have the <mpe.h> header file. */ -/* #undef H5_HAVE_MPE_H */ - -/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */ -/* #undef H5_HAVE_MPI_MULTI_LANG_Comm */ - -/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */ -/* #undef H5_HAVE_MPI_MULTI_LANG_Info */ - -/* Define if we have parallel support */ -/* #undef H5_HAVE_PARALLEL */ - -/* Define to 1 if you have the <pthread.h> header file. */ -/* #undef H5_HAVE_PTHREAD_H */ - -/* Define to 1 if you have the `random' function. */ -#define H5_HAVE_RANDOM 1 - -/* Define to 1 if you have the `rand_r' function. */ -/* #define H5_HAVE_RAND_R 1 */ - -/* Define to 1 if you have the `setjmp' function. */ -#define H5_HAVE_SETJMP 1 - -/* Define to 1 if you have the <setjmp.h> header file. */ -#define H5_HAVE_SETJMP_H 1 - -/* Define to 1 if you have the `setsysinfo' function. */ -/* #undef H5_HAVE_SETSYSINFO */ - -/* Define to 1 if you have the `siglongjmp' function. */ -#define H5_HAVE_SIGLONGJMP 1 - -/* Define to 1 if you have the `signal' function. */ -#define H5_HAVE_SIGNAL 1 - -/* Define to 1 if you have the `sigprocmask' function. */ -/* #undef H5_HAVE_SIGPROCMASK */ - -/* Define to 1 if you have the `sigsetjmp' function. */ -/* #undef H5_HAVE_SIGSETJMP */ - -/* Define to 1 if you have the `snprintf' function. */ -#define H5_HAVE_SNPRINTF 1 - -/* Define to 1 if you have the `srandom' function. */ -#define H5_HAVE_SRANDOM 1 - -/* Define to 1 if you have the `stat64' function. */ -/* #undef H5_HAVE_STAT64 */ - -/* Define if `struct stat' has the `st_blocks' field */ -/* #undef H5_HAVE_STAT_ST_BLOCKS */ - -/* Define to 1 if you have the <stddef.h> header file. */ -#define H5_HAVE_STDDEF_H 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -/* #undef H5_HAVE_STDINT_H */ - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define H5_HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strdup' function. */ -#define H5_HAVE_STRDUP 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define H5_HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define H5_HAVE_STRING_H 1 - -/* Define if `struct text_info' is defined */ -/* #undef H5_HAVE_STRUCT_TEXT_INFO */ - -/* Define if `struct timezone' is defined */ -/* #undef H5_HAVE_STRUCT_TIMEZONE */ - -/* Define to 1 if `tm_zone' is member of `struct tm'. */ -#define H5_HAVE_STRUCT_TM_TM_ZONE 1 - -/* Define if `struct videoconfig' is defined */ -/* #undef H5_HAVE_STRUCT_VIDEOCONFIG */ - -/* Define to 1 if you have the `symlink' function. */ -/* #undef H5_HAVE_SYMLINK */ - -/* Define to 1 if you have the `system' function. */ -#define H5_HAVE_SYSTEM 1 - -/* Define to 1 if you have the <sys/fpu.h> header file. */ -/* #undef H5_HAVE_SYS_FPU_H */ - -/* Define to 1 if you have the <sys/ioctl.h> header file. */ -#define H5_HAVE_SYS_IOCTL_H 1 - -/* Define to 1 if you have the <sys/proc.h> header file. */ -/* #undef H5_HAVE_SYS_PROC_H */ - -/* Define to 1 if you have the <sys/resource.h> header file. */ -#define H5_HAVE_SYS_RESOURCE_H 1 - -/* Define to 1 if you have the <sys/socket.h> header file. */ -#define H5_HAVE_SYS_SOCKET_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define H5_HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/sysinfo.h> header file. */ -/* #undef H5_HAVE_SYS_SYSINFO_H */ - -/* Define to 1 if you have the <sys/timeb.h> header file. */ -#define H5_HAVE_SYS_TIMEB_H 1 - -/* Define to 1 if you have the <sys/time.h> header file. */ -#define H5_HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define H5_HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <szlib.h> header file. */ -/* #undef H5_HAVE_SZLIB_H */ - -/* Define if we have thread safe support */ -/* #undef H5_HAVE_THREADSAFE */ - -/* Define if `timezone' is a global variable */ -#define H5_HAVE_TIMEZONE 1 - -/* Define if the ioctl TIOCGETD is defined */ -#define H5_HAVE_TIOCGETD 1 - -/* Define if the ioctl TIOGWINSZ is defined */ -#define H5_HAVE_TIOCGWINSZ 1 - -/* Define to 1 if you have the `tmpfile' function. */ -#define H5_HAVE_TMPFILE 1 - -/* Define if `tm_gmtoff' is a member of `struct tm' */ -/* #undef H5_HAVE_TM_GMTOFF */ - -/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use - `HAVE_STRUCT_TM_TM_ZONE' instead. */ -#define H5_HAVE_TM_ZONE 1 - -/* Define to 1 if you don't have `tm_zone' but do have the external array - `tzname'. */ -/* #undef H5_HAVE_TZNAME */ - -/* Define to 1 if you have the <unistd.h> header file. */ -#define H5_HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `asprintf' function. */ -/* #undef H5_HAVE_ASPRINTF */ - -/* Define to 1 if you have the `vasprintf' function. */ -/* #undef H5_HAVE_VASPRINTF */ - -/* Define to 1 if you have the `vsnprintf' function. */ -#define H5_HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `waitpid' function. */ -#define H5_HAVE_WAITPID 1 - -/* Define if your system has OpenVMS path name. This macro is added by hand. */ -#define H5_HAVE_VMS_PATH 1 - -/* Define if your system has window style path name. */ -/* #undef H5_HAVE_WINDOW_PATH */ - -/* Define to 1 if you have the <winsock.h> header file. */ -/* #undef H5_HAVE_WINSOCK2_H */ - -/* Define to 1 if you have the <zlib.h> header file. */ -#define H5_HAVE_ZLIB_H 1 - -/* Define to 1 if you have the `_getvideoconfig' function. */ -/* #undef H5_HAVE__GETVIDEOCONFIG */ - -/* Define to 1 if you have the `_scrsize' function. */ -/* #undef H5_HAVE__SCRSIZE */ - -/* Define if `__tm_gmtoff' is a member of `struct tm' */ -/* #undef H5_HAVE___TM_GMTOFF */ - -/* Define if your system can't handle converting floating-point values to long - long. */ -/* #undef H5_HW_FP_TO_LLONG_NOT_WORKS */ - -/* Define if HDF5's high-level library headers should be included in hdf5.h */ -#define H5_INCLUDE_HL 1 - -/* Define if your system can accurately convert from integers to long double - values. */ -#define H5_INTEGER_TO_LDOUBLE_ACCURATE 1 - -/* Define if your system can convert long double to integers accurately. */ -#define H5_LDOUBLE_TO_INTEGER_ACCURATE 1 - -/* Define if your system can convert from long double to integer values. */ -#define H5_LDOUBLE_TO_INTEGER_WORKS 1 - -/* Define if your system can convert long double to (unsigned) long long - values correctly. */ -#define H5_LDOUBLE_TO_LLONG_ACCURATE 1 - -/* Define if your system converts long double to (unsigned) long values with - special algorithm. */ -/* #undef H5_LDOUBLE_TO_LONG_SPECIAL */ - -/* Define if your system can convert long double to unsigned int values - correctly. */ -#define H5_LDOUBLE_TO_UINT_ACCURATE 1 - -/* Define if your system can compile long long to floating-point casts. */ -#define H5_LLONG_TO_FP_CAST_WORKS 1 - -/* Define if your system can convert (unsigned) long long to long double - values correctly. */ -#define H5_LLONG_TO_LDOUBLE_CORRECT 1 - -/* Define if your system can convert (unsigned) long to long double values - with special algorithm. */ -/* #undef H5_LONG_TO_LDOUBLE_SPECIAL */ - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define H5_LT_OBJDIR ".libs/" - -/* Define if the metadata trace file code is to be compiled in */ -/* #undef H5_METADATA_TRACE_FILE */ - -/* Define if we can violate pointer alignment restrictions */ -#define H5_NO_ALIGNMENT_RESTRICTIONS 1 - -/* Define if deprecated public API symbols are disabled */ -/* #undef H5_NO_DEPRECATED_SYMBOLS */ - -/* Define if shared writing must be disabled (CodeWarrior only) */ -#define H5_NO_SHARED_WRITING 1 - -/* Name of package */ -#define H5_PACKAGE "hdf5" - -/* Define to the address where bug reports for this package should be sent. */ -#define H5_PACKAGE_BUGREPORT "help@hdfgroup.org" - -/* Define to the full name of this package. */ -#define H5_PACKAGE_NAME "HDF5" - -/* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.9.215-swmr0" - -/* Define to the one symbol short name of this package. */ -#define H5_PACKAGE_TARNAME "hdf5" - -/* Define to the home page for this package. */ -#define H5_PACKAGE_URL "" - -/* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "1.9.215-swmr0" - -/* Width for printf() for type `long long' or `__int64', use `ll' */ -#define H5_PRINTF_LL_WIDTH "ll" - -/* The size of `char', as computed by sizeof. */ -#define H5_SIZEOF_CHAR 1 - -/* The size of `double', as computed by sizeof. */ -#define H5_SIZEOF_DOUBLE 8 - -/* The size of `float', as computed by sizeof. */ -#define H5_SIZEOF_FLOAT 4 - -/* The size of `int', as computed by sizeof. */ -#define H5_SIZEOF_INT 4 - -/* The size of `int16_t', as computed by sizeof. */ -#define H5_SIZEOF_INT16_T 2 - -/* The size of `int32_t', as computed by sizeof. */ -#define H5_SIZEOF_INT32_T 4 - -/* The size of `int64_t', as computed by sizeof. */ -#define H5_SIZEOF_INT64_T 8 - -/* The size of `int8_t', as computed by sizeof. */ -#define H5_SIZEOF_INT8_T 1 - -/* The size of `int_fast16_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_FAST16_T 0 */ - -/* The size of `int_fast32_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_FAST32_T 0 */ - -/* The size of `int_fast64_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_FAST64_T 0 */ - -/* The size of `int_fast8_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_FAST8_T 0 */ - -/* The size of `int_least16_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_LEAST16_T 0 */ - -/* The size of `int_least32_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_LEAST32_T 0 */ - -/* The size of `int_least64_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_LEAST64_T 0 */ - -/* The size of `int_least8_t', as computed by sizeof. */ -/* #define H5_SIZEOF_INT_LEAST8_T 0 */ - -/* The size of `long', as computed by sizeof. */ -#define H5_SIZEOF_LONG 4 - -/* The size of `long double', as computed by sizeof. */ -#define H5_SIZEOF_LONG_DOUBLE 16 - -/* The size of `long long', as computed by sizeof. */ -#define H5_SIZEOF_LONG_LONG 8 - -/* The size of `off64_t', as computed by sizeof. */ -#define H5_SIZEOF_OFF64_T 0 - -/* The size of `off_t', as computed by sizeof. */ -#define H5_SIZEOF_OFF_T 8 - -/* The size of `ptrdiff_t', as computed by sizeof. */ -#define H5_SIZEOF_PTRDIFF_T 4 - -/* The size of `short', as computed by sizeof. */ -#define H5_SIZEOF_SHORT 2 - -/* The size of `size_t', as computed by sizeof. */ -#define H5_SIZEOF_SIZE_T 4 - -/* The size of `ssize_t', as computed by sizeof. */ -#define H5_SIZEOF_SSIZE_T 4 - -/* The size of `uint16_t', as computed by sizeof. */ -#define H5_SIZEOF_UINT16_T 2 - -/* The size of `uint32_t', as computed by sizeof. */ -#define H5_SIZEOF_UINT32_T 4 - -/* The size of `uint64_t', as computed by sizeof. */ -#define H5_SIZEOF_UINT64_T 8 - -/* The size of `uint8_t', as computed by sizeof. */ -#define H5_SIZEOF_UINT8_T 1 - -/* The size of `uint_fast16_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_FAST16_T 0 */ - -/* The size of `uint_fast32_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_FAST32_T 0 */ - -/* The size of `uint_fast64_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_FAST64_T 0 */ - -/* The size of `uint_fast8_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_FAST8_T 0 */ - -/* The size of `uint_least16_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_LEAST16_T 0 */ - -/* The size of `uint_least32_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_LEAST32_T 0 */ - -/* The size of `uint_least64_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_LEAST64_T 0 */ - -/* The size of `uint_least8_t', as computed by sizeof. */ -/* #define H5_SIZEOF_UINT_LEAST8_T 0 */ - -/* The size of `unsigned', as computed by sizeof. */ -#define H5_SIZEOF_UNSIGNED 4 - -/* The size of `__int64', as computed by sizeof. */ -#define H5_SIZEOF___INT64 0 - -/* Define to 1 if you have the ANSI C header files. */ -#define H5_STDC_HEADERS 1 - -/* Define if strict file format checks are enabled */ -/* #undef H5_STRICT_FORMAT_CHECKS */ - -/* Define if your system supports pthread_attr_setscope(&attribute, - PTHREAD_SCOPE_SYSTEM) call. */ -#define H5_SYSTEM_SCOPE_THREADS 1 - -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -#define H5_TIME_WITH_SYS_TIME 1 - -/* Define to 1 if your <sys/time.h> declares `struct tm'. */ -/* #undef H5_TM_IN_SYS_TIME */ - -/* Define if your system can compile unsigned long long to floating-point - casts. */ -#define H5_ULLONG_TO_FP_CAST_WORKS 1 - -/* Define if your system can convert unsigned long long to long double with - correct precision. */ -#define H5_ULLONG_TO_LDOUBLE_PRECISION 1 - -/* Define if your system accurately converting unsigned long to float values. - */ -/* #undef H5_ULONG_TO_FLOAT_ACCURATE */ - -/* Define if your system can accurately convert unsigned (long) long values to - floating-point values. */ -#define H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1 - -/* Define using v1.6 public API symbols by default */ -/* #define H5_USE_16_API_DEFAULT 1 */ - -/* Define if a memory checking tool will be used on the library, to cause - library to be very picky about memory operations and also disable the - internal free list manager code. */ -/* #undef H5_USING_MEMCHECKER */ - -/* Version number of package */ -#define H5_VERSION "1.9.215-swmr0" - -/* Define if vsnprintf() returns the correct value for formatted strings that - don't fit into size allowed */ -#define H5_VSNPRINTF_WORKS 1 - -/* Data accuracy is prefered to speed during data conversions */ -#define H5_WANT_DATA_ACCURACY 1 - -/* Check exception handling functions during data conversions */ -#define H5_WANT_DCONV_EXCEPTION 1 - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef H5_WORDS_BIGENDIAN */ - -/* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef H5__FILE_OFFSET_BITS */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef H5__LARGE_FILES */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef H5_const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef H5_inline */ -#endif - -/* Define to `long int' if <sys/types.h> does not define. */ -/* #undef H5_off_t */ - -/* Define to `long' if <sys/types.h> does not define. */ -/* #undef H5_ptrdiff_t */ - -/* Define to `unsigned long' if <sys/types.h> does not define. */ -/* #undef H5_size_t */ - -/* Define to `long' if <sys/types.h> does not define. */ -/* #undef H5_ssize_t */ -#define H5_HAVE_FILE_VERSIONS 1 -#define H5_CANNOT_OPEN_TWICE 1 diff --git a/vms/src/make.com b/vms/src/make.com deleted file mode 100644 index 397d543..0000000 --- a/vms/src/make.com +++ /dev/null @@ -1,76 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 library -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=(_LARGEFILE,H5_VMS)/include=zlib_dir" -$ ccc := cc 'ccopt -$ ccc h5detect.c -$ link h5detect -$ type sys$input - Running h5detect to create h5tinit.c -$ define/user_mode sys$output h5tinit.c -$ run h5detect -$! -$ ccc h5make_libsettings.c -$ link h5make_libsettings -$ type sys$input - Running h5make_libsettings to create H5lib_settings.h -$ define/user_mode sys$output H5lib_settings.h -$ run h5make_libsettings -$! -$ type sys$input - Creating HDF5 library -$! -$ cobj= "H5, H5checksum, H5dbg, H5system, H5timer, H5trace,"+- - "H5Abtree2, H5A, H5AC, H5Adense, H5Adeprec, H5Aint, H5Atest, H5B2, H5B2cache,"+- - "H5B2dbg, H5B2hdr, H5B2int, H5B2stat, H5B2test, H5B, H5Bcache, H5Bdbg, H5C, H5CS,"+- - "H5Dbtree, H5D, H5Dchunk, H5Dcompact, H5Dcontig, H5Ddbg, H5Ddeprec,"+- - "H5Defl, H5Dfill, H5Dint, H5Dio, H5Dlayout, H5Dmpio, H5Doh, H5Dscatgath, H5Dselect, H5Dtest,"+- - "H5EA, H5EAcache, H5EAdbg, H5EAdblkpage, H5EAdblock, H5EAhdr, H5EAiblock, H5EAint,"+- - "H5EAsblock, H5EAstat, H5EAtest, H5E, H5Edeprec, H5Eint,"+- - "H5FA, H5FAcache, H5FAdbg, H5FAdblkpage, H5FAdblock, H5FAhdr, H5FAstat, H5FAtest,"+- - "H5Faccum, H5F, H5Fcwfs, H5Fdbg, H5Fdeprec, H5FD, H5FDcore, H5FDdirect, H5FDfamily, H5FDint, H5FDlog, "+- - "H5FDmpi, H5FDmpio, H5FDmulti, H5FDsec2, H5FDspace, H5FDstdio, H5FDwindows,"+- - "H5Fefc, H5Ffake, H5Fio, H5FL, H5Fmount, H5Fmpi, H5FO, H5Fquery, H5FS, H5FScache, H5FSdbg,"+- - "H5Fsfile, H5FSsection, H5FSstat, H5FStest, H5Fsuper, H5Fsuper_cache, H5Ftest,"+- - "H5Gbtree2, H5G, H5Gcache, H5Gcompact, H5Gdense, H5Gdeprec, H5Gent, H5Gint, H5Glink, H5Gloc,"+- - "H5Gname, H5Gnode, H5Gobj, H5Goh, H5Groot, H5Gstab, H5Gtest, H5Gtraverse,"+- - "H5HFbtree2, H5HF, H5HFcache, H5HFdbg, H5HFdblock, H5HFdtable, H5HFhdr, H5HFhuge, H5HFiblock,"+- - "H5HFiter, H5HFman, H5HFsection, H5HFspace, H5HFstat, H5HFtest, H5HFtiny,"+- - "H5HG, H5HGcache, H5HGdbg, H5HGquery, H5HL, H5HLcache, H5HLdbg, H5HLint, H5HP, H5I, H5Itest, H5L, H5Lexternal" -$ cobj1= "H5MFaggr, H5MF, H5MFdbg, H5MFsection, H5MM,"+- - "H5MP, H5MPtest, H5Oainfo, H5Oalloc, H5Oattr, H5Oattribute, H5Obogus, H5Obtreek,"+- - "H5O, H5Ocache, H5Ochunk, H5Ocont, H5Ocopy, H5Odbg, H5Odrvinfo, H5Odtype, H5Oefl, H5Ofill, H5Ofsinfo,"+- - "H5Oginfo, H5Olayout, H5Olinfo, H5Olink, H5Omessage, H5Omtime, H5Oname, H5Onull, H5Opline,"+- - "H5Orefcount, H5Osdspace, H5Oshared, H5Oshmesg, H5Ostab, H5Otest, H5Ounknown,"+- - "H5Pacpl, H5P, H5Pdapl, H5Pdcpl, H5Pdeprec, H5Pdxpl, H5Pencdec, H5Pfapl, H5Pfcpl, H5Pfmpl, H5Pgcpl, H5Pint,"+- - "H5Plapl, H5Plcpl, H5Pocpl, H5Pocpypl, H5Pstrcpl, H5Ptest,"+- - "H5R, H5UC, H5Rdeprec, H5RS, H5Sall, H5S, H5Sdbg, H5Shyper, H5SL, H5SMbtree2, H5SM, H5SMcache,"+- - "H5SMmessage, H5Smpio, H5SMtest, H5Snone, H5Spoint, H5Sselect, H5ST, H5Stest,"+- - "H5Tarray, H5Tbit, H5T, H5Tcommit, H5Tcompound, H5Tconv, H5Tcset, H5Tdbg, H5Tdeprec, H5Tenum,"+- - "H5Tfields, H5Tfixed, H5Tfloat, H5Tinit, H5Tnative, H5Toffset, H5Toh, H5Topaque, H5Torder,"+- - "H5Tpad, H5Tprecis, H5TS, H5Tstrpad, H5Tvisit, H5Tvlen, H5V, H5WB, H5Z,"+- - "H5Zdeflate, H5Zfletcher32, H5Znbit, H5Zscaleoffset, H5Zshuffle, H5Zszip, H5Ztrans" -$! -$ ccc 'cobj -$ ccc 'cobj1 -$ library/create []hdf5 -$ library/insert []hdf5 'cobj -$ library/insert []hdf5 'cobj1 -$ type sys$input - Done -$! diff --git a/vms/test/H5srcdir_str.h b/vms/test/H5srcdir_str.h deleted file mode 100644 index 2eb1a39..0000000 --- a/vms/test/H5srcdir_str.h +++ /dev/null @@ -1,22 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* If you are reading this file and it has a '.h' suffix, it was automatically - * generated from the '.in' version. Make changes there. But for OpenVMS, this - * file is created by hand. - */ - -/* Set the 'srcdir' path from configure time */ -static const char *config_srcdir = "[-.test]"; diff --git a/vms/test/check.com b/vms/test/check.com deleted file mode 100644 index 5a3c945..0000000 --- a/vms/test/check.com +++ /dev/null @@ -1,271 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Run HDF5 C tests -$! -$ type sys$input - Running tests -$! define sys$output check_vms.out -$ -$ type sys$input -------- Running testhdf5 ------- -$ run testhdf5 -$ type sys$input - -$ type sys$input -------- Running accum ------- -$ run accum -$ type sys$input - -$ type sys$input -------- Running app_ref ------- -$ run app_ref -$ type sys$input - -$ type sys$input -------- Running big ------- -$ run big -$ type sys$input - -$ type sys$input -------- Running bittests ------- -$ run bittests -$ type sys$input - -$ type sys$input -------- Running btree2 ------- -$ run btree2 -$ type sys$input - -$ type sys$input -------- Running cache_api ------- -$ run cache_api -$ type sys$input - -$ type sys$input -------- Running cache ------- -$ run cache -$ type sys$input - -$ type sys$input -------- Running cache_tagging ------- -$ run cache_tagging -$ type sys$input - -$ type sys$input -------- Running chunk_info ------- -$ run chunk_info -$ type sys$input - -$ type sys$input -------- Running cmpd_dset ------- -$ run cmpd_dset -$ type sys$input - -$ type sys$input -------- Running cross_read ------- -$ run cross_read -$ type sys$input - -$ type sys$input -------- Running dangle ------- -$ run dangle -$ type sys$input - -$ type sys$input -------- Running dsets ------- -$ run dsets -$ type sys$input - -$ type sys$input -------- Running dt_arith ------- -$ run dt_arith -$ type sys$input - -$ type sys$input -------- Running dtransform ------- -$ run dtransform -$ type sys$input - -$ type sys$input -------- Running dtypes ------- -$ run dtypes -$ type sys$input - -$ type sys$input -------- Running earray ------- -$ run earray -$ type sys$input - -$! Skip this test for now because it opens the same file many times. -$! Please see Issue 7620 in Jira about it. -$! type sys$input -$! ------- Running efc ------- -$! run efc -$! type sys$input - -$ type sys$input -------- Running enum ------- -$ run enum -$ type sys$input - -$ type sys$input -------- Running extend ------- -$ run extend -$ type sys$input - -$ type sys$input -------- Running external ------- -$ run external -$ type sys$input - -$ type sys$input -------- Running fheap ------- -$ run fheap -$ type sys$input - -$ type sys$input -------- Running fillval ------- -$ run fillval -$ type sys$input - -$ type sys$input -------- Running filter_fail ------- -$ run filter_fail -$ type sys$input - -$ type sys$input -------- Running flush1 ------- -$ run flush1 -$ type sys$input - -$ type sys$input -------- Running flush2 ------- -$ run flush2 -$ type sys$input - -$ type sys$input -------- Running freespace ------- -$ run freespace -$ type sys$input - -$ type sys$input -------- Running getname ------- -$ run getname -$ type sys$input - -$ type sys$input -------- Running gheap ------- -$ run gheap -$ type sys$input - -$ type sys$input -------- Running hyperslab ------- -$ run hyperslab -$ type sys$input - -$ type sys$input -------- Running istore ------- -$ run istore -$ type sys$input - -$ type sys$input -------- Running lheap ------- -$ run lheap -$ type sys$input - -$ type sys$input -------- Running links ------- -$ run links -$ type sys$input - -$ type sys$input -------- Running links_env ------- -$ run links_env -$ type sys$input - -$ type sys$input -------- Running mf ------- -$ run mf -$ type sys$input - -$ type sys$input -------- Running mount ------- -$ run mount -$ type sys$input - -$ type sys$input -------- Running mtime ------- -$ run mtime -$ type sys$input - -$ type sys$input -------- Running ntypes ------- -$ run ntypes -$ type sys$input - -$ type sys$input -------- Running objcopy ------- -$ run objcopy -$ type sys$input - -$ type sys$input -------- Running ohdr ------- -$ run ohdr -$ type sys$input - -$ type sys$input -------- Running pool ------- -$ run pool -$ type sys$input - -$ type sys$input -------- Running reserved ------- -$ run reserved -$ type sys$input - -$ type sys$input -------- Running set_extent ------- -$ run set_extent -$ type sys$input - -$ type sys$input -------- Running space_overflow ------- -$ run space_overflow -$ type sys$input - -$ type sys$input -------- Running stab ------- -$ run stab -$ type sys$input - -$ type sys$input -------- Running testmeta ------- -$ run testmeta -$ type sys$input - -$ type sys$input -------- Running unlink ------- -$ run unlink -$ type sys$input - -$ type sys$input -------- Running vfd ------- -$ run vfd -$ type sys$input - -------- Testing completed ------- -$ exit diff --git a/vms/test/make.com b/vms/test/make.com deleted file mode 100644 index 22479c6..0000000 --- a/vms/test/make.com +++ /dev/null @@ -1,358 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 library tests -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=(_LARGEFILE,H5_VMS)/include=zlib_dir" -$! -$ ccc := cc 'ccopt /include=([-.src]) -$ type sys$input - Creating testhdf5 -$! -$ cobj= "h5test.c, testframe.c, testhdf5.c, tarray.c, tattr.c, tcheck_version., tchecksum.c,"+- - "tconfig.c, tcoords.c, tfile.c, tgenprop.c, th5o.c, th5s.c, theap.c, tid.c,"+- - "titerate.c, tmeta.c, tmisc.c, trefer.c, trefstr.c, tselect.c, tskiplist.c,"+- - "tsohm.c, ttime.c, ttst.c, tunicode.c, tvlstr.c, tvltypes.c, cache_common.c" -$! -$ ccc 'cobj -$ library/create/replace []libh5test h5test, testframe, cache_common -$ type sys$input - Creating libh5test -$ link testhdf5,tarray,tattr,tcheck_version,tchecksum,tconfig, - - tcoords,tfile,tgenprop,th5o,th5s,theap,tid,titerate, - - tmeta,tmisc,trefer,trefstr, - - tselect,tskiplist,tsohm,ttime,ttst,tunicode,tvlstr,tvltypes, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ -$! a new test -$ type sys$input - Creating accum test -$ ccc accum -$ link accum, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating app_ref test -$ ccc app_ref -$ link app_ref, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating big test -$ ccc big -$ link big, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating bittests test -$ ccc bittests -$ link bittests, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating btree2 test -$ ccc btree2 -$ link btree2, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating cache_api test -$ ccc cache_api -$ link cache_api, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating cache test -$ ccc cache -$ link cache, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating cache_common test -$ ccc cache_common -$ link cache_common, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$! a new test -$ type sys$input - Creating cache_tagging tests -$ ccc cache_tagging -$ link cache_tagging, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating chunk_info test -$ ccc chunk_info -$ link chunk_info, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating cmpd_dset test -$ ccc cmpd_dset -$ link cmpd_dset, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating cross_read test -$ ccc cross_read -$ link cross_read, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating dangle test -$ ccc dangle -$ link dangle, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating dsets tests -$ ccc dsets -$ link dsets, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating dt_arith test -$ ccc dt_arith -$ link dt_arith, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating dtransform test -$ ccc dtransform -$ link dtransform, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating dtypes test -$ ccc dtypes -$ link dtypes, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating earray test -$ ccc earray -$ link earray, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating efc test -$ ccc efc -$ link efc, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating enum test -$ ccc enum -$ link enum, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating err_compat test -$ ccc err_compat -$ link err_compat, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating error_test test -$ ccc error_test -$ link error_test, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating extend test -$ ccc extend -$ link extend, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating external test -$ ccc external -$ link external, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating fheap test -$ ccc fheap -$ link fheap, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating fillval test -$ ccc fillval -$ link fillval, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$! a new test -$ type sys$input - Creating filter_fail test -$ ccc filter_fail -$ link filter_fail, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating flush1 test -$ ccc flush1 -$ link flush1, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating flush2 test -$ ccc flush2 -$ link flush2, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating freespace test -$ ccc freespace -$ link freespace, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating getname test -$ ccc getname -$ link getname, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating gheap test -$ ccc gheap -$ link gheap, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating hyperslab test -$ ccc hyperslab -$ link hyperslab, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating istore test -$ ccc istore -$ link istore, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating lheap test -$ ccc lheap -$ link lheap, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating links test -$ ccc links -$ link links, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$! a new test -$ type sys$input - Creating links_env test -$ ccc links_env -$ link links_env, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating mf test -$ ccc mf -$ link mf, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating mount test -$ ccc mount -$ link mount, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating mtime test -$ ccc mtime -$ link mtime, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating ntypes test -$ ccc ntypes -$ link ntypes, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating objcopy test -$ ccc objcopy -$ link objcopy, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating ohdr test -$ ccc ohdr -$ link ohdr, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating pool test -$ ccc pool -$ link pool, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating reserved test -$ ccc reserved -$ link reserved, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating set_extent test -$ ccc set_extent -$ link set_extent, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$! a new test -$ type sys$input - Creating space_overflow test -$ ccc space_overflow -$ link space_overflow, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating stab test -$ ccc stab -$ link stab, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$! a new test -$ type sys$input - Creating testmeta test -$ ccc testmeta -$ link testmeta, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating unlink test -$ ccc unlink -$ link unlink, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Creating vfd test -$ ccc vfd -$ link vfd, - - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$! -$ type sys$input - Done with tests compilation -$ exit diff --git a/vms/tools/h5copy/check_h5copy.com b/vms/tools/h5copy/check_h5copy.com deleted file mode 100644 index df83c88..0000000 --- a/vms/tools/h5copy/check_h5copy.com +++ /dev/null @@ -1,110 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$ ! -$ ! This command file tests h5copy utility. The command file has to -$ ! run in the [hdf5-top.tools.h5copy.testfiles] directory. -$ ! -$ type sys$input - -=================================== - Testing h5copy utiltity -=================================== - -$ ! -$ ! Define h5copy symbols -$ ! -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-11, current_dir) -$ h5copy_dir = temp + "]" -$ h5copy :== $sys$disk:'h5copy_dir'h5copy.exe -$ ! -$ ! -$ ! h5copy tests -$ ! -$ - -$ !# copy files -$ write sys$output "Test copying various forms of datasets" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s simple -d simple" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s chunk -d chunk" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compact -d compact" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compound -d compound" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compressed -d compressed" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s named_vl -d named_vl" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s nested_vl -d nested_vl" -$ ! -$ write sys$output " " -$ write sys$output "Test copying dataset within group in source file to root of destination" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_dsets/simple -d simple_top" -$ write sys$output " " -$ write sys$output "Test copying & renaming dataset" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compound -d rename" -$! -$ write sys$output " " -$ write sys$output "Test copying empty, 'full' & 'nested' groups" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_empty -d grp_empty" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_dsets -d grp_dsets" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_nested -d grp_nested" -$! -$ write sys$output " " -$ write sys$output "Test copying dataset within group in source file to group in destination" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s /grp_dsets/simple -d /grp_dsets/simple_group" -$! write sys$output "Test copying & renaming group" -$! CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -v -s grp_dsets -d grp_rename -$! write sys$output "Test copying full group hierarchy into group in destination file" -$! CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -v -s grp_dsets -d /grp_rename/grp_dsets" -$! -$ write sys$output " " -$ write sys$output "Test copying objects into group hier. that doesn't exist yet in destination file" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -vp -s simple -d /A/B1/simple" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -vp -s simple -d /A/B2/simple2" -$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -vp -s /grp_dsets/simple -d /C/D/simple" -$!CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -vp -s /grp_dsets -d /E/F/grp_dsets" -$!CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -vp -s /grp_nested -d /G/H/grp_nested" -$! -$ del *out.h5;* -$ ! -$TOOLTEST: SUBROUTINE - -$ -$ begin = "Testing h5copy" -$ ! -$ ! Run the test and save output in the 'actual' file -$ ! -$ define/nolog sys$error h5copy_temp.err -$ ON ERROR THEN CONTINUE -$ h5copy 'P1 -$ deassign sys$error -$ if F$SEARCH("h5copy_temp.err") .EQS. "" -$ then -$ result = "PASSED" -$ line = F$FAO("!16AS !53AS !70AS", begin, P1, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!16AS !52AS !69AS", begin, P1, result) -$ endif -$ ! -$ ! Delete error file if any print test result -$ ! -$ if F$SEARCH ("*.err;*") .NES. "" -$ then -$ del *.err;* -$ endif -$ ! -$ write sys$output line -$ ! -$ENDSUBROUTINE diff --git a/vms/tools/h5copy/make.com b/vms/tools/h5copy/make.com deleted file mode 100644 index 1a95f58..0000000 --- a/vms/tools/h5copy/make.com +++ /dev/null @@ -1,40 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5copy tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test]) -$ type sys$input - Creating h5copy -$! -$ cobj= " h5copy " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=h5copy.exe - - h5copy, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5copy -$! -$! -$ exit diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com deleted file mode 100644 index 5a0ef46..0000000 --- a/vms/tools/h5diff/check_h5diff.com +++ /dev/null @@ -1,337 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$ ! -$ ! This command file tests h5diff utility. The command file has to -$ ! run in the [hdf5-top.tools.h5diff.testfiles] directory. -$ ! -$ ! -$ type sys$input - -=================================== - Testing h5diff utiltity -=================================== - -$ ! Define h5diff symbol -$ ! -$! set message/notext/nofacility/noidentification/noseverity -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-11, current_dir) -$ h5diff_dir = temp + "]" -$ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe -$ ! - -$ ! -$ ! h5diff tests -$ ! -$ -$!# 1.0 -$ CALL TOOLTEST h5diff_10.txt "-h" -$! -$!# 1.1 normal mode -$ CALL TOOLTEST h5diff_11.txt "h5diff_basic1.h5 h5diff_basic2.h5" -$! -$!# 1.2 normal mode with objects -$ CALL TOOLTEST h5diff_12.txt "h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2" -$! -$!# 1.3 report mode -$ CALL TOOLTEST h5diff_13.txt "-r h5diff_basic1.h5 h5diff_basic2.h5" -$! -$!# 1.4 report mode with objects -$ CALL TOOLTEST h5diff_14.txt "-r h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2" -$! -$!# 1.5 with -d -$ CALL TOOLTEST h5diff_15.txt " --report --delta=5 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 1.6.1 with -p (int) -$ CALL TOOLTEST h5diff_16_1.txt "-v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset5 g1/dset6" -$! -$!# 1.6.2 with -p (unsigned long long) -$ CALL TOOLTEST h5diff_16_2.txt "--verbose --relative=0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset7 g1/dset8" -$! -$!# 1.6.3 with -p (int) -$ CALL TOOLTEST h5diff_16_3.txt "-v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10" -$! -$!# 1.7 verbose mode -$ CALL TOOLTEST h5diff_17.txt "-v h5diff_basic1.h5 h5diff_basic2.h5" -$! -$!# 1.8 quiet mode -$ CALL TOOLTEST h5diff_18.txt "-q h5diff_basic1.h5 h5diff_basic2.h5" -$! -$! -$!# ############################################################################## -$!# # not comparable types -$!# ############################################################################## -$! -$!# 2.0 -$ CALL TOOLTEST h5diff_20.txt "-v h5diff_types.h5 h5diff_types.h5 dset g1" -$ -$!# 2.1 -$ CALL TOOLTEST h5diff_21.txt "-v h5diff_types.h5 h5diff_types.h5 dset l1" -$! -$!# 2.2 -$ CALL TOOLTEST h5diff_22.txt "-v h5diff_types.h5 h5diff_types.h5 dset t1" -$! -$!# ############################################################################## -$!# # compare groups, types, links (no differences and differences) -$!# ############################################################################## -$! -$!# 2.3 -$ CALL TOOLTEST h5diff_23.txt "-v h5diff_types.h5 h5diff_types.h5 g1 g1" -$! -$!# 2.4 -$ CALL TOOLTEST h5diff_24.txt "-v h5diff_types.h5 h5diff_types.h5 t1 t1" -$! -$!# 2.5 -$ CALL TOOLTEST h5diff_25.txt "-v h5diff_types.h5 h5diff_types.h5 l1 l1" -$! -$!# 2.6 -$ CALL TOOLTEST h5diff_26.txt "-v h5diff_types.h5 h5diff_types.h5 g1 g2" -$! -$!# 2.7 -$ CALL TOOLTEST h5diff_27.txt "-v h5diff_types.h5 h5diff_types.h5 t1 t2" -$! -$!# 2.8 -$ CALL TOOLTEST h5diff_28.txt "-v h5diff_types.h5 h5diff_types.h5 l1 l2" -$! -$! -$! -$!# ############################################################################## -$!# # Dataset types -$!# ############################################################################## -$ -$!# 5.0 -$ CALL TOOLTEST h5diff_50.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset0a dset0b" -$! -$!# 5.1 -$ CALL TOOLTEST h5diff_51.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset1a dset1b" -$! -$!# 5.2 -$ CALL TOOLTEST h5diff_52.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset2a dset2b" -$! -$!# 5.3 -$ CALL TOOLTEST h5diff_53.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset3a dset4b" -$! -$!# 5.4 -$ CALL TOOLTEST h5diff_54.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset4a dset4b" -$! -$!# 5.5 -$ CALL TOOLTEST h5diff_55.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset5a dset5b" -$! -$!# 5.6 -$ CALL TOOLTEST h5diff_56.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset6a dset6b" -$! -$!# 5.7 -$ CALL TOOLTEST h5diff_57.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b" -$! -$!# 5.8 (region reference) -$ CALL TOOLTEST h5diff_58.txt "-v h5diff_dset1.h5 h5diff_dset2.h5 refreg" -$! -$!# ############################################################################## -$!# # Error messages -$!# ############################################################################## -$! -$! -$!# 6.0: Check if the command line number of arguments is less than 3 -$ CALL TOOLTEST h5diff_600.txt "h5diff_basic1.h5" -$! -$!# ############################################################################## -$!# # -d -$!# ############################################################################## -$! -$! -$!# 6.3: negative value -$ CALL TOOLTEST h5diff_603.txt "-d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.4: zero -$ CALL TOOLTEST h5diff_604.txt "-d 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.5: non number -$ CALL TOOLTEST h5diff_605.txt "-d u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.6: hexadecimal -$ CALL TOOLTEST h5diff_606.txt "-d 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.7: string -$ CALL TOOLTEST h5diff_607.txt "-d """1""" h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.8: repeated option -$ CALL TOOLTEST h5diff_608.txt "-d 1 -d 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.9: number larger than biggest difference -$ CALL TOOLTEST h5diff_609.txt "-d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.10: number smaller than smallest difference -$ CALL TOOLTEST h5diff_610.txt "-d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$! -$!# ############################################################################## -$!# # -p -$!# ############################################################################## -$! -$! -$! -$!# 6.12: negative value -$ CALL TOOLTEST h5diff_612.txt "-p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.13: zero -$ CALL TOOLTEST h5diff_613.txt "-p 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.14: non number -$ CALL TOOLTEST h5diff_614.txt "-p u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.15: hexadecimal -$ CALL TOOLTEST h5diff_615.txt "-p 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.16: string -$! CALL TOOLTEST h5diff_616.txt "-p """0.21""" h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.17: repeated option -$ CALL TOOLTEST h5diff_617.txt "-p 0.21 -p 0.22 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.18: number larger than biggest difference -$ CALL TOOLTEST h5diff_618.txt "-p 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.19: number smaller than smallest difference -$ CALL TOOLTEST h5diff_619.txt "-p 0.005 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$! -$! -$!# ############################################################################## -$!# # -n -$!# ############################################################################## -$! -$! -$! -$!# 6.21: negative value -$ CALL TOOLTEST h5diff_621.txt "-n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.22: zero -$ CALL TOOLTEST h5diff_622.txt "-n 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.23: non number -$ CALL TOOLTEST h5diff_623.txt "-n u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.24: hexadecimal -$ CALL TOOLTEST h5diff_624.txt "-n 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.25: string -$ CALL TOOLTEST h5diff_625.txt "-n """2""" h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.26: repeated option -$ CALL TOOLTEST h5diff_626.txt "-n 2 -n 3 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.27: number larger than biggest difference -$ CALL TOOLTEST h5diff_627.txt "--count=200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# 6.28: number smaller than smallest difference -$ CALL TOOLTEST h5diff_628.txt "-n 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4" -$! -$!# ############################################################################## -$!# 6.29 non valid files -$!# ############################################################################## -$! This test is disabled in the C test script. -$! CALL TOOLTEST h5diff_629.txt "file1.h6 file2.h6" -$! -$!# ############################################################################## -$!# 7. attributes -$!# ############################################################################## -$! -$ CALL TOOLTEST h5diff_70.txt "-v h5diff_attr1.h5 h5diff_attr2.h5" -$! -$!# ############################################################################## -$!# 8. all dataset datatypes -$!# ############################################################################## -$! -$ CALL TOOLTEST h5diff_80.txt "-v h5diff_dset1.h5 h5diff_dset2.h5" -$! -$!# 9. compare a file with itself -$! -$ CALL TOOLTEST h5diff_90.txt "-v h5diff_basic2.h5 h5diff_basic2.h5" -$! -$! 10. read by hyperslab, print indexes -$ CALL TOOLTEST h5diff_100.txt "-v h5diff_hyper1.h5 h5diff_hyper2.h5" -$! -$! 11. floating point comparison -$ CALL TOOLTEST h5diff_101.txt "-v h5diff_basic1.h5 h5diff_basic1.h5 g1/d1 g1/d2" -$ CALL TOOLTEST h5diff_102.txt "-v h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1 g1/fp2" -$! -$! -$! -$TOOLTEST: SUBROUTINE -$ -$ len = F$LENGTH(P1) -$ base = F$EXTRACT(0,len-3,P1) -$ actual = base + "h5diffout" -$ actual_err = base + "h5differr" -$ -$ begin = "Testing h5diff " -$ ! -$ ! Run the test and save output in the 'actual' file -$ ! -$ define/nolog sys$output 'actual' -$ define/nolog sys$error 'actual_err' -$ ON ERROR THEN CONTINUE -$ h5diff 'P2 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_err' 'actual' -$ set message/text/facility/identification/severity -$ endif -$ ! -$ ! Compare the results -$ ! -$ diff/output=h5diff_temp/ignore=(spacing,trailing_spaces,blank_lines) 'actual' 'P1' -$ open/read temp_out h5diff_temp.dif -$ read temp_out record1 -$ close temp_out -$ ! -$ ! Extract error code and format output line -$ ! -$ len = F$LENGTH(record1) -$ err_code = F$EXTRACT(len-1,1,record1) -$ if err_code .eqs. "0" -$ then -$ result = "PASSED" -$ line = F$FAO("!15AS !50AS !70AS", begin, P2, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!15AS !49AS !69AS", begin, P2, result) -$ endif -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! Append the result to the log file -$ ! -$ append/new_version h5diff_temp.dif h5diff.log -$ append/new_version 'actual' h5diff_output.txt -$ ! -$ ! Delete temporary files -$ ! -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ del *.h5differr;* -$ endif -$ del *.h5diffout;* -$ del h5diff_temp.dif;* -$ ! -$ENDSUBROUTINE - diff --git a/vms/tools/h5diff/make.com b/vms/tools/h5diff/make.com deleted file mode 100644 index c1e0078..0000000 --- a/vms/tools/h5diff/make.com +++ /dev/null @@ -1,48 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VAX/VMX systems. -$! -$! Make h5diff tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib]) -$! -$ cobj= "h5diff_main, h5diff_common, h5diffgentest" - -$! -$ ccc 'cobj -$ type sys$input - Creating h5diffgentest ... -$ link/exe=h5diffgentest.exe - - h5diffgentest, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5difftest - -$ -$ type sys$input - Creating h5diff ... -$ link/exe=h5diff.exe - - h5diff_main, h5diff_common, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5diff - -$! -$ exit diff --git a/vms/tools/h5dump/check_h5dump.com b/vms/tools/h5dump/check_h5dump.com deleted file mode 100644 index 2c34731..0000000 --- a/vms/tools/h5dump/check_h5dump.com +++ /dev/null @@ -1,353 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$ ! -$ ! This command file tests h5dump utility. The command file has to -$ ! run in the [hdf5-top.tools.testfiles] directory. -$ ! -$ type sys$input - -=================================== - Testing h5dump utiltity -=================================== - -$ -$ ! -$ ! Define h5dump symbol -$ ! -$! set message/notext/nofacility/noidentification/noseverity -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-10, current_dir) -$ h5dump_dir = temp + "H5DUMP]" -$ h5dump :== $sys$disk:'h5dump_dir'h5dump.exe -$ ! -$ ! h5dump tests -$ ! -$ -$ -$ -$ ! Test for displaying groups -$ CALL TOOLTEST tgroup-1.ddl "tgroup.h5" -$ ! Test for displaying the selected groups -$ CALL TOOLTEST tgroup-2.ddl "--group=/g2 --group / -g /y tgroup.h5" -$ ! Test for displaying simple space datasets -$ CALL TOOLTEST tdset-1.ddl "tdset.h5" -$ ! Test for displaying selected datasets -$ CALL TOOLTEST tdset-2.ddl "-"""H""" -d dset1 -d /dset2 --dataset=dset3 tdset.h5" -$ ! Test for displaying attributes -$ CALL TOOLTEST tattr-1.ddl "tattr.h5" -$ ! Test for displaying the selected attributes of string type and scalar space -$ CALL TOOLTEST tattr-2.ddl "-a /attr1 --attribute /attr4 --attribute=/attr5 tattr.h5" -$ ! Test for header and error messages -$ CALL TOOLTEST tattr-3.ddl "--header -a /attr2 --attribute=/attr tattr.h5" -$ ! Test for displaying attributes in shared datatype (also in group and dataset) -$ CALL TOOLTEST tnamed_dtype_attr.ddl "tnamed_dtype_attr.h5" -$ -$ ! Test for displaying soft links -$ CALL TOOLTEST tslink-1.ddl "tslink.h5" -$ ! Test for displaying the selected link -$ CALL TOOLTEST tslink-2.ddl "-l slink2 tslink.h5" -$ -$ ! Tests for hard links -$ CALL TOOLTEST thlink-1.ddl "thlink.h5" -$ CALL TOOLTEST thlink-2.ddl "-d /g1/dset2 --dataset /dset1 --dataset=/g1/g1.1/dset3 thlink.h5" -$ CALL TOOLTEST thlink-3.ddl "-d /g1/g1.1/dset3 --dataset /g1/dset2 --dataset=/dset1 thlink.h5" -$ CALL TOOLTEST thlink-4.ddl "-g /g1 thlink.h5" -$ CALL TOOLTEST thlink-5.ddl "-d /dset1 -g /g2 -d /g1/dset2 thlink.h5" -$ -$ ! Tests for compound data types -$ CALL TOOLTEST tcomp-1.ddl "tcompound.h5" -$ ! test for named data types -$ CALL TOOLTEST tcomp-2.ddl "-t /type1 --datatype /type2 --datatype=/group1/type3 tcompound.h5" -$ ! Test for unamed type -$ CALL TOOLTEST tcomp-3.ddl "-t /#6632 -g /group2 tcompound.h5" -$ ! Test complicated compound datatype -$ CALL TOOLTEST tcomp-4.ddl "tcompound_complex.h5" -$ -$ ! Test for the nested compound type -$ CALL TOOLTEST tnestcomp-1.ddl "tnestedcomp.h5" -$ -$ ! test for options -$ CALL TOOLTEST tall-1.ddl "tall.h5" -$ CALL TOOLTEST tall-2.ddl "--header -g /g1/g1.1 -a attr2 tall.h5" -$ CALL TOOLTEST tall-3.ddl "-d /g2/dset2.1 -l /g1/g1.2/g1.2.1/slink tall.h5" -$ -$ ! Test for loop detection -$ CALL TOOLTEST tloop-1.ddl "tloop.h5" -$ -$ ! Test for string -$ CALL TOOLTEST tstr-1.ddl "tstr.h5" -$ CALL TOOLTEST tstr-2.ddl "tstr2.h5" -$ -$ ! Test for file created by Lib SAF team -$ CALL TOOLTEST tsaf.ddl "tsaf.h5" -$ -$ ! Test for file with variable length data -$ CALL TOOLTEST tvldtypes1.ddl "tvldtypes1.h5" -$ CALL TOOLTEST tvldtypes2.ddl "tvldtypes2.h5" -$ CALL TOOLTEST tvldtypes3.ddl "tvldtypes3.h5" -$ CALL TOOLTEST tvldtypes4.ddl "tvldtypes4.h5" -$ CALL TOOLTEST tvldtypes5.ddl "tvldtypes5.h5" -$ -$ ! Test for file with variable length string data -$ CALL TOOLTEST tvlstr.ddl "tvlstr.h5" -$ -$ ! Test for files with array data -$ CALL TOOLTEST tarray1.ddl "tarray1.h5" -$ CALL TOOLTEST tarray2.ddl "tarray2.h5" -$ CALL TOOLTEST tarray3.ddl "tarray3.h5" -$ CALL TOOLTEST tarray4.ddl "tarray4.h5" -$ CALL TOOLTEST tarray5.ddl "tarray5.h5" -$ CALL TOOLTEST tarray6.ddl "tarray6.h5" -$ CALL TOOLTEST tarray7.ddl "tarray7.h5" -$ -$ ! Test for files with empty data -$ CALL TOOLTEST tempty.ddl "tempty.h5" -$ -$ ! Test for files with groups that have comments -$ CALL TOOLTEST tgrp_comments.ddl "tgrp_comments.h5" -$ -$ ! Test the --filedriver flag -$ CALL TOOLTEST tsplit_file.ddl "--filedriver=split tsplit_file" -$ CALL TOOLTEST tfamily.ddl "--filedriver=family tfamily%05d.h5" -$ CALL TOOLTEST tmulti.ddl "--filedriver=multi tmulti" -$ -$ ! Test for files with group names which reach > 1024 bytes in size -$ CALL TOOLTEST tlarge_objname.ddl "-w157 tlarge_objname.h5" -$ -$ ! Test '-A' to suppress data but print attr's -$ CALL TOOLTEST tall-2A.ddl "-"""A""" tall.h5" -$ -$ ! Test '-r' to print attributes in ASCII instead of decimal -$ CALL TOOLTEST tall-2B.ddl "-"""A""" -r tall.h5" -$ -$ ! Test Subsetting -$ CALL TOOLTEST tall-4s.ddl "--dataset=/g1/g1.1/dset1.1.1 --start=1,1 --stride=2,3 --count=3,2 --block=1,1 tall.h5" -$ CALL TOOLTEST tall-5s.ddl "-d /g1/g1.1/dset1.1.2[0;2;10;] tall.h5" -$ CALL TOOLTEST tdset-3s.ddl "-d /dset1[1,1;;;] tdset.h5" -$! CALL TOOLTEST tdset-3s.ddl "-d """/"dset"1[;3,2;4,4;1,4]""" tdset2.h5" -$ -$ ! Test printing characters in ASCII instead of decimal -$ CALL TOOLTEST tchar1.ddl "-r tchar.h5" -$ -$ ! Test failure handling -$ ! Missing file name -$ CALL TOOLTEST "tnofilename.ddl" -$ -$ ! rev. 2004 -$ -$ ! Tests for super block -$ CALL TOOLTEST tboot1.ddl "-"""H""" -"""B""" -d dset tfcontents1.h5" -$ CALL TOOLTEST tboot2.ddl "-"""B""" tfcontents2.h5" -$ -$ ! Test -p with a non existing dataset -$ CALL TOOLTEST tperror.ddl "-p -d bogus tfcontents1.h5" -$ -$ ! Test for file contents -$ CALL TOOLTEST tcontents.ddl "-n tfcontents1.h5" -$ -$ ! Tests for storage layout -$ ! Compact -$ CALL TOOLTEST tcompact.ddl "-"""H""" -p -d compact tfilters.h5" -$ ! Contiguous -$ CALL TOOLTEST tcontiguos.ddl "-"""H""" -p -d contiguous tfilters.h5" -$ ! Chunked -$ CALL TOOLTEST tchunked.ddl "-"""H""" -p -d chunked tfilters.h5" -$ ! External -$ CALL TOOLTEST texternal.ddl "-"""H""" -p -d external tfilters.h5" -$ -$ ! Fill values -$ CALL TOOLTEST tfill.ddl "-p tfvalues.h5" -$ -$ ! Several datatype, with references , print path -$ CALL TOOLTEST treference.ddl "tattr2.h5" -$ -$ ! Escape/not escape non printable characters -$ CALL TOOLTEST tstringe.ddl "-e tstr3.h5" -$ CALL TOOLTEST tstring.ddl "tstr3.h5" -$ ! Char data as ASCII with non escape -$ CALL TOOLTEST tstring2.ddl "-r -d str4 tstr3.h5" -$ -$ ! Array indices print/not print -$ CALL TOOLTEST tindicesyes.ddl "taindices.h5" -$ CALL TOOLTEST tindicesno.ddl "-y taindices.h5" -$ ! User defined -$ CALL TOOLTEST tuserfilter.ddl "-"""H""" -p -d myfilter tfilters.h5" -$ -$ ! Test for displaying dataset and attribute of null space -$ CALL TOOLTEST tnullspace.ddl "tnullspace.h5" -$ -$ ! Test for displaying objects with very long names -$ !CALL TOOLTEST tlonglinks.ddl "tlonglinks.h5" -$ -$ ! Test for long double (some systems do not have long double) -$ ! CALL TOOLTEST tldouble.ddl "tldouble.h5" -$ -$ ! Test for vms -$ CALL TOOLTEST tvms.ddl "tvms.h5" -$ -$ !test for binary output -$ CALL TOOLTEST1 tbin1.ddl "-d integer -o out1.bin -b """LE""" tbinary.h5" -$ CALL TOOLTEST1 tbin2.ddl "-d float -o out2.bin -b """BE""" tbinary.h5" -$ CALL TOOLTEST1 tbin4.ddl "-d double -o out4.bin -b """FILE""" tbinary.h5" -$ -$ ! Test for dataset region references -$ CALL TOOLTEST tdatareg.ddl "tdatareg.h5" -$ -$ ! tests for group creation order "1" tracked, "2" name, root tracked -$ CALL TOOLTEST tordergr1.ddl "--group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5" -$ CALL TOOLTEST tordergr2.ddl "--group=1 --sort_by=creation_order --sort_order=descending tordergr.h5" -$ CALL TOOLTEST tordergr3.ddl "-g 2 -q name -z ascending tordergr.h5" -$ CALL TOOLTEST tordergr4.ddl "-g 2 -q name -z descending tordergr.h5" -$ CALL TOOLTEST tordergr5.ddl "-q creation_order tordergr.h5" -$ -$ ! Tests for attribute order -$ CALL TOOLTEST torderattr1.ddl "-"""H""" --sort_by=name --sort_order=ascending torderattr.h5" -$ CALL TOOLTEST torderattr2.ddl "-"""H""" --sort_by=name --sort_order=descending torderattr.h5" -$ CALL TOOLTEST torderattr3.ddl "-"""H""" --sort_by=creation_order --sort_order=ascending torderattr.h5" -$ CALL TOOLTEST torderattr4.ddl "-"""H""" --sort_by=creation_order --sort_order=descending torderattr.h5" -$ ! -$TOOLTEST: SUBROUTINE -$ -$ len = F$LENGTH(P1) -$ base = F$EXTRACT(0,len-3,P1) -$ actual = base + "h5dumpout" -$ actual_err = base + "h5dumperr" -$ -$ begin = "Testing h5dump " -$ ! -$ ! Run the test and save output in the 'actual' file -$ ! -$ -$ define/nolog sys$output 'actual' -$ define/nolog sys$error 'actual_err' -$ write sys$output "#############################" -$ write sys$output "Expected output for 'h5dump ''P2''" -$ write sys$output "#############################" -$ ON ERROR THEN CONTINUE -$ h5dump 'P2 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_err' 'actual' -$ set message/text/facility/identification/severity -$ endif -$ ! -$ ! Compare the results -$ ! -$ diff/output=h5dump_temp/ignore=(spacing,trailing_spaces,blank_lines) 'actual' 'P1' -$ open/read temp_out h5dump_temp.dif -$ read temp_out record1 -$ close temp_out -$ ! -$ ! Extract error code and format output line -$ ! -$ len = F$LENGTH(record1) -$ err_code = F$EXTRACT(len-1,1,record1) -$ if err_code .eqs. "0" -$ then -$ result = "PASSED" -$ line = F$FAO("!15AS !50AS !70AS", begin, P2, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!15AS !49AS !69AS", begin, P2, result) -$ endif -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! Append the result to the log file -$ ! -$ append/new_version h5dump_temp.dif h5dump.log -$ append/new_version 'actual' h5dump_output.txt -$ ! -$ ! Delete temporary files -$ ! -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ del *.h5dumperr;* -$ endif -$ del *.h5dumpout;* -$ del h5dump_temp.dif;* -$ ! -$ENDSUBROUTINE -$ -$TOOLTEST1: SUBROUTINE -$ -$ len = F$LENGTH(P1) -$ base = F$EXTRACT(0,len-3,P1) -$ actual = base + "h5dumpout" -$ actual_err = base + "h5dumperr" -$ -$ begin = "Testing h5dump " -$ ! -$ ! Run the test and save output in the 'actual' file -$ ! -$ define/nolog sys$output 'actual' -$ define/nolog sys$error 'actual_err' -$ ON ERROR THEN CONTINUE -$ h5dump 'P2 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_err' 'actual' -$ set message/text/facility/identification/severity -$ endif -$ ! -$ ! Compare the results -$ ! -$ diff/output=h5dump_temp/ignore=(spacing,trailing_spaces,blank_lines) 'actual' 'P1' -$ open/read temp_out h5dump_temp.dif -$ read temp_out record1 -$ close temp_out -$ ! -$ ! Extract error code and format output line -$ ! -$ len = F$LENGTH(record1) -$ err_code = F$EXTRACT(len-1,1,record1) -$ if err_code .eqs. "0" -$ then -$ result = "PASSED" -$ line = F$FAO("!15AS !50AS !70AS", begin, P2, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!15AS !49AS !69AS", begin, P2, result) -$ endif -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! Append the result to the log file -$ ! -$ append/new_version h5dump_temp.dif h5dump.log -$ append/new_version 'actual' h5dump_output.txt -$ ! -$ ! Delete temporary files -$ ! -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ del *.h5dumperr;* -$ endif -$ del *.h5dumpout;* -$ del h5dump_temp.dif;* -$ ! -$ENDSUBROUTINE - diff --git a/vms/tools/h5dump/make.com b/vms/tools/h5dump/make.com deleted file mode 100644 index 612b524..0000000 --- a/vms/tools/h5dump/make.com +++ /dev/null @@ -1,41 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5dump tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib]) -$ cobj= "h5dump.c, h5dumpgentest.c " -$ ccc 'cobj -$ type sys$input - Creating h5dumpgentest ... -$ link h5dumpgentest, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5dumpgentest -$ type sys$input - Creating h5dump ... -$ link h5dump, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5dump -$! -$ exit diff --git a/vms/tools/h5import/check_h5import.com b/vms/tools/h5import/check_h5import.com deleted file mode 100644 index 96c2d07..0000000 --- a/vms/tools/h5import/check_h5import.com +++ /dev/null @@ -1,227 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$ ! -$ ! This command file tests h5import utility. The command file has to -$ ! run in the [hdf5-top.tools.h5import.testfiles] directory. -$ ! -$ ! -$ type sys$input - -=================================== - Testing h5import utiltity -=================================== - -$ ! Define symbols -$ ! -$ -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-19, current_dir) -$ h5dump_dir = temp + "H5DUMP]" -$ h5dump :== $sys$disk:'h5dump_dir'h5dump.exe -$ h5import_dir = temp + "H5IMPORT]" -$ h5import :== $sys$disk:'h5import_dir'h5import.exe -$ h5importtest :== $sys$disk:'h5import_dir'h5importtest.exe -$ ! -$ ! Define output for diff command that compares expected and actual -$ ! outputs of h5dump -$ ! -$ create h5import.log -$ ! -$ ! h5import tests -$ ! -$ ! Run h5importtest to create input files -$ ! -$ run [.-]h5importtest -$ ! -$ type sys$input - Testing ASCII I32 rank 3 - Output BE -$ CALL TOOLTEST "txtin16.txt -c txtin32.conf -o" txtin32.h5 -$ ! -$ type sys$input - Testing ASCII I16 rank 3 - Output LE - CHUNKED - extended -$ CALL TOOLTEST "txtin16.txt -c txtin16.conf -o" txtin16.h5 -$ ! -$ type sys$input - Testing ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed -$ CALL TOOLTEST "txtin16.txt -c txtin8.conf -o" txtin8.h5 -$ ! -$ type sys$input - Testing ASCII UI32 - rank 3 - Output BE -$ CALL TOOLTEST "txtuin32.txt -c txtuin32.conf -o" txtuin32.h5 -$ ! -$ type sys$input - Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed -$ CALL TOOLTEST "txtuin32.txt -c txtuin16.conf -o" txtuin16.h5 -$ ! -$ type sys$input - Testing ASCII F32 - rank 3 - Output LE -$ CALL TOOLTEST "txtfp32.txt -c txtfp32.conf -o" txtfp32.h5 -$ ! -$ type sys$input - Testing ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed -$ CALL TOOLTEST "txtfp64.txt -c txtfp64.conf -o" txtfp64.h5 -$ ! -$ type sys$input - Testing BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed -$ CALL TOOLTEST "binfp64.bin -c binfp64.conf -o" binfp64.h5 -$ ! -$ type sys$input - Testing BINARY I16 - rank 3 - Output order LE + CHUNKED + extended -$ CALL TOOLTEST "binin16.bin -c binin16.conf -o" binin16.h5 -$ ! -$ type sys$input - Testing BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed -$ CALL TOOLTEST "binin8.bin -c binin8.conf -o" binin8.h5 -$ ! -$ type sys$input - - Testing BINARY I32 - rank 3 - Output BE + CHUNKED -$ CALL TOOLTEST "binin32.bin -c binin32.conf -o" binin32.h5 -$ ! -$ type sys$input - Testing BINARY UI16 - rank 3 - Output byte BE + CHUNKED -$ CALL TOOLTEST "binuin16.bin -c binuin16.conf -o" binuin16.h5 -$ ! -$ type sys$input - Testing BINARY UI32 - rank 3 - Output LE + CHUNKED -$ CALL TOOLTEST "binuin32.bin -c binuin32.conf -o" binuin32.h5 -$ ! -$ type sys$input - Testing STR -$ CALL TOOLTEST "txtstr.txt -c txtstr.conf -o" txtstr.h5 -$ ! -$ type sys$input - Testing BINARY I8 CR LF EOF -$ CALL TOOLTEST "binin8w.bin -c binin8w.conf -o" binin8w.h5 -$ ! -$ type sys$input - Testing ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE -$ CALL TOOLTEST "in64.txt -c textpfe.conf -o" test15.h5 -$ -$ -$ ! Delete temporary files -$ del *_out.h5;* -$ del *.h5importtxt;* -$ del b*.h5;* -$ del txti*.h5;* -$ del *.dif;* -$ ! -$ -$TOOLTEST: SUBROUTINE -$ -$ len = F$LENGTH(P2) -$ base = F$EXTRACT(0,len-3,P2) -$ actual = base + "_out.h5" -$ actual_dump = base + "out.h5importtxt" -$ actual_dump_err = base + "out.h5importerr" -$ expected_dump = base + ".h5importtxt" -$ expected_dump_err = base + ".h5importerr" -$ -$ begin = "Testing" -$ ! -$ ! Run h5import with output in the 'actual' file -$ ! -$ ON ERROR THEN CONTINUE -$ h5import 'P1 'actual' -$ define/nolog sys$output 'actual_dump' -$ define/nolog sys$error 'actual_dump_err' -$ ! -$ ! Dump the atual and expected files -$ ! -$ h5dump 'actual' -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_dump_err) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_dump_err' 'actual_dump' -$ set message/text/facility/identification/severity -$ endif -$ define/nolog sys$output 'expected_dump' -$ define/nolog sys$error 'expected_dump_err' -$ h5dump 'P2 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(expected_dump_err) .NES. "" -$ then -$ set message/notex/nofacility/noidentification/noseverity -$ append 'expected_dump_err' 'expected_dump' -$ set message/ntext/facility/identification/severity -$ endif -$ ! -$ ! Compare the results -$ ! -$ diff/output=h5dump_temp/ignore=(spacing,trailing_spaces,blank_lines)- - 'actual_dump' - - 'expected_dump' -$ open/read temp_out h5dump_temp.dif -$ ! -$READ_DATA: -$ read/end_of_file=end_read temp_out record1 -$ ! -$ ! Skip blank lines -$ ! -$ if record1 .EQS. "" then goto READ_DATA -$ ! -$ ! Find record with "Number" and exit the loop -$ ! -$ len = F$LENGTH(record1) -$ pos = F$LOCATE("Number", record1) -$ ! -$ if pos .EQ. 0 -$ then -$ err_code = F$EXTRACT(len-1,1,record1) -$ goto END_READ -$ endif -$ ! -$ goto READ_DATA -$ -$ ! -$END_READ: -$ close temp_out -$ ! -$ ! File names are different, so we allow only one difference -$ ! in h5dump -$ if err_code .eqs. "1" -$ then -$ result = "PASSED" -$ line = F$FAO("!8AS !62AS !80AS", begin, P1, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!8AS !61AS !79AS", begin, P1, result) -$ endif -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! Append the result to the log file -$ ! -$ append h5dump_temp.dif h5import.log -$ ! -$ ! -$ ! -$ ! Delete temporary files -$ ! -$ if F$SEARCH(actual_dump_err) .NES. "" -$ then -$ del *out.h5importerr;* -$ endif -$ if F$SEARCH(expected_dump_err) .NES. "" -$ then -$ del *.h5importerr;* -$ endif -$ENDSUBROUTINE diff --git a/vms/tools/h5import/make.com b/vms/tools/h5import/make.com deleted file mode 100644 index 6afbd70..0000000 --- a/vms/tools/h5import/make.com +++ /dev/null @@ -1,46 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5import tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib]) -$ type sys$input - Creating h5import ... -$! -$ cobj= "h5import, h5importtest " - -$! -$ ccc 'cobj -$ link h5import,- - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5import - -$! -$ type sys$input - Creating h5importtest ... -$ link h5importtest, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5importtest - -$! -$ exit diff --git a/vms/tools/h5jam/check_h5jam.com b/vms/tools/h5jam/check_h5jam.com deleted file mode 100644 index 50be903..0000000 --- a/vms/tools/h5jam/check_h5jam.com +++ /dev/null @@ -1,159 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$ ! -$ ! This command file tests h5jam and h5unjam utilities. The command file has to -$ ! run in the [hdf5-top.tools.testfiles] directory. -$ ! -$ type sys$input - -=================================== - Testing h5jam utiltity -=================================== - -$ ! -$ ! Define h5jam, h5unjam and h5dump symbols -$ ! -$! set message/notext/nofacility/noidentification/noseverity -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-16, current_dir) -$ h5dump_dir = temp + "H5DUMP]" -$ h5dump :== $sys$disk:'h5dump_dir'h5dump.exe -$ temp2 = F$EXTRACT(0, len-11, current_dir) -$ h5jam_dir = temp2 + "]" -$ h5jam :== $sys$disk:'h5jam_dir'h5jam.exe -$ ! -$ ! Define output for diff command that compares expected and actual -$ ! outputs of h5dump -$ ! -$ create h5dump.log -$ ! -$ ! h5jam and h5unjam tests -$ ! -$ -$ CALL H5JAMTEST "-u u10.txt -i" tall.h5 ta2.h5 -$ CALL H5JAMTEST "-u u511.txt -i" tall.h5 ta3.h5 -$ CALL H5JAMTEST "-u u512.txt -i" tall.h5 ta4.h5 -$ CALL H5JAMTEST "-u u513.txt -i" tall.h5 ta5.h5 -$ -$ -$H5JAMTEST: SUBROUTINE -$ -$ len_org = F$LENGTH(P2) -$ base_org = F$EXTRACT(0,len_org-2,P2) -$ len = F$LENGTH(P3) -$ base = F$EXTRACT(0,len-2,P3) -$ actual = base + "out" -$ actual_org = base_org + "org" -$ actual_err = base + "err" -$ actual_err_org = base_org + "err" -$ -$ ON ERROR THEN CONTINUE -$ begin = "Testing h5jam" -$ ! -$ ! Run the test -$ ! -$ h5jam 'P1 'P2 -o 'P3 -$ ! -$ ! Dump the original and result file -$ ! -$ define/nolog sys$output 'actual' -$ define/nolog sys$error 'actual_err' -$ h5dump 'P3 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_err' 'actual' -$ set message/ntext/facility/identification/severity -$ endif -$ define/nolog sys$output 'actual_org' -$ define/nolog sys$error 'actual_err_org' -$ h5dump 'P2 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_err_org) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_err_org' 'actual_org' -$ set message/ntext/facility/identification/severity -$ endif -$ ! -$ ! Compare the results -$ ! -$ diff/output=h5dump_temp/ignore=(spacing,trailing_spaces,blank_lines) 'actual_org' - - 'actual' -$ ! -$ ! Delete output file 'P3 -$ ! -$ del 'P3;* -$ open/read temp_out h5dump_temp.dif -$READ_DATA: -$ read/end_of_file=end_read temp_out record1 -$ ! -$ ! Skip blank lines -$ ! -$ if record1 .EQS. "" then goto READ_DATA -$ ! -$ ! Find record with "Number" and exit the loop -$ ! -$ len = F$LENGTH(record1) -$ pos = F$LOCATE("Number", record1) -$ ! -$ if pos .EQ. 0 -$ then -$ err_code = F$EXTRACT(len-1,1,record1) -$ goto END_READ -$ endif -$ ! -$ goto READ_DATA -$ -$ ! -$END_READ: -$ close temp_out -$ -$ ! -$ ! Extract error code and format output line -$ ! -$ len = F$LENGTH(record1) -$ err_code = F$EXTRACT(len-1,1,record1) -$ if err_code .eqs. "1" -$ then -$ result = "PASSED" -$ line = F$FAO("!14AS !14AS !7AS !2AS !25AS !100AS", begin, P1, P2, - - "-o", P3, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!14AS !14AS !7AS !2AS !25AS !99AS", begin, P1, P2, - - "-o", P3, result) -$ endif -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! Append the result to the log file -$ ! -$ append h5dump_temp.dif h5dump.log -$ ! -$ ! Delete temporary files -$ ! -$! del *.out;* -$! del *.org;* -$! del *.dif;* -$ ! -$ENDSUBROUTINE - diff --git a/vms/tools/h5jam/make.com b/vms/tools/h5jam/make.com deleted file mode 100644 index d57b5e9..0000000 --- a/vms/tools/h5jam/make.com +++ /dev/null @@ -1,67 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5ls tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib]) -$ type sys$input - Creating h5jam -$! -$ cobj= "h5jam, h5unjam, tellub, getub, h5jamgentest" - -$! -$ ccc 'cobj -$ type sys$input - Creating tellub -$ link tellub - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created tellub -$ type sys$input - Creating getub -$ link getub - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created getub -$! -$! -$ type sys$input - Creating h5jamgentest -$ link h5jamgentest, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5jamgentest -$! -$ type sys$input - Creating h5jam -$ link h5jam, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5jam -$! -$ type sys$input - Creating h5junam -$ link h5unjam, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5unjam -$! -$ exit diff --git a/vms/tools/h5ls/check.com b/vms/tools/h5ls/check.com deleted file mode 100644 index b44dedc..0000000 --- a/vms/tools/h5ls/check.com +++ /dev/null @@ -1,70 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$! h5ls testing script -$! -$ define sys$output h5ls.out -$ define sys$error h5ls.err -$ h5ls :== $sys$sysusers:[pourmale.hdf5.tools.h5ls]h5ls.exe - -$ h5ls -w80 -h -$ h5ls -w80 -help -$ h5ls -w80 -? - -$! test simple command -$ h5ls -w80 tall.h5 -$ h5ls -w80 -r -d tall.h5 -$ h5ls -w80 tgroup.h5 - -$! test for displaying groups -$ h5ls -w80 -r -g tgroup.h5 - -$! test for displaying simple space datasets -$ h5ls -w80 -r -d tdset.h5 - -$! test for displaying soft links -$ h5ls -w80 -r tslink.h5 - -$! tests for hard links -$ h5ls -w80 thlink.h5 - -$! tests for compound data types -$ h5ls -w80 -r -d tcompound.h5 - -$!test for the nested compound type -$ h5ls -w80 -r -d tnestedcomp.h5 - -$! test for loop detection -$ h5ls -w80 -r -d tloop.h5 - -$! test for string -$ h5ls -w80 -r -d tstr.h5 - -$! test test file created from lib SAF team -$ h5ls -w80 -r -d tsaf.h5 - -$! test for variable length data types -$ h5ls -w80 -r -d tvldtypes1.h5 - -$! test for array data types -$ h5ls -w80 -r -d tarray1.h5 - -$! test for empty data -$ h5ls -w80 -d tempty.h5 - -$! test for all dataset types written to attributes -$! enable -S for avoiding printing NATIVE types -$ h5ls -w80 -v -S tattr2.h5 - diff --git a/vms/tools/h5ls/check_h5ls.com b/vms/tools/h5ls/check_h5ls.com deleted file mode 100644 index e155afa..0000000 --- a/vms/tools/h5ls/check_h5ls.com +++ /dev/null @@ -1,165 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$ ! -$ ! This command file tests h5ls utility. The command file has to -$ ! run in the [hdf5-top.tools.testfiles] directory. -$ ! -$ type sys$input - -=================================== - Testing h5ls utiltity -=================================== - -$ -$ ! -$ ! Define h5ls symbol -$ ! -$! set message/notext/nofacility/noidentification/noseverity -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-10, current_dir) -$ h5ls_dir = temp + "H5LS]" -$ h5ls :== $sys$disk:'h5ls_dir'h5ls.exe -$ ! -$ ! Define output for diff command that compares expected and actual -$ ! outputs of h5ls -$ ! -$ create h5ls.log -$ ! -$ ! h5ls tests -$ ! -$ -$ CALL TOOLTEST help-1.ls "-w80 -h" -$ CALL TOOLTEST help-2.ls "-w80 -help" -$ CALL TOOLTEST help-3.ls "-w80 -?" - -$! test simple command -$ CALL TOOLTEST tall-1.ls "-w80 tall.h5" -$ CALL TOOLTEST tall-2.ls "-w80 -r -d tall.h5" -$ CALL TOOLTEST tgroup.ls "-w80 tgroup.h5" - -$! test for displaying groups -$ CALL TOOLTEST tgroup-1.ls "-w80 -r -g tgroup.h5" - -$! test for displaying simple space datasets -$ CALL TOOLTEST tdset-1.ls "-w80 -r -d tdset.h5" - -$! test for displaying soft links -$ CALL TOOLTEST tslink-1.ls "-w80 -r tslink.h5" - -$! tests for hard links -$ CALL TOOLTEST thlink-1.ls "-w80 thlink.h5" - -$! tests for compound data types -$ CALL TOOLTEST tcomp-1.ls "-w80 -r -d tcompound.h5" - -$!test for the nested compound type -$ CALL TOOLTEST tnestcomp-1.ls "-w80 -r -d tnestedcomp.h5" - -$! test for loop detection -$ CALL TOOLTEST tloop-1.ls "-w80 -r -d tloop.h5" - -$! test for string -$ CALL TOOLTEST tstr-1.ls "-w80 -r -d tstr.h5" - -$! test test file created from lib SAF team -$ CALL TOOLTEST tsaf.ls "-w80 -r -d tsaf.h5" - -$! test for variable length data types -$ CALL TOOLTEST tvldtypes1.ls "-w80 -r -d tvldtypes1.h5" - -$! test for array data types -$ CALL TOOLTEST tarray1.ls "-w80 -r -d tarray1.h5" - -$! test for empty data -$ CALL TOOLTEST tempty.ls "-w80 -d tempty.h5" - -$! test for all dataset types written to attributes -$! enable -S for avoiding printing NATIVE types -$! This test will report failure for line 311 of the tattr2.ls file -$! contains -$! Modified: XXXX-XX-XX XX:XX:XX XXX -$! instead of -$! Modified: 2004-07-06 19:36:17 CST -$! UNIX shell script does replacement on the fly in the actual output -$! file; I do not know what can I do on VMS EIP 07/27/06 -$ CALL TOOLTEST tattr2.ls "-w80 -v -"""S""" tattr2.h5" - -$ -$ -$TOOLTEST: SUBROUTINE -$ -$ len = F$LENGTH(P1) -$ base = F$EXTRACT(0,len-2,P1) -$ actual = base + "h5lsout" -$ actual_err = base + "h5lserr" -$ -$ begin = "Testing h5ls " -$ ! -$ ! Run the test and save output in the 'actual' file -$ ! -$ define/nolog sys$output 'actual' -$ define/nolog sys$error 'actual_err' -$ write sys$output "#############################" -$ write sys$output " output for 'h5ls ''P2''" -$ write sys$output "#############################" -$ ON ERROR THEN CONTINUE -$ h5ls 'P2 -$ deassign sys$output -$ deassign sys$error -$ if F$SEARCH(actual_err) .NES. "" -$ then -$ set message/notext/nofacility/noidentification/noseverity -$ append 'actual_err' 'actual' -$ set message/text/facility/identification/severity -$ endif -$ ! -$ ! Compare the results -$ ! -$ diff/output=h5ls_temp/ignore=(spacing,trailing_spaces,blank_lines) 'actual' 'P1' -$ open/read temp_out h5ls_temp.dif -$ read temp_out record1 -$ close temp_out -$ ! -$ ! Extract error code and format output line -$ ! -$ len = F$LENGTH(record1) -$ err_code = F$EXTRACT(len-1,1,record1) -$ if err_code .eqs. "0" -$ then -$ result = "PASSED" -$ line = F$FAO("!15AS !50AS !70AS", begin, P2, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!15AS !49AS !69AS", begin, P2, result) -$ endif -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! Append the result to the log file -$ ! -$ append h5ls_temp.dif h5ls.log -$ ! -$ ! Delete temporary files -$ ! -$ if F$SEARCH("*.h5lserr;*") then del *.h5lserr;* -$ if F$SEARCH("*.h5lsout;*") then del *.h5lsout;* -$ if F$SEARCH("*.dif;*") then del *.dif;* -$ ! -$ENDSUBROUTINE - diff --git a/vms/tools/h5ls/make.com b/vms/tools/h5ls/make.com deleted file mode 100644 index 51d57c6..0000000 --- a/vms/tools/h5ls/make.com +++ /dev/null @@ -1,39 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5ls tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib]) -$ type sys$input - Creating h5ls -$! -$ cobj= "h5ls.c " - -$! -$ ccc 'cobj -$ type sys$input - Creating h5ls -$ link h5ls, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5ls -$! -$ exit diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com deleted file mode 100644 index 34c122c..0000000 --- a/vms/tools/h5repack/check_h5repack.com +++ /dev/null @@ -1,197 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! -$ ! -$ ! This command file tests h5repack utility. The command file has to -$ ! run in the [hdf5-top.tools.h5repack.testfiles] directory. -$ ! -$ ! -$ type sys$input - -=================================== - Testing h5repack utiltity -=================================== - -$ ! Define h5repack and h5diff symbols -$ ! -$! set message/notext/nofacility/noidentification/noseverity -$ current_dir = F$DIRECTRY() -$ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-11, current_dir) -$ temp1 = F$EXTRACT(0, len-19, current_dir) -$ h5diff_dir = temp1 + "H5DIFF]" -$ h5diff :== $sys$disk:'h5diff_dir'h5diff.exe -$ h5repack_dir = temp + "]" -$ h5repack :== $sys$disk:'h5repack_dir'h5repack.exe -$ ! -$ ! -$ ! h5repack tests -$ ! -$ - -$!# copy files (these files have no filters) -$ CALL TOOLTEST "" h5repack_fill.h5 -$ CALL TOOLTEST "" h5repack_objs.h5 -$ CALL TOOLTEST "" h5repack_attr.h5 -$ CALL TOOLTEST "" h5repack_hlink.h5 -$ CALL TOOLTEST "" h5repack_layout.h5 -$ CALL TOOLTEST "" h5repack_early.h5 - -$! Check repacking file with committed datatypes in odd configurations -$ CALL TOOLTEST "" h5repack_named_dtypes.h5 -$ -$! # use h5repack_layout.h5 to write some filters (this file has no filters) -$ -$! # gzip with individual object -$ CALL TOOLTEST "-f dset1:"""GZIP"""=1 -l dset1:"""CHUNK"""=20x10" h5repack_layout.h5 -$! -$ -$! # gzip for all -$ CALL TOOLTEST "-f """GZIP"""=1" h5repack_layout.h5 -$! -$! # shuffle with individual object -$ CALL TOOLTEST "-f dset2:"""SHUF""" -l dset2:"""CHUNK"""=20x10" h5repack_layout.h5 -$ -$! -$! -$! # shuffle for all -$ CALL TOOLTEST "-f """SHUF"""" h5repack_layout.h5 -$! -$! # fletcher32 with individual object -$ CALL TOOLTEST "-f dset2:"""FLET""" -l dset2:"""CHUNK"""=20x10" h5repack_layout.h5 -$! -$! # fletcher32 for all -$ CALL TOOLTEST "-f """FLET"""" h5repack_layout.h5 -$ -$! ########################################################### -$! # the following tests assume the input files have filters -$! ########################################################### -$! -$! # deflate copy -$ CALL TOOLTEST "" h5repack_deflate.h5 -$! -$! # deflate remove -$ CALL TOOLTEST "-f dset_deflate:"""NONE"""" h5repack_deflate.h5 -$! -$! # shuffle copy -$ CALL TOOLTEST "" h5repack_shuffle.h5 -$! -$! # shuffle remove -$ CALL TOOLTEST "-f dset_shuffle:"""NONE"""" h5repack_shuffle.h5 -$! -$! # fletcher32 copy -$ CALL TOOLTEST "" h5repack_fletcher.h5 -$! -$! # fletcher32 remove -$ CALL TOOLTEST "-f dset_fletcher32:"""NONE"""" h5repack_fletcher.h5 -$! -$! # nbit copy -$ CALL TOOLTEST "" h5repack_nbit.h5 -$! -$! # nbit remove -$ CALL TOOLTEST "-f dset_nbit:"""NONE"""" h5repack_nbit.h5 -$! -$! # nbit add -$ CALL TOOLTEST "-f dset_int31:"""NBIT"""" h5repack_nbit.h5 -$! -$! # scaleoffset add -$! CALL TOOLTEST "-f dset_none:"""S+O"""=31" h5repack_scaleoffset.h5 -$! -$! # scaleoffset copy -$! CALL TOOLTEST "" h5repack_scaleoffset.h5 -$! -$! # scaleoffset remove -$! CALL TOOLTEST "-f dset_scaleoffset:"""NONE"""" h5repack_scaleoffset.h5 -$! -$! #limit -$ CALL TOOLTEST "-f """GZIP"""=1 -m 1024" h5repack_layout.h5 -$! -$! -$! -$! ######################################################### -$! # layout options (these files have no filters) -$! ######################################################### -$! -$ CALL TOOLTEST "-l dset2:"""CHUNK"""=20x10" h5repack_layout.h5 -$ CALL TOOLTEST "-l """CHUNK"""=20x10" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset2:"""CONTI"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l """CONTI"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset2:"""COMPA"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l """COMPA"""" h5repack_layout.h5 -$! -$! -$! ################################################################ -$! # layout conversions (file has no filters) -$! ############################################################### -$! -$ CALL TOOLTEST "-l dset_compact:"""CONTI"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_compact:"""CHUNK"""=2x5" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_compact:"""COMPA"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_contiguous:"""COMPA"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_contiguous:"""CHUNK"""=3x6" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_contiguous:"""CONTI"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_chunk:"""COMPA"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_chunk:"""CONTI"""" h5repack_layout.h5 -$ CALL TOOLTEST "-l dset_chunk:"""CHUNK"""=18x13" h5repack_layout.h5 -$! -$! -$! -$TOOLTEST: SUBROUTINE - -$ len = F$LENGTH(P2) -$ base = F$EXTRACT(0,len-3,P2) -$ output_file = base + "_out.h5" -$ output_err = base + ".h5repackerr" -$ output_out = base + ".h5repackout" -$ -$ begin = "Testing h5repack" -$ ! -$ ! Run the test and save output in the 'actual' file -$ ! -$ define/nolog sys$error 'output_err' -$ define/nolog sys$output 'output_out' -$ -$ ON ERROR THEN CONTINUE -$ h5repack 'P1 'P2 'output_file' -$ h5diff 'P2 'output_file' -$ deassign sys$error -$ deassign sys$output -$ if F$SEARCH(output_err) .EQS. "" -$ then -$ result = "PASSED" -$ line = F$FAO("!16AS !40AS !22AS !67AS", begin, P1, P2, result) -$ else -$ result = "*FAILED*" -$ line = F$FAO("!16AS !40AS !22AS !66AS", begin, P1, P2, result) -$ endif - -$ ! -$ ! Print test result -$ ! -$ write sys$output line -$ ! -$ ! -$ ! -$ ! Cleanup temporary files -$ ! -$ if F$SEARCH(output_err) .NES. "" -$ then -$ del *.h5repackerr;* -$ endif -$ del *.h5repackout;* -$ del *_out.h5;* -$ENDSUBROUTINE - - diff --git a/vms/tools/h5repack/make.com b/vms/tools/h5repack/make.com deleted file mode 100644 index 0de0e2b..0000000 --- a/vms/tools/h5repack/make.com +++ /dev/null @@ -1,55 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5repack tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test]) -$ type sys$input - Creating h5repack ... -$! -$ cobj= " h5repack_main, h5repack, h5repack_copy, h5repack_refs," +- - "h5repack_filters, h5repack_opttable, h5repack_parse, " +- - "h5repack_verify, h5repacktst" - -$! -$ ccc 'cobj -$ link/exe=h5repack.exe - - h5repack_main, h5repack, h5repack_copy, h5repack_refs, h5repack_filters, - - h5repack_opttable, h5repack_parse, - - h5repack_verify, - - [-.lib]libh5tools.olb/lib, - - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5repack - -$ type sys$input - Creating h5repacktst ... -$ link/exe=h5repacktst.exe - - h5repacktst, - - h5repack, h5repack_copy, h5repack_refs, h5repack_filters, - - h5repack_opttable, h5repack_parse, - - h5repack_verify, - - [-.lib]libh5tools.olb/lib,[-.-.test]libh5test.olb/lib, - - [-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Finished h5repacktst -$! -$ exit diff --git a/vms/tools/h5stat/make.com b/vms/tools/h5stat/make.com deleted file mode 100644 index a822aaa..0000000 --- a/vms/tools/h5stat/make.com +++ /dev/null @@ -1,39 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make h5stat tool -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test]) -$ type sys$input - Creating h5stat -$! -$ cobj= " h5stat " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=h5stat.exe - - h5stat, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5stat -$! -$! -$ exit diff --git a/vms/tools/lib/make.com b/vms/tools/lib/make.com deleted file mode 100644 index 8e9ff47..0000000 --- a/vms/tools/lib/make.com +++ /dev/null @@ -1,34 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make HDF5 tools library -$! -$! ccopt = "/float=ieee_float" -$ ccc := cc 'ccopt /include=([-.-.src]) -$! -$ type sys$input - Creating HDF5 Tools library -$! -$ cobj="h5tools, h5tools_str, h5tools_utils, h5diff, h5diff_array, "+- - "h5diff_attr, h5diff_dset, h5diff_util, h5trav,"+- - "h5tools_filters, h5tools_ref, h5tools_type" -$! -$ ccc 'cobj -$ library/create []libh5tools 'cobj -$ type sys$input - Created HDF5 tools library -$! -$ exit diff --git a/vms/tools/misc/make.com b/vms/tools/misc/make.com deleted file mode 100644 index ed2d061..0000000 --- a/vms/tools/misc/make.com +++ /dev/null @@ -1,90 +0,0 @@ -$!# -$!# Copyright by The HDF Group. -$!# Copyright by the Board of Trustees of the University of Illinois. -$!# All rights reserved. -$!# -$!# This file is part of HDF5. The full HDF5 copyright notice, including -$!# terms governing use, modification, and redistribution, is contained in -$!# the files COPYING and Copyright.html. COPYING can be found at the root -$!# of the source code distribution tree; Copyright.html can be found at the -$!# root level of an installed copy of the electronic HDF5 document set and -$!# is linked from the top-level documents page. It can also be found at -$!# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -$!# access to either file, you may request a copy from help@hdfgroup.org. -$!# -$! Makefile for VMS systems. -$! -$! Make miscellaneous tools -$! -$! The next two lines should be uncommented only when building by hand in the -$! current directory. Use build.com in the vms directory to build -$! the distribution. Make sure that location of the zlib library is correct. -$! define zlib_dir sys$sysusers:[pourmal.zlib-1_2_3] -$! ccopt = "/float=ieee_float/define=H5_VMS/include=zlib_dir" -$ ccc := cc 'ccopt /include=([-.-.src], [-.lib], [-.-.test]) -$ type sys$input - Creating h5debug -$! -$ cobj= " h5debug " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=h5debug.exe - - h5debug, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5debug -$! -$ type sys$input - Creating h5mkgrp -$! -$ cobj= " h5mkgrp " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=h5mkgrp.exe - - h5mkgrp, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5mkgrp -$! -$ type sys$input - Creating h5repart -$! -$ cobj= " h5repart " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=h5repart.exe - - h5repart, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5repart -$! -$ cobj= " h5repart_gentest " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=h5repart_gentest.exe - - h5repart_gentest, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created h5repart_gentest -$! -$ type sys$input - Creating repart_test -$! -$ cobj= " repart_test " -$! -$ ccc 'cobj -$ type sys$input -$ link/exe=repart_test.exe - - repart_test, - - [-.lib]libh5tools.olb/lib,[-.-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib -$ type sys$input - Created repart_test -$! -$ type sys$input - Done with misc tools compilation -$! -$ exit diff --git a/vms/tools/testfiles/tattr-3.ddl b/vms/tools/testfiles/tattr-3.ddl deleted file mode 100644 index 8907843..0000000 --- a/vms/tools/testfiles/tattr-3.ddl +++ /dev/null @@ -1,13 +0,0 @@ - -############################# -Expected output for 'h5dump --header -a /attr2 --attribute=/attr tattr.h5' -############################# -HDF5 "tattr.h5" { -ATTRIBUTE "/attr2" { - DATATYPE H5T_STD_I32BE - DATASPACE SIMPLE { ( 10 ) / ( 10 ) } -} -ATTRIBUTE "/attr" { -} -} -h5dump error: unable to open attribute "/" diff --git a/vms/tools/testfiles/tdset-2.ddl b/vms/tools/testfiles/tdset-2.ddl deleted file mode 100644 index e6439ae..0000000 --- a/vms/tools/testfiles/tdset-2.ddl +++ /dev/null @@ -1,17 +0,0 @@ - -############################# -Expected output for 'h5dump -H -d dset1 -d /dset2 --dataset=dset3 tdset.h5' -############################# -HDF5 "tdset.h5" { -DATASET "dset1" { - DATATYPE H5T_STD_I32BE - DATASPACE SIMPLE { ( 10, 20 ) / ( 10, 20 ) } -} -DATASET "/dset2" { - DATATYPE H5T_IEEE_F64BE - DATASPACE SIMPLE { ( 30, 20 ) / ( 30, 20 ) } -} -DATASET "dset3" { -} -} -h5dump error: unable to open dataset "dset3" diff --git a/vms/tools/testfiles/tgroup-2.ddl b/vms/tools/testfiles/tgroup-2.ddl deleted file mode 100644 index 120ef2d..0000000 --- a/vms/tools/testfiles/tgroup-2.ddl +++ /dev/null @@ -1,47 +0,0 @@ - -############################# -Expected output for 'h5dump --group=/g2 --group / -g /y tgroup.h5' -############################# -HDF5 "tgroup.h5" { -GROUP "/g2" { - GROUP "g2.1" { - GROUP "g2.1.1" { - } - GROUP "g2.1.2" { - } - GROUP "g2.1.3" { - } - } -} -GROUP "/" { - GROUP "g1" { - GROUP "g1.1" { - } - GROUP "g1.2" { - } - } - GROUP "g2" { - GROUP "g2.1" { - GROUP "g2.1.1" { - } - GROUP "g2.1.2" { - } - GROUP "g2.1.3" { - } - } - } - GROUP "g3" { - GROUP "g3.1" { - } - GROUP "g3.2" { - } - GROUP "g3.3" { - } - GROUP "g3.4" { - } - } -} -GROUP "/y" { -} -} -h5dump error: unable to open group "/y" diff --git a/vms/tools/testfiles/tperror.ddl b/vms/tools/testfiles/tperror.ddl deleted file mode 100644 index 7275907..0000000 --- a/vms/tools/testfiles/tperror.ddl +++ /dev/null @@ -1,9 +0,0 @@ - -############################# -Expected output for 'h5dump -p -d bogus tfcontents1.h5' -############################# -HDF5 "tfcontents1.h5" { -DATASET "bogus" { -} -} -h5dump error: unable to open dataset "bogus" |