From 4e23c807585ed705173f32e374884a46e4a4f2dd Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 7 Jul 2003 14:02:46 -0500 Subject: [svn-r7181] Purpose: Version update Description: Removed 1.4 compatibility code in the library. Platforms tested: FreeBSD 4.8 (sleipnir) h5committest --- c++/src/H5DxferProp.cpp | 54 ----------- c++/src/H5DxferProp.h | 16 ---- c++/src/H5FaccProp.cpp | 20 ----- c++/src/H5FaccProp.h | 9 -- c++/src/H5FcreatProp.cpp | 22 ----- c++/src/H5FcreatProp.h | 9 -- c++/test/dsets.cpp | 4 - c++/test/tfile.cpp | 12 --- doc/html/RM_H5P.html | 126 -------------------------- doc/html/RM_H5R.html | 51 +---------- fortran/src/H5Pf.c | 76 ---------------- fortran/src/H5Pff.f90 | 122 ------------------------- fortran/src/H5f90proto.h | 8 -- perform/chunk.c | 12 --- perform/pio_engine.c | 4 - src/H5D.c | 14 --- src/H5Dprivate.h | 14 --- src/H5FDlog.c | 49 ---------- src/H5FDlog.h | 4 - src/H5FDmpiposix.c | 119 ------------------------- src/H5FDmpiposix.h | 5 -- src/H5G.c | 30 ------- src/H5Gpublic.h | 20 ----- src/H5Pdxpl.c | 199 ----------------------------------------- src/H5Pfapl.c | 228 ----------------------------------------------- src/H5Pfcpl.c | 112 ----------------------- src/H5Ppublic.h | 44 --------- src/H5R.c | 114 ------------------------ src/H5Rpublic.h | 5 -- src/H5Spublic.h | 4 - src/H5Sselect.c | 34 ------- src/H5Z.c | 51 ----------- src/H5Zpublic.h | 5 -- src/H5config.h.in | 10 ++- test/dsets.c | 32 ------- test/h5test.c | 13 --- test/ntypes.c | 5 -- test/tfile.c | 8 -- test/titerate.c | 20 +++-- test/tmisc.c | 4 - test/trefer.c | 30 ------- test/tselect.c | 13 --- test/unlink.c | 8 -- testpar/t_dset.c | 8 -- testpar/t_ph5basic.c | 18 ---- testpar/testphdf5.c | 4 - 46 files changed, 21 insertions(+), 1748 deletions(-) diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp index e663eeb..8a7b06c 100644 --- a/c++/src/H5DxferProp.cpp +++ b/c++/src/H5DxferProp.cpp @@ -33,30 +33,6 @@ DSetMemXferPropList::DSetMemXferPropList() : PropList( H5P_DATASET_XFER) {} // Copy constructor: makes a copy of the original DSetMemXferPropList object; DSetMemXferPropList::DSetMemXferPropList( const DSetMemXferPropList& orig ) : PropList( orig ) {} -#ifdef H5_WANT_H5_V1_4_COMPAT -// Sets type conversion and background buffers -void DSetMemXferPropList::setBuffer( hsize_t size, void* tconv, void* bkg ) const -{ - herr_t ret_value = H5Pset_buffer( id, size, tconv, bkg ); - if( ret_value < 0 ) - { - throw PropListIException("DSetMemXferPropList::setBuffer", - "H5Pset_buffer failed"); - } -} - -// Reads buffer settings -hsize_t DSetMemXferPropList::getBuffer( void** tconv, void** bkg ) const -{ - hsize_t buffer_size = H5Pget_buffer( id, tconv, bkg ); - if( buffer_size == 0 ) - { - throw PropListIException("DSetMemXferPropList::getBuffer", - "H5Pget_buffer returned 0 for buffer size - failure"); - } - return( buffer_size ); -} -#else /* H5_WANT_H5_V1_4_COMPAT */ // Sets type conversion and background buffers void DSetMemXferPropList::setBuffer( size_t size, void* tconv, void* bkg ) const { @@ -79,7 +55,6 @@ size_t DSetMemXferPropList::getBuffer( void** tconv, void** bkg ) const } return( buffer_size ); } -#endif /* H5_WANT_H5_V1_4_COMPAT */ // Sets the dataset transfer property list status to TRUE or FALSE void DSetMemXferPropList::setPreserve( bool status ) const @@ -107,35 +82,6 @@ bool DSetMemXferPropList::getPreserve() const } } -#ifdef H5_WANT_H5_V1_4_COMPAT -// Indicates whether to cache hyperslab blocks during I/O -void DSetMemXferPropList::setHyperCache( bool cache, unsigned limit ) const -{ - herr_t ret_value = H5Pset_hyper_cache( id, cache, limit ); - if( ret_value < 0 ) - { - throw PropListIException("DSetMemXferPropList::setHyperCache", - "H5Pset_hyper_cache failed"); - } -} - -// Returns information regarding the caching of hyperslab blocks during I/O -void DSetMemXferPropList::getHyperCache( bool& cache, unsigned& limit ) const -{ - unsigned temp_cache; // C routine takes hid_t, unsigned*, unsigned* - herr_t ret_value = H5Pget_hyper_cache( id, &temp_cache, &limit ); - if( ret_value < 0 ) - { - throw PropListIException("DSetMemXferPropList::getHyperCache", - "H5Pget_hyper_cache failed"); - } - if( temp_cache > 0 ) - cache = true; - else - cache = false; -} -#endif /* H5_WANT_H5_V1_4_COMPAT */ - // Sets B-tree split ratios for a dataset transfer property list void DSetMemXferPropList::setBtreeRatios( double left, double middle, double right ) const { diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h index e071870..036bbb1 100644 --- a/c++/src/H5DxferProp.h +++ b/c++/src/H5DxferProp.h @@ -30,19 +30,11 @@ class H5_DLLCPP DSetMemXferPropList : public PropList { // Copy constructor: creates a copy of a DSetMemXferPropList object DSetMemXferPropList( const DSetMemXferPropList& orig ); -#ifdef H5_WANT_H5_V1_4_COMPAT - // Sets type conversion and background buffers - void setBuffer( hsize_t size, void* tconv, void* bkg ) const; - - // Reads buffer settings - hsize_t getBuffer( void** tconv, void** bkg ) const; -#else /* H5_WANT_H5_V1_4_COMPAT */ // Sets type conversion and background buffers void setBuffer( size_t size, void* tconv, void* bkg ) const; // Reads buffer settings size_t getBuffer( void** tconv, void** bkg ) const; -#endif /* H5_WANT_H5_V1_4_COMPAT */ // Sets the dataset transfer property list status to TRUE or FALSE void setPreserve( bool status ) const; @@ -50,14 +42,6 @@ class H5_DLLCPP DSetMemXferPropList : public PropList { // Checks status of the dataset transfer property list bool getPreserve() const; -#ifdef H5_WANT_H5_V1_4_COMPAT - // Indicates whether to cache hyperslab blocks during I/O - void setHyperCache( bool cache, unsigned limit = 0 ) const; - - // Returns information regarding the caching of hyperslab blocks during I/O - void getHyperCache( bool& cache, unsigned& limit ) const; -#endif /* H5_WANT_H5_V1_4_COMPAT */ - // Sets B-tree split ratios for a dataset transfer property list void setBtreeRatios( double left, double middle, double right ) const; diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp index 1e33ce3..465c79a 100644 --- a/c++/src/H5FaccProp.cpp +++ b/c++/src/H5FaccProp.cpp @@ -203,25 +203,6 @@ void FileAccPropList::getMpi( MPI_Comm& comm, MPI_Info& info ) const } */ -#ifdef H5_WANT_H5_V1_4_COMPAT -void FileAccPropList::setCache( int mdc_nelmts, int rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const -{ - herr_t ret_value = H5Pset_cache( id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 ); - if( ret_value < 0 ) - { - throw PropListIException("FileAccPropList::setCache", "H5Pset_cache failed"); - } -} - -void FileAccPropList::getCache( int& mdc_nelmts, int& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const -{ - herr_t ret_value = H5Pget_cache( id, &mdc_nelmts, &rdcc_nelmts, &rdcc_nbytes, &rdcc_w0 ); - if( ret_value < 0 ) - { - throw PropListIException("FileAccPropList::getCache", "H5Pget_cache failed"); - } -} -#else /* H5_WANT_H5_V1_4_COMPAT */ void FileAccPropList::setCache( int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const { herr_t ret_value = H5Pset_cache( id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0 ); @@ -239,7 +220,6 @@ void FileAccPropList::getCache( int& mdc_nelmts, size_t& rdcc_nelmts, size_t& rd throw PropListIException("FileAccPropList::getCache", "H5Pget_cache failed"); } } -#endif /* H5_WANT_H5_V1_4_COMPAT */ void FileAccPropList::setGcReferences( unsigned gc_ref ) const { diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h index c55d70d..91f2222 100644 --- a/c++/src/H5FaccProp.h +++ b/c++/src/H5FaccProp.h @@ -75,21 +75,12 @@ class H5_DLLCPP FileAccPropList : public PropList { // family driver and retrieves the member's file access property list. // bool getFamily( hsize_t& memb_size, FileAccPropList& memb_plist ) const; -#ifdef H5_WANT_H5_V1_4_COMPAT - // Sets the meta data cache and raw data chunk cache parameters. - void setCache( int mdc_nelmts, int rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const; - - // Retrieves maximum sizes of data caches and the preemption - // policy value. - void getCache( int& mdc_nelmts, int& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const; -#else /* H5_WANT_H5_V1_4_COMPAT */ // Sets the meta data cache and raw data chunk cache parameters. void setCache( int mdc_nelmts, size_t rdcc_nelmts, size_t rdcc_nbytes, double rdcc_w0 ) const; // Retrieves maximum sizes of data caches and the preemption // policy value. void getCache( int& mdc_nelmts, size_t& rdcc_nelmts, size_t& rdcc_nbytes, double& rdcc_w0 ) const; -#endif /* H5_WANT_H5_V1_4_COMPAT */ // Sets the low-level driver to split meta data from raw data. // void setSplit( FileAccPropList& meta_plist, FileAccPropList& raw_plist, diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp index 404aca2..c59aa11 100644 --- a/c++/src/H5FcreatProp.cpp +++ b/c++/src/H5FcreatProp.cpp @@ -86,27 +86,6 @@ void FileCreatPropList::getSizes( size_t& sizeof_addr, size_t& sizeof_size ) con } } -#ifdef H5_WANT_H5_V1_4_COMPAT -void FileCreatPropList::setSymk( int ik, int lk ) const -{ - herr_t ret_value = H5Pset_sym_k( id, ik, lk ); - if( ret_value < 0 ) - { - throw PropListIException("FileCreatPropList::setSymk", - "H5Pset_sym_k failed"); - } -} - -void FileCreatPropList::getSymk( int& ik, int& lk ) const -{ - herr_t ret_value = H5Pget_sym_k( id, &ik, &lk ); - if( ret_value < 0 ) - { - throw PropListIException("FileCreatPropList::getSymk", - "H5Pget_sym_k failed"); - } -} -#else /* H5_WANT_H5_V1_4_COMPAT */ void FileCreatPropList::setSymk( int ik, unsigned lk ) const { herr_t ret_value = H5Pset_sym_k( id, ik, lk ); @@ -126,7 +105,6 @@ void FileCreatPropList::getSymk( int& ik, unsigned& lk ) const "H5Pget_sym_k failed"); } } -#endif /* H5_WANT_H5_V1_4_COMPAT */ void FileCreatPropList::setIstorek( int ik ) const { diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h index 79a7e25..d1ec817 100644 --- a/c++/src/H5FcreatProp.h +++ b/c++/src/H5FcreatProp.h @@ -47,21 +47,12 @@ class H5_DLLCPP FileCreatPropList : public PropList { // file according to this file creation property list. void getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const; -#ifdef H5_WANT_H5_V1_4_COMPAT - // Sets the size of parameters used to control the symbol table nodes. - void setSymk( int int_nodes_k, int leaf_nodes_k ) const; - - // Retrieves the size of the symbol table B-tree 1/2 rank and the - // symbol table leaf node 1/2 size. - void getSymk( int& int_nodes_k, int& leaf_nodes_k ) const; -#else /* H5_WANT_H5_V1_4_COMPAT */ // Sets the size of parameters used to control the symbol table nodes. void setSymk( int int_nodes_k, unsigned leaf_nodes_k ) const; // Retrieves the size of the symbol table B-tree 1/2 rank and the // symbol table leaf node 1/2 size. void getSymk( int& int_nodes_k, unsigned& leaf_nodes_k ) const; -#endif /* H5_WANT_H5_V1_4_COMPAT */ // Sets the size of parameter used to control the B-trees for // indexing chunked datasets. diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index b92381a..0d58cd0 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -648,11 +648,7 @@ test_compression(H5File& file) */ TESTING("compression (app-defined method)"); -#ifdef H5_WANT_H5_V1_4_COMPAT - if (H5Zregister (H5Z_FILTER_BOGUS, "bogus", bogus)<0) goto error; -#else /* H5_WANT_H5_V1_4_COMPAT */ if (H5Zregister (H5Z_BOGUS)<0) goto error; -#endif /* H5_WANT_H5_V1_4_COMPAT */ if (H5Pset_filter (dscreatplist.getId(), H5Z_FILTER_BOGUS, 0, 0, NULL)<0) goto error; dscreatplist.setFilter (H5Z_FILTER_BOGUS, 0, 0, NULL); diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 82d7338..37cc5e1 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -153,11 +153,7 @@ test_file_create(void) VERIFY(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes"); int iparm1; /*file-creation parameters */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int iparm2; /*file-creation parameters */ -#else /* H5_WANT_H5_V1_4_COMPAT */ unsigned iparm2; /*file-creation parameters */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F1_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F1_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -207,11 +203,7 @@ test_file_create(void) VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); int iparm1; /*file-creation parameters */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int iparm2; /*file-creation parameters */ -#else /* H5_WANT_H5_V1_4_COMPAT */ unsigned iparm2; /*file-creation parameters */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ tmpl1->getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -294,11 +286,7 @@ test_file_open(void) VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); int iparm1; /*file-creation parameters */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int iparm2; /*file-creation parameters */ -#else /* H5_WANT_H5_V1_4_COMPAT */ unsigned iparm2; /*file-creation parameters */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); diff --git a/doc/html/RM_H5P.html b/doc/html/RM_H5P.html index 661325b..65ec152 100644 --- a/doc/html/RM_H5P.html +++ b/doc/html/RM_H5P.html @@ -233,8 +233,6 @@ which require many different parameters to be easily manipulated.
  • H5Pset_edc_check
  • H5Pget_edc_check
  • H5Pset_filter_callback -
  • H5Pset_hyper_cache * -
  • H5Pget_hyper_cache *
  • H5Pset_hyper_vector_size
  • H5Pget_hyper_vector_size
  • H5Pset_btree_ratios @@ -322,7 +320,6 @@ See further notes in the description of each function.
  • H5Pget_filter
  • H5Pget_filter_by_id
  • H5Pget_gc_references -
  • H5Pget_hyper_cache *
  • H5Pget_hyper_vector_size
  • H5Pget_istore_k
  • H5Pget_layout @@ -383,7 +380,6 @@ See further notes in the description of each function.
  • H5Pset_filter_callback
  • H5Pset_fletcher32
  • H5Pset_gc_references -
  • H5Pset_hyper_cache *
  • H5Pset_hyper_vector_size
  • H5Pset_istore_k
  • H5Pset_layout @@ -575,8 +571,6 @@ facilitate moving easily between them.
  • h5pget_preserve_f
  • h5pset_edc_check_f
  • h5pget_edc_check_f -
  • h5pset_hyper_cache_f -
  • h5pget_hyper_cache_f
  • h5pset_hyper_vector_size_f
  • h5pget_hyper_vector_size_f
  • h5pset_btree_ratios_f @@ -4724,126 +4718,6 @@ END LIBRARY-SET OPTION TAGS -->
    -
    Name: H5Pset_hyper_cache -
    Signature: -
    herr_t H5Pset_hyper_cache(hid_t plist, - unsigned cache, - unsigned limit - ) -
    Purpose: -
    Indicates whether to cache hyperslab blocks during I/O. -
    Description: -
    [NOTE: - - This function is deprecated in HDF5 Release 1.6 - and will eventually be removed from the HDF5 distribution. - It is provided in this release only to enable backward compatibility - with HDF5 Releases 1.4.x - and is enabled only if the HDF5 library is configured - with the flag H5_WANT_H5_V1_4_COMPAT; - the function is not enabled in the binaries distributed by NCSA. - ] -

    - Given a dataset transfer property list, H5Pset_hyper_cache - indicates whether to cache hyperslab blocks during I/O, - a process which can significantly increase I/O speeds. -

    - When working with hyperslab selections, it is possible to - significantly speed up I/O operations by retrieving an - entire hyperslab from the file in one operation and - caching it in memory. - The cache parameter specifies whether to turn - caching on for hyperslab I/O operations. - If cache is set to 1, - caching is turned on; - if set to 0, caching is turned off. -

    - The parameter limit sets the maximum size of the - hyperslab block to cache. If a block is smaller than that limit, - it may still not be cached if no memory is available. - Setting limit to 0 (zero) indicates - no limitation on the size of block to attempt to cache. -

    - The default is to cache blocks with no limit on block size - for serial I/O and to not cache blocks for parallel I/O. -

    Parameters: -
    -
    hid_t plist -
    IN: Dataset transfer property list identifier. -
    unsigned cache -
    IN: A flag indicating whether caching is to be - set to on (1) or off (0). -
    unsigned limit -
    IN: Maximum size of the hyperslab block to cache. - 0 (zero) indicates no limit. -
    -
    Returns: -
    Returns a non-negative value if successful; - otherwise returns a negative value. -
    Non-C API(s): -
    - -
    - - -
    -
    -
    Name: H5Pget_hyper_cache -
    Signature: -
    herr_t H5Pget_hyper_cache(hid_t plist, - unsigned *cache, - unsigned *limit - ) -
    Purpose: -
    [NOTE: - - This function is deprecated in HDF5 Release 1.6 - and will eventually be removed from the HDF5 distribution. - It is provided in this release only to enable backward compatibility - with HDF5 Releases 1.4.x - and is enabled only if the HDF5 library is configured - with the flag H5_WANT_H5_V1_4_COMPAT; - the function is not enabled in the binaries distributed by NCSA. - ] -

    - Returns information regarding the caching of hyperslab blocks during I/O. -

    Description: -
    Given a dataset transfer property list, H5Pget_hyper_cache - returns instructions regarding the caching of hyperslab blocks during I/O. - These parameters are set with the H5Pset_hyper_cache function. -
    Parameters: -
    -
    hid_t plist -
    IN: Dataset transfer property list identifier. -
    unsigned *cache -
    OUT: A flag indicating whether caching is - set to on (1) or off (0). -
    unsigned *limit -
    OUT: Maximum size of the hyperslab block to cache. - 0 (zero) indicates no limit. -
    -
    Returns: -
    Returns a non-negative value if successful; - otherwise returns a negative value. -
    Non-C API(s): -
    - -
    - - - - - -
    -
    Name: H5Pset_hyper_vector_size
    Signature:
    herr_t H5Pset_hyper_vector_size(hid_t dxpl_id, diff --git a/doc/html/RM_H5R.html b/doc/html/RM_H5R.html index 4c4fece..5c2c4bd 100644 --- a/doc/html/RM_H5R.html +++ b/doc/html/RM_H5R.html @@ -83,7 +83,6 @@ to specific objects and data regions in an HDF5 file.
      @@ -110,7 +109,6 @@ See further notes in the description of each function.
    • H5Rget_obj_type -
    • H5Rget_object_type *        @@ -145,7 +143,6 @@ facilitate moving easily between them.
        @@ -375,53 +372,7 @@ facilitate moving easily between them.
        Returns an object type as defined in H5Gpublic.h if successful; otherwise returns H5G_UNKNOWN.
        Non-C API(s): -
        - -
    - - -
    -
    -
    Name: H5Rget_object_type -
    Signature: -
    int H5Rget_object_type(hid_t id, - void *ref - ) -
    Purpose: -
    Retrieves the type of object that an object reference points to. -
    Description: -
    [NOTE: - - This function is provided only to enable backward compatibility - with HDF5 Releases 1.4.x. - This function is enabled only if the HDF5 library is configured - with the flag H5_WANT_H5_V1_4_COMPAT and is not - enabled in the binaries distributed by NCSA. - This function has been replaced in Release 1.6 by the function - H5Rget_obj_type - and will eventually be deleted from the HDF5 distribution.] -

    -

    Given a reference to an object ref, - H5Rget_object_type returns the - type of the object pointed to. -
    Parameters: -
    -
    hid_t id, -
    IN: The dataset containing the reference object or - the location identifier of the object that the dataset - is located within. -
    void *ref -
    IN: Reference to query. -
    -
    Returns: -
    Returns an object type as defined in H5Gpublic.h; - otherwise returns H5G_UNKNOWN. -
    Non-C API(s): -