summaryrefslogtreecommitdiffstats
path: root/testpar/testphdf5.h
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2012-10-30 16:28:17 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2012-10-30 16:28:17 (GMT)
commit51c5bf8aa76cf378ccd59b02247fb7cd0d9b3eaf (patch)
treeb644feadd993e11c96121d9e05b12446ca4fd099 /testpar/testphdf5.h
parent57d23e506251e01367c41c741bbfed86dff69ccc (diff)
downloadhdf5-51c5bf8aa76cf378ccd59b02247fb7cd0d9b3eaf.zip
hdf5-51c5bf8aa76cf378ccd59b02247fb7cd0d9b3eaf.tar.gz
hdf5-51c5bf8aa76cf378ccd59b02247fb7cd0d9b3eaf.tar.bz2
[svn-r22992] Purpose:
HDFFV-8146 - Remove "multi-chunk IO without optimization" sub-feature from MPI I/O optimization for chunked dataset feature Description: The “multi-chunk IO without optimization” feature is removed and made the related xfer property (H5FD_MPIO_CHUNK_MULTI_IO) go directly to “multi-chunk-io” feature. Also update/fix/cleanup testings (chunk collective IO and actual chunk opt mode) accordingly. Tested: jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), fred (mac64-LE), Windows (32-LE cmake), cmake (jam)
Diffstat (limited to 'testpar/testphdf5.h')
-rw-r--r--testpar/testphdf5.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/testpar/testphdf5.h b/testpar/testphdf5.h
index 2219dc9..fa83697 100644
--- a/testpar/testphdf5.h
+++ b/testpar/testphdf5.h
@@ -169,11 +169,10 @@ enum H5TEST_COLL_CHUNK_API {API_NONE=0,API_LINK_HARD,
#define TEST_ACTUAL_IO_MULTI_CHUNK_COL 3
#define TEST_ACTUAL_IO_MULTI_CHUNK_MIX 4
#define TEST_ACTUAL_IO_MULTI_CHUNK_MIX_DISAGREE 5
-#define TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_IND 6
-#define TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_COL 7
-#define TEST_ACTUAL_IO_MULTI_CHUNK_NO_OPT_MIX_DISAGREE 8
-#define TEST_ACTUAL_IO_LINK_CHUNK 9
-#define TEST_ACTUAL_IO_CONTIGUOUS 10
+#define TEST_ACTUAL_IO_DIRECT_MULTI_CHUNK_IND 6
+#define TEST_ACTUAL_IO_DIRECT_MULTI_CHUNK_COL 7
+#define TEST_ACTUAL_IO_LINK_CHUNK 8
+#define TEST_ACTUAL_IO_CONTIGUOUS 9
/* Definitions of the selection mode for the no_collective_cause_tests function. */
#define TEST_COLLECTIVE 0x001