Commit Graph

1755 Commits

Author SHA1 Message Date
Pedro Vicente Nunes
cb7a01f5ce [svn-r15292] moved h52jpeg to /hl/tools/h52jpeg
tested: linux
2008-06-28 16:06:35 -05:00
Pedro Vicente Nunes
e31678c3a2 [svn-r15291] Implementation of generating more use cases (datasets of several types) for the test generator program and file
Implementation of transforming 2D datasets with integer and float classes to 8bit acceptable by the jpeg library.

tested: windows, linux
2008-06-27 14:15:53 -05:00
Pedro Vicente Nunes
a0dbf6ec46 [svn-r15280] code cleaning (for some reason svn has been duplicating blocks of code) 2008-06-25 16:12:17 -05:00
Pedro Vicente Nunes
88982c9301 [svn-r15279] more code cleaning 2008-06-25 16:08:48 -05:00
Pedro Vicente Nunes
604810e35c [svn-r15278] code cleaning and comments 2008-06-25 16:02:02 -05:00
Pedro Vicente Nunes
301c5fd218 [svn-r15277] added code for reading an image type from the command line
added a new test run for the shell script with image name specified

tested: windows, linux
2008-06-25 15:44:51 -05:00
Pedro Vicente Nunes
640e7a9bab [svn-r15276] added the code for using an image name from the command line
tested: windows, linux
2008-06-25 14:49:31 -05:00
Pedro Vicente Nunes
efc8bb49b3 [svn-r15251] Moved all h5copy testfiles from /tools/testfiles to tools/h5copy/testfiles
tested: linux
2008-06-20 10:44:45 -05:00
Pedro Vicente Nunes
91a0ec7b08 [svn-r15247] Moved all h5repack testfiles from /tools/testfiles to tools/h5repack/testfiles
tested: linux
2008-06-20 09:17:16 -05:00
Pedro Vicente Nunes
096b0127bc [svn-r15246] Changed the shell script to avoid doing a cd $srcdir
The name of the files are now given by its full name relative to $srcdir

To avoid the printing of the complete full path of the test file, that hides
all the other parameters for long paths, the printing of the command line 
is done first in TESTING with the name only of the test file, not its full path 

the printing in the expected output that had the file name was removed as well as 3 tests that tested error messages in which the file name was present

tested: linux (in 2 different build directories relative to $srcdir), solaris
2008-06-19 21:05:11 -05:00
Pedro Vicente Nunes
83ddc834f4 [svn-r15238]
Moved all h5diff testfiles from /tools/testfiles to tools/h5diff/testfiles

Tested: linux, solaris
2008-06-19 10:34:12 -05:00
Pedro Vicente Nunes
b7ef9f5e56 [svn-r15225] added a function that calls the jpeg library and writes a jgeg file for each HDF5 image
tested: windows, linux
2008-06-17 10:32:39 -05:00
Pedro Vicente Nunes
fb81baa62c [svn-r15222] moved the h52jpeg testfiles location from /tools/testfiles to /tools/h52jpeg/testfiles
updated the shell script accordingly

tested: linux
2008-06-16 21:01:24 -05:00
Pedro Vicente Nunes
0df34ad232 [svn-r15219] added a test file and a test script
for now, the test script just calls the tool binary with the command line parameters, with no special
checking of the accuracy of the output contents (jpeg files)

tested: linux
2008-06-16 15:28:52 -05:00
Pedro Vicente Nunes
f5553240b8 [svn-r15217] added a HDF5 file generator program that reads 2 realistic images from ASCII files, a true color and a gray color image
the HDF5 file generated is used by h52jpeg to generate jpeg images

tested: windows
2008-06-16 10:11:44 -05:00
Pedro Vicente Nunes
48007db46b [svn-r15216] added code for the jpeg library to be linked in linux systems
for now, just added "-ljpeg" to the list of libraries, until a permanent solution is added to configure --with-jpeg= that would allow users to specify their own jpeg libary

tested: linux (kagiso, that has a jpeg library installed)
2008-06-16 10:06:27 -05:00
Pedro Vicente Nunes
5ad6d8c34c [svn-r15190] added code to read datasets, concatenate output names
tested: windows
2008-06-10 15:59:30 -05:00
Mike McGreevy
9c6cbe9b10 [svn-r15187] Purpose: Disabling h52jpeg directory from being built while issues surrounding
its location and its dependencies are worked out.

Tested: kagiso
2008-06-10 10:27:57 -05:00
Pedro Vicente Nunes
ff94716199 [svn-r15184] added the configure and Makefile changes to build h52jpeg in unix systems
tested: linux, solaris
2008-06-09 15:20:43 -05:00
Scott Wegner
7a92820e35 [svn-r15183] Purpose: _WIN32 macro cleanup
Description:
As part of our Windows cleanup, we try to remove windows-specific tweaks in the source code.  There are many instances where Windows code is introduces via ifdef's.  We re-evaluate whether they are still required, and found that many of them are not.  Others we change to "feature"-specific code, rather than Windows-specific.

Tested:
VS2005 on WinXP
VS.NET on WinXP
h5committest (kagisopp, smirom, linew)
2008-06-09 13:41:29 -05:00
Pedro Vicente Nunes
2221c969a3 [svn-r15178] added the routine h52jpeg that traverses the file in the same way of h5diff/h5repack
tested: windows
2008-06-09 11:19:58 -05:00
Scott Wegner
532e23b808 [svn-r15150] Purpose: Separate Windows function macro definitions to win32defs.h
Description:
In library code, we try not to use system calls directly, but instead use the HD{function} macro instead.  This way, we can map special versions of the call on particular systems.  Previously, it was all done in H5private.h.  However, in an effort to clean up platform-specific definitions, we move all of the Windows macros into a separate file, win32defs.h.  This way, we can use the non-Posix versions that Visual Studio sends warnings about.

Some macros are set specifically in the platform-specific header files.  Then, any macros left unset will be set by the "default" implementation in H5private.h.

This checkin also cleans up various source files to use the HD* macros when possible.

Tested:
VS2005 on WinXP
VS.NET on WinXP
h5committest (kagiso, linew, smirom)
2008-06-05 13:52:19 -05:00
Pedro Vicente Nunes
671d37e6c5 [svn-r15143]
Fix for #1169
http://bugzilla.hdfgroup.uiuc.edu/show_bug.cgi?id=1169

don't print attributes to stdout when doing binary output
added an attribute to the file run on the binary output test

tested: windows, linux
2008-06-05 09:37:21 -05:00
Quincey Koziol
b75540244f [svn-r15133] Description:
Fixed bug in h5ls that prevented relative group listings (like
"h5ls foo.h5/bar") from working correctly.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.3 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
2008-06-03 19:17:27 -05:00
Quincey Koziol
771bae8888 [svn-r15131] Description:
Finish omnibus chunked dataset I/O refactoring, to separate general
actions on chunked datasets from actions that are specific to using the v1
B-tree index.

	Cleaned up a few bugs and added some additional tests also.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.2 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
2008-06-03 14:44:12 -05:00
Albert Cheng
fc7aea6f7f [svn-r15124] Purpose:
bug fixes.

Description:
Added code to create an empty hdf5 (named h5diff_empty.h5) in order to test
if h5diff compares correctly an empty hdf5 vs. a non-empty one.

Tested:
Tested in kagiso of h5diffgentest itself.
Verified by h5dump that h5diff_empty.h5 was indeed empty.
Then "h5diff h5diff_empty.h5 h5diff_basic1.h5" returned 0 (should have
returned non-zero).
2008-06-02 12:47:30 -05:00
Pedro Vicente Nunes
0838a8ddc7 [svn-r15122] command line parsing and usage
tested: windows
2008-06-02 11:28:14 -05:00
Pedro Vicente Nunes
9178314ee9 [svn-r15117] added repo entries for the h52jpeg test generator program 2008-06-02 10:29:35 -05:00
Pedro Vicente Nunes
2e4611e94e [svn-r15099] location for h52jpeg 2008-05-30 09:05:38 -05:00
Pedro Vicente Nunes
0c40ae2d42 [svn-r15052] Add a test for the 1.6.7 -i infile -o outifle for backward compability
Used the function TOOLTEST  from 1.6.7

Tested: linux
2008-05-21 09:53:53 -05:00
Pedro Vicente Nunes
e0e2b131ea [svn-r15047] bug fix regarding change from -i to -d regarding number of links in indexed format
tested: windows
2008-05-20 15:27:53 -05:00
Pedro Vicente Nunes
449941a28e [svn-r15044] backward compatibility for old -i infile -o outfile options
if these are detected this syntax is used, otherwise the one in usage is used
there was another -i option for 


-i L2, --indexed=L2     Minimum number of links in the indexed format


That was changed to -d


-d L2, --indexed=L2     Minimum number of links in the indexed format


Tested: windows, linux
2008-05-20 14:05:28 -05:00
Albert Cheng
ca94c839d5 [svn-r15036] Bug fix.
Description:
The fortran Makefile.am used HDF_FORTRAN to indicate it is part of the
Fortran API source so that conclude.am will give fortran api prefix in the
test output.  The symbox HDF_FORTRAN is also used in configure for a different
purpose (indicated --enable-fortran). They conflicted.
Similar problem for the symbol HDF_CXX.

Solution:
Changed all the involved Makefile.am to use "FORTRAN_API" instead. It is
a more appropriate name.  Same for CXX_API.

Along the way, discovered that the Makefile.am of hl/fortran/test and
hl/cxx/test did not have those symbols at all.  Added them in.

Platform tested:
Kagiso only. It is a trivia change.
2008-05-19 00:06:51 -05:00
Mike McGreevy
389cc309c5 [svn-r15007] Purpose: configure cleanup
Description: cleaning up configure related to removal of --disable-hsizet
             flag, which we no longer support.

Tested: kagiso
2008-05-15 11:42:03 -05:00
Albert Cheng
7b7f10a444 [svn-r15003] Purpose:
Improvement.

Description:
src/libhdf5.settings was the initial configure summary and is installed.
Then configure is changed to dump a summary of the configure settings to
the output and also append it to src/libhdf5.settings.  That created
two different output formats and duplicated information.  This is the
initial attempt to clean up this confusion and unify the output format.

It is decided to use the src/libhdf5.settings template as the unified means.
This requires more macros symbols be defined. The following symbols are
all related to generating the src/libhdf5.settings file.

AC_SUBST(EXTERNAL_FILTERS)
AC_SUBST(MPE) MPE=no
AC_SUBST(STATIC_EXEC) STATIC_EXEC=no
AC_SUBST(HDF_FORTRAN) HDF_FORTRAN=no
AC_SUBST(FC) HDF_FORTRAN=no
AC_SUBST(HDF_CXX) HDF_CXX=no
AC_SUBST(CXX) HDF_CXX=no
AC_SUBST(HDF5_HL) HDF5_HL=yes
AC_SUBST(GPFS) GPFS=no
AC_SUBST(LINUX_LFS) LINUX_LFS=no
AC_SUBST(INSTRUMENT) INSTRUMENT=no
AC_SUBST(CODESTACK) CODESTACK=no
AC_SUBST(HAVE_DMALLOC) HAVE_DMALLOC=no
AC_SUBST(DIRECT_VFD) DIRECT_VFD=no
AC_SUBST(THREADSAFE) THREADSAFE=no
AC_SUBST(STATIC_SHARED)
AC_SUBST(enable_shared)
AC_SUBST(enable_static)
AC_SUBST(UNAME_INFO) UNAME_INFO=`uname -a`

The src/libhdf5.settings.in has CONDITIONAL's added to it too.  The
untrue conditions turned into a "#" and these lines are cleaned by the 
post processing script.

Platform tested:
h5committest on kagiso, smirom and linew.
2008-05-15 00:12:00 -05:00
Pedro Vicente Nunes
cfd4bf26c4 [svn-r14977] update comments, formatting
tested: windows, linux
2008-05-12 15:10:42 -05:00
Pedro Vicente Nunes
ed8882c52d [svn-r14976] Support for external links follow up. The format is to print the target object as part of TARGETPATH, noted with some extra indentation
The previous printing of 
LINKCLASS 64
was removed

HDF5 "textlinksrc.h5" {
GROUP "/" {
   EXTERNAL_LINK "ext_link1" {
      TARGETFILE "textlinktar.h5"
      TARGETPATH "dset"
         DATASET "dset" {
            DATATYPE  H5T_STD_I32LE
            DATASPACE  SIMPLE { ( 6 ) / ( 6 ) }
            DATA {
            (0): 1, 2, 3, 4, 5, 6
            }
         }
   }
}
}

There is no script test for this behavior so far, because test script uses complete paths that vary from test to test, making not possible to define a valid TARGETFILE in the file

tested: windows, linux, solaris
2008-05-12 14:32:13 -05:00
Pedro Vicente Nunes
bfe4775091 [svn-r14937] fix typo in comment 2008-05-06 11:16:17 -05:00
Pedro Vicente Nunes
5fffde0c1c [svn-r14935] correct an error in the usage text
tested: windows, linux, solaris
2008-05-05 15:31:21 -05:00
Pedro Vicente Nunes
26d880217b [svn-r14934] Add a test for the floating point user defined printf format
Usage is 

-m T, --format=T

Where T - is a string containing the floating point format, e.g '%.3f'

The test consists of writing a number with 7 fractional digits (default precision display of %f is 6 digits) and have the 7 digits displayed with 

-m %.7f fpformat.h5

Tested: windows, linux, solaris

Note: the output file was generated in linux, it may be possible that platforms other than the ones tested have a different representation of the number
2008-05-05 15:06:22 -05:00
Mike McGreevy
5bd2405c11 [svn-r14933] Purpose: Updating HDF5 to use automake 1.10.1 and libtool 2.2.2
Description: Applying update to autotools that was applied to 1.8 a couple
             of weeks ago to the trunk.

             Updated bin/reconfigure script to reflect the new versions of 
             libtool and automake in the /home1/packages/ directory.

             Rearranged configure.in script. When using libtool 2.2.2, the
             libtool script doesn't generate until later in the configuration
             process, so I had to move a test that parsed through the libtool
             script to a point after where it was actually being generated.

             Ran libtoolize on the project, and ran bin/reconfigure to
             regenerate configure and Makefile.in's throughout.

Tested:      kagiso, smirom, linew (h5committest)
2008-05-05 13:35:55 -05:00
Pedro Vicente Nunes
5b99eac51d [svn-r14913] Introduced a compression ratio = uncompressed size / compressed size
in the printing of the compression with 3 digits of precision per hdf-forum NASA developers suggestion

tested: windows, linux
2008-05-01 15:13:17 -05:00
Pedro Vicente Nunes
7a5edc075a [svn-r14905] Introduced a ratio formula compression ratio = uncompressed size / compressed size
in the printing of the compression with 3 digits of precision per hdf-forum NASA developers suggestion

tested: windows, linux, solaris
2008-05-01 11:45:32 -05:00
Scot Breitenfeld
aec106e324 [svn-r14903] Undoing change committed in r14902. 2008-04-30 14:51:13 -05:00
Scot Breitenfeld
5773fd34bc [svn-r14902] Merged fortran_1_8 branch changes r14505:14901 into the trunk. New fortran wrappers added. 2008-04-30 14:23:26 -05:00
Pedro Vicente Nunes
0138995d1c [svn-r14893] fix typo in comment 2008-04-29 13:16:42 -05:00
Pedro Vicente Nunes
6b41367ac6 [svn-r14892] RFC display compression ratio in h5dump
Here's the current behavior of h5dump regarding the printing of the dataset creation property list

For example

./h5dump -H -p -d filters

HDF5 "tfilters.h5" {
DATASET "deflate" {
   DATATYPE  H5T_STD_I32LE
   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
   STORAGE_LAYOUT {
      CHUNKED ( 10, 5 )
      SIZE 385 
    }
   FILTERS {
      COMPRESSION DEFLATE { LEVEL 9 }
   }
   FILLVALUE {
      FILL_TIME H5D_FILL_TIME_IFSET
      VALUE  0
   }
   ALLOCATION_TIME {
      H5D_ALLOC_TIME_INCR
   }
}
}


The proposed behavior is to add this information after SIZE

SIZE 385 (51.9%COMPRESSION)

That percentage is obtained trough

Per = (b-a) / a

Where a = theoretical size obtained by multiplying datum size times number of elements
b =  size obtained with H5Dget_storage_size

The final print would look like

HDF5 "tfilters.h5" {
DATASET "deflate" {
   DATATYPE  H5T_STD_I32LE
   DATASPACE  SIMPLE { ( 20, 10 ) / ( 20, 10 ) }
   STORAGE_LAYOUT {
      CHUNKED ( 10, 5 )
      SIZE 385 (51.9%COMPRESSION)
    }
   FILTERS {
      COMPRESSION DEFLATE { LEVEL 9 }
   }
   FILLVALUE {
      FILL_TIME H5D_FILL_TIME_IFSET
      VALUE  0
   }
   ALLOCATION_TIME {
      H5D_ALLOC_TIME_INCR
   }
}
}

tested: windows, linux, solaris
2008-04-29 13:02:05 -05:00
Pedro Vicente Nunes
c83dbd9c18 [svn-r14792] bug fix: #1106 h5dump -b will dump ASCII values for datasets after the first one. One variable that controls the binary output was incorrectly reset to zero after a binary output was done a first time. The effect was that on cases of several datasets, the ones after the first were not binary written. Eliminated the resetting of that variable and tested a file with several datasets. Modified the test file so that it is easier to test with the tool binread, that reads the binary output of h5dump.
tested: windows, linux
2008-04-03 16:07:27 -05:00
Pedro Vicente Nunes
6763f7c882 [svn-r14735] make 1.8 and 1.6 code equal or similar
formatted code
tested: windows, linux
2008-03-13 13:44:35 -05:00
Pedro Vicente Nunes
7d4ba6f74e [svn-r14733] make 1.8 and 1.6 code equal or similar
formatted code
bug fix: the 1.6 branch did not have a test for the existence of long double type on print_type (print name of datatype)
tested: windows, linux
2008-03-13 10:24:02 -05:00