From 6f85844982a45c71e7a8a3bbcc3600e11030c3df Mon Sep 17 00:00:00 2001 From: James Laird Date: Fri, 14 Oct 2005 18:16:29 -0500 Subject: [svn-r11567] Purpose: Bug fix Description: Changed the name of a file from the last fix. createnoenc.c is not gen_noencoder.c Solution: This is just a more standard name for the file. Platforms tested: tested in previous check-in; forgot to commit to cvs. --- MANIFEST | 2 +- test/createnoenc.c | 80 ---------------------------------------------------- test/gen_noencoder.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 test/createnoenc.c create mode 100644 test/gen_noencoder.c diff --git a/MANIFEST b/MANIFEST index 1664d50..c8fc978 100644 --- a/MANIFEST +++ b/MANIFEST @@ -628,7 +628,6 @@ ./test/btree2.c ./test/cache.c ./test/cmpd_dset.c -./test/createnoenc.c ./test/dangle.c ./test/deflate.h5 ./test/dsets.c @@ -672,6 +671,7 @@ ./test/gen_old_mtime.c _DO_NOT_DISTRIBUTE_ ./test/gen_new_mtime.c _DO_NOT_DISTRIBUTE_ ./test/gen_new_super.c _DO_NOT_DISTRIBUTE_ +./test/gen_noencoder.c _DO_NOT_DISTRIBUTE_ ./test/pool.c ./test/set_extent.c ./test/sheap.c diff --git a/test/createnoenc.c b/test/createnoenc.c deleted file mode 100644 index 05a2ff1..0000000 --- a/test/createnoenc.c +++ /dev/null @@ -1,80 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * 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://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdf5.h" - -/*------------------------------------------------------------------------- - * Function: main - * - * Purpose: Generates the noencoder.h5 file used to test SZIP without - * an encoder present. - * - * Return: Success: zero - * - * Failure: non-zero - * - * Programmer: James Laird and Nat Furrer - * Thursday, July 1, 2004 - * - * Modifications: - * - *------------------------------------------------------------------------- - */ -main() -{ - hid_t file_id; - hid_t dset_id; - hid_t dcpl_id; - hid_t space_id; - hsize_t dims, maxdims; - int fill = 0; - int write_buf[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - - file_id = H5Fcreate("noencoder.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); - - dims = 10; - maxdims = H5S_UNLIMITED; - space_id = H5Screate_simple(1, &dims, &maxdims); - - dcpl_id = H5Pcreate(H5P_DATASET_CREATE); - H5Pset_chunk(dcpl_id, 1, &dims); - H5Pset_szip(dcpl_id, H5_SZIP_NN_OPTION_MASK, 4); - H5Pset_fill_value(dcpl_id, H5T_NATIVE_INT, &fill); - H5Pset_fill_time(dcpl_id, H5D_FILL_TIME_ALLOC); - - /* Create dataset noencoder_szip_dset.h5 */ - dset_id = H5Dcreate(file_id, "noencoder_szip_dset.h5", H5T_NATIVE_INT, space_id, dcpl_id); - - H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf); - - H5Pclose(dcpl_id); - H5Dclose(dset_id); - - dcpl_id = H5Pcreate(H5P_DATASET_CREATE); - H5Pset_chunk(dcpl_id, 1, &dims); - H5Pset_szip(dcpl_id, H5_SZIP_NN_OPTION_MASK, 4); - H5Pset_shuffle(dcpl_id); - H5Pset_fletcher32(dcpl_id); - H5Pset_fill_value(dcpl_id, H5T_NATIVE_INT, &fill); - H5Pset_fill_time(dcpl_id, H5D_FILL_TIME_ALLOC); - - /* Create dataset noencoder_szip_shuffle_fletcher_dset.h5 */ - dset_id = H5Dcreate(file_id, "noencoder_szip_shuffle_fletcher_dset.h5", H5T_NATIVE_INT, space_id, dcpl_id); - - H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf); - - H5Pclose(dcpl_id); - H5Dclose(dset_id); - H5Sclose(space_id); - H5Fclose(file_id); -} diff --git a/test/gen_noencoder.c b/test/gen_noencoder.c new file mode 100644 index 0000000..05a2ff1 --- /dev/null +++ b/test/gen_noencoder.c @@ -0,0 +1,80 @@ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * 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://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have * + * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#include "hdf5.h" + +/*------------------------------------------------------------------------- + * Function: main + * + * Purpose: Generates the noencoder.h5 file used to test SZIP without + * an encoder present. + * + * Return: Success: zero + * + * Failure: non-zero + * + * Programmer: James Laird and Nat Furrer + * Thursday, July 1, 2004 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +main() +{ + hid_t file_id; + hid_t dset_id; + hid_t dcpl_id; + hid_t space_id; + hsize_t dims, maxdims; + int fill = 0; + int write_buf[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + + file_id = H5Fcreate("noencoder.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + + dims = 10; + maxdims = H5S_UNLIMITED; + space_id = H5Screate_simple(1, &dims, &maxdims); + + dcpl_id = H5Pcreate(H5P_DATASET_CREATE); + H5Pset_chunk(dcpl_id, 1, &dims); + H5Pset_szip(dcpl_id, H5_SZIP_NN_OPTION_MASK, 4); + H5Pset_fill_value(dcpl_id, H5T_NATIVE_INT, &fill); + H5Pset_fill_time(dcpl_id, H5D_FILL_TIME_ALLOC); + + /* Create dataset noencoder_szip_dset.h5 */ + dset_id = H5Dcreate(file_id, "noencoder_szip_dset.h5", H5T_NATIVE_INT, space_id, dcpl_id); + + H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf); + + H5Pclose(dcpl_id); + H5Dclose(dset_id); + + dcpl_id = H5Pcreate(H5P_DATASET_CREATE); + H5Pset_chunk(dcpl_id, 1, &dims); + H5Pset_szip(dcpl_id, H5_SZIP_NN_OPTION_MASK, 4); + H5Pset_shuffle(dcpl_id); + H5Pset_fletcher32(dcpl_id); + H5Pset_fill_value(dcpl_id, H5T_NATIVE_INT, &fill); + H5Pset_fill_time(dcpl_id, H5D_FILL_TIME_ALLOC); + + /* Create dataset noencoder_szip_shuffle_fletcher_dset.h5 */ + dset_id = H5Dcreate(file_id, "noencoder_szip_shuffle_fletcher_dset.h5", H5T_NATIVE_INT, space_id, dcpl_id); + + H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf); + + H5Pclose(dcpl_id); + H5Dclose(dset_id); + H5Sclose(space_id); + H5Fclose(file_id); +} -- cgit v0.12