Skip to content

Commit 08384ab

Browse files
mattjalamattjala
committed
Correct macro names
1 parent dd76494 commit 08384ab

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

‎tools/test/h5dump/CMakeTests.cmake‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,12 +1271,20 @@ ADD_H5_TEST (tldouble RESULT_CODE 0 --enable-error-stack TARGET_FILE tldouble.h5
12711271
ADD_H5_TEST (tldouble_scalar RESULT_CODE 0 -p --enable-error-stack TARGET_FILE tldouble_scalar.h5)
12721272

12731273
# Add tests for _Float16 type
1274-
ADD_H5_TEST (tfloat16 RESULT_CODE 0 --enable-error-stack TARGET_FILE tfloat16.h5)
1275-
ADD_H5_TEST (tfloat16_be RESULT_CODE 0 --enable-error-stack TARGET_FILE tfloat16_be.h5)
1274+
# VOL testing must generate the F16 files, which it can only do if F16 is enabled
1275+
# - so mark these tests as Native only if Float16 isn't enabled.
1276+
if (${${HDF_PREFIX}_HAVE__FLOAT16})
1277+
set (F16_NATIVE_ONLY "")
1278+
else ()
1279+
set (F16_NATIVE_ONLY "NATIVE_ONLY")
1280+
endif ()
1281+
1282+
ADD_H5_TEST (tfloat16 RESULT_CODE 0 --enable-error-stack TARGET_FILE tfloat16.h5 ${F16_NATIVE_ONLY})
1283+
ADD_H5_TEST (tfloat16_be RESULT_CODE 0 --enable-error-stack TARGET_FILE tfloat16_be.h5 ${F16_NATIVE_ONLY})
12761284

12771285
# Add tests for bfloat16 type
1278-
ADD_H5_TEST (tbfloat16 RESULT_CODE 0 --enable-error-stack TARGET_FILE tbfloat16.h5)
1279-
ADD_H5_TEST (tbfloat16_be RESULT_CODE 0 --enable-error-stack TARGET_FILE tbfloat16_be.h5)
1286+
ADD_H5_TEST (tbfloat16 RESULT_CODE 0 --enable-error-stack TARGET_FILE tbfloat16.h5 ${F16_NATIVE_ONLY})
1287+
ADD_H5_TEST (tbfloat16_be RESULT_CODE 0 --enable-error-stack TARGET_FILE tbfloat16_be.h5 ${F16_NATIVE_ONLY})
12801288

12811289
# Add tests for complex numbers. For portability, use a fixed floating-point
12821290
# precision and skip dumping of the "long double _Complex" dataset. The "long

‎tools/test/h5dump/h5dumpgentest.c‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,19 @@
119119
#define FILE96 "tcomplex_be.h5"
120120
#endif
121121

122-
#define FILE_FLOAT16 "tbfloat16.h5"
123-
#define FILE_FLOAT16_BE "tbfloat16_be.h5"
124-
125-
#define FILE_REFER_COMPAT "trefer_compat.h5"
126-
#define FILE_REFER_GRP "trefer_grp.h5"
127-
#define FILE_REFER_OBJ_DEL "trefer_obj_del.h5"
128-
#define FILE_REFER_OBJ "trefer_obj.h5"
129-
#define FILE_REFER_PARAM "trefer_param.h5"
130-
#define FILE_REFER_REG "trefer_reg.h5"
131-
#define FILE_REFER_REG_1D "trefer_reg_1d.h5"
132-
133-
#define FILE_REFER_ATTR "trefer_attr.h5"
134-
#define FILE_ATTR4_BE "tattr4_be.h5"
135-
#define FILE_NO_SUBSET "tno-subset.h5"
136-
#define FILE_TVMS "tvms.h5"
122+
#define FILE97 "tbfloat16.h5"
123+
#define FILE98 "tbfloat16_be.h5"
124+
#define FILE99 "trefer_attr.h5"
125+
#define FILE100 "tattr4_be.h5"
126+
#define FILE101 "tno-subset.h5"
127+
#define FILE102 "trefer_compat.h5"
128+
#define FILE103 "trefer_grp.h5"
129+
#define FILE104 "trefer_obj_del.h5"
130+
#define FILE105 "trefer_obj.h5"
131+
#define FILE106 "trefer_param.h5"
132+
#define FILE107 "trefer_reg.h5"
133+
#define FILE108 "trefer_reg_1d.h5"
134+
#define FILE109 "tvms.h5"
137135

138136
#define ONION_TEST_FIXNAME_SIZE 1024
139137
#define ONION_TEST_PAGE_SIZE (uint32_t)32
@@ -12915,7 +12913,7 @@ gent_bfloat16(void)
1291512913

1291612914
aset16 = calloc(F97_XDIM * F97_YDIM, sizeof(float));
1291712915

12918-
fid = H5Fcreate(FILE_FLOAT16, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
12916+
fid = H5Fcreate(FILE97, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1291912917

1292012918
/* Dataset of 16-bit little-endian bfloat16 */
1292112919
dims[0] = F97_XDIM;
@@ -12991,7 +12989,7 @@ gent_bfloat16_be(void)
1299112989

1299212990
aset16 = calloc(F98_XDIM * F98_YDIM, sizeof(float));
1299312991

12994-
fid = H5Fcreate(FILE_FLOAT16_BE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
12992+
fid = H5Fcreate(FILE98, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1299512993

1299612994
/* Dataset of 16-bit big-endian bfloat16 */
1299712995
dims[0] = F98_XDIM;
@@ -13059,7 +13057,7 @@ gent_trefer_attr(void)
1305913057
unsigned int attr2_data[4] = {1, 4, 7, 10};
1306013058
unsigned int attr3_data[4] = {2, 5, 8, 11};
1306113059

13062-
file_id = H5Fcreate(FILE_REFER_ATTR, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13060+
file_id = H5Fcreate(FILE99, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1306313061

1306413062
group_id = H5Gcreate2(file_id, "Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
1306513063

@@ -13133,7 +13131,7 @@ gent_tattr4_be(void)
1313313131
float data_value = 0.0f;
1313413132
char attr_name[10] = {0};
1313513133

13136-
file_id = H5Fcreate(FILE_ATTR4_BE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13134+
file_id = H5Fcreate(FILE100, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1313713135

1313813136
dataspace_id = H5Screate_simple(1, dims, NULL);
1313913137

@@ -13175,7 +13173,7 @@ gent_tno_subset(void)
1317513173
hsize_t dims[2] = {1, 1};
1317613174
int data[1][1] = {{0}};
1317713175

13178-
file_id = H5Fcreate(FILE_NO_SUBSET, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13176+
file_id = H5Fcreate(FILE101, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1317913177
dataspace_id = H5Screate_simple(2, dims, NULL);
1318013178
dataset_id =
1318113179
H5Dcreate2(file_id, F101_DSET, H5T_STD_I32LE, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -13213,7 +13211,7 @@ gent_trefer_compat(void)
1321313211
memset(data1, 0, sizeof(data1));
1321413212
memset(data2, 0, sizeof(data2));
1321513213

13216-
file_id = H5Fcreate(FILE_REFER_COMPAT, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13214+
file_id = H5Fcreate(FILE102, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1321713215

1321813216
group_id = H5Gcreate2(file_id, "Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
1321913217

@@ -13285,7 +13283,7 @@ gent_trefer_grp(void)
1328513283
hid_t space_id = H5I_INVALID_HID;
1328613284
H5R_ref_t ref;
1328713285

13288-
file_id = H5Fcreate(FILE_REFER_GRP, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13286+
file_id = H5Fcreate(FILE103, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1328913287

1329013288
group_id = H5Gcreate2(file_id, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
1329113289
group3_id = H5Gcreate2(group_id, "group3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -13313,7 +13311,7 @@ gent_trefer_obj_del(void)
1331313311
hid_t space_id = H5I_INVALID_HID;
1331413312
H5R_ref_t ref;
1331513313

13316-
file_id = H5Fcreate(FILE_REFER_OBJ_DEL, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13314+
file_id = H5Fcreate(FILE104, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1331713315

1331813316
space_id = H5Screate(H5S_SCALAR);
1331913317

@@ -13359,7 +13357,7 @@ gent_trefer_obj(void)
1335913357
H5R_ref_t ref_data5[1];
1336013358
hdset_reg_ref_t ref_data6[1];
1336113359

13362-
file_id = H5Fcreate(FILE_REFER_OBJ, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13360+
file_id = H5Fcreate(FILE105, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1336313361

1336413362
group_id = H5Gcreate2(file_id, "Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
1336513363

@@ -13429,7 +13427,7 @@ gent_trefer_param(void)
1342913427
uint8_t data2[4] = {0, 0, 0, 0};
1343013428
H5R_ref_t ref_data[4];
1343113429

13432-
file_id = H5Fcreate(FILE_REFER_PARAM, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13430+
file_id = H5Fcreate(FILE106, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1343313431

1343413432
group_id = H5Gcreate2(file_id, "Group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
1343513433

@@ -13493,7 +13491,7 @@ gent_trefer_reg(void)
1349313491
for (j = 0; j < 10; j++, n += 3)
1349413492
data2[i][j] = (uint8_t)(n % 256);
1349513493

13496-
file_id = H5Fcreate(FILE_REFER_REG, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13494+
file_id = H5Fcreate(FILE107, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1349713495

1349813496
space2_id = H5Screate_simple(2, dims2, NULL);
1349913497
dset2_id =
@@ -13553,7 +13551,7 @@ gent_trefer_reg_1d(void)
1355313551
hsize_t block[1] = {2};
1355413552
hsize_t coord[10] = {16, 22, 38, 41, 52, 63, 70, 89, 97, 3};
1355513553

13556-
file_id = H5Fcreate(FILE_REFER_REG_1D, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
13554+
file_id = H5Fcreate(FILE108, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
1355713555

1355813556
for (int i = 0; i < 100; i++) {
1355913557
data[i] = (unsigned char)(i * 3 % 256);
@@ -13806,7 +13804,7 @@ gent_tvms(void)
1380613804
}
1380713805
}
1380813806

13809-
if ((file_id = H5Fcreate(FILE_TVMS, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
13807+
if ((file_id = H5Fcreate(FILE109, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
1381013808
return -1;
1381113809

1381213810
if ((dataspace_id = H5Screate_simple(2, dims, NULL)) < 0)

0 commit comments

Comments
 (0)