Commit 327571b4 authored by Kenneth Moreland's avatar Kenneth Moreland
Browse files

Merge branch 'CleanTestOutput'

parents e3678bff bf93ead0
......@@ -17,7 +17,7 @@
static void draw(void)
{
printf("In draw\n");
/* printrank("In draw\n"); */
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glBegin(GL_QUADS);
......@@ -26,7 +26,7 @@ static void draw(void)
glVertex3d(0.5, 0.5, 0.0);
glVertex3d(-0.5, 0.5, 0.0);
glEnd();
printf("Leaving draw\n");
/* printrank("Leaving draw\n"); */
}
static int BlankTilesDoTest(void)
......@@ -43,7 +43,7 @@ static int BlankTilesDoTest(void)
IceTSizeType my_width = -1;
IceTSizeType my_height = -1;
IceTImage image;
printf("\nRunning on a %d x %d display.\n", tile_dim, tile_dim);
printstat("\nRunning on a %d x %d display.\n", tile_dim, tile_dim);
icetResetTiles();
for (y = 0; y < tile_dim; y++) {
for (x = 0; x < tile_dim; x++) {
......@@ -63,7 +63,7 @@ static int BlankTilesDoTest(void)
}
}
printf("Rendering frame.\n");
printstat("Rendering frame.\n");
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(-1, tile_dim*2-1, -1, tile_dim*2-1, -1, 1);
......@@ -73,28 +73,28 @@ static int BlankTilesDoTest(void)
swap_buffers();
if (rank == 0) {
printf("Rank == 0, tile should have stuff in it.\n");
/* printrank("Rank == 0, tile should have stuff in it.\n"); */
} else if (rank < tile_dim*tile_dim) {
IceTUByte *cb;
int pixel;
if ( (my_width != icetImageGetWidth(image))
|| (my_height != icetImageGetHeight(image)) ) {
printf("Image size is wrong!!!!!!!!!\n");
printrank("Image size is wrong!!!!!!!!!\n");
result = TEST_FAILED;
}
printf("Checking returned image data.\n");
/* printrank("Checking returned image data.\n"); */
cb = icetImageGetColorub(image);
for (pixel = 0; pixel < my_width*my_height*4; pixel++) {
if (cb[pixel] != 0) {
printf("Found bad pixel!!!!!!!!\n");
printrank("Found bad pixel!!!!!!!!\n");
result = TEST_FAILED;
break;
}
}
} else {
printf("Not a display node. Not testing image.\n");
/* printrank("Not a display node. Not testing image.\n"); */
}
}
......@@ -121,7 +121,7 @@ static int BlankTilesRun()
int num_single_image_strategy;
icetStrategy(strategy);
printf("\n\nUsing %s strategy.\n", icetGetStrategyName());
printstat("\n\nUsing %s strategy.\n", icetGetStrategyName());
if (strategy_uses_single_image_strategy(strategy)) {
num_single_image_strategy = SINGLE_IMAGE_STRATEGY_LIST_SIZE;
......@@ -138,8 +138,8 @@ static int BlankTilesRun()
int test_result;
icetSingleImageStrategy(single_image_strategy);
printf("Using %s single image sub-strategy.\n",
icetGetSingleImageStrategyName());
printstat("Using %s single image sub-strategy.\n",
icetGetSingleImageStrategyName());
test_result = BlankTilesDoTest();
if (test_result != TEST_PASSED) {
......
......@@ -33,9 +33,9 @@ static void PrintMatrix(float *mat)
for (c = 0; c < 4; c++) {
for (r = 0; r < 4; r++) {
printf("%f ", mat[4*r + c]);
printstat("%f ", mat[4*r + c]);
}
printf("\n");
printstat("\n");
}
}
......@@ -75,10 +75,10 @@ static int BoundsBehindViewerRun()
glLoadIdentity();
glFrustum(-1.0, 1.0, -1.0, 1.0, 1.0, 2.0);
printf("Modelview matrix:\n");
printstat("Modelview matrix:\n");
glGetFloatv(GL_MODELVIEW_MATRIX, mat);
PrintMatrix(mat);
printf("Projection matrix:\n");
printstat("Projection matrix:\n");
glGetFloatv(GL_PROJECTION_MATRIX, mat);
PrintMatrix(mat);
......@@ -96,7 +96,7 @@ static int BoundsBehindViewerRun()
if (rank == 0) {
IceTUInt *cb = icetImageGetColorui(image);
if (cb[0] != 0xFFFFFFFF) {
printf("First pixel in color buffer wrong: 0x%x\n", cb[0]);
printstat("First pixel in color buffer wrong: 0x%x\n", cb[0]);
return TEST_FAILED;
}
}
......
......@@ -56,7 +56,7 @@ static void InitPathologicalImage(IceTImage image)
buffer[4*i + 3] = (IceTFloat)(i%2);
}
} else if (format != ICET_IMAGE_COLOR_NONE) {
printf("*** Unknown color format? ***\n");
printrank("*** Unknown color format? ***\n");
}
format = icetImageGetDepthFormat(image);
......@@ -67,7 +67,7 @@ static void InitPathologicalImage(IceTImage image)
buffer[i] = (IceTFloat)(i%2);
}
} else if (format != ICET_IMAGE_DEPTH_NONE) {
printf("*** Unknown depth format? ***\n");
printrank("*** Unknown depth format? ***\n");
}
}
......@@ -104,7 +104,7 @@ static void InitActiveImage(IceTImage image)
buffer[4*i + 3] = ((IceTFloat)(rand()%255 + 1))/255;
}
} else if (format != ICET_IMAGE_COLOR_NONE) {
printf("*** Unknown color format? ***\n");
printrank("*** Unknown color format? ***\n");
}
format = icetImageGetDepthFormat(image);
......@@ -115,7 +115,7 @@ static void InitActiveImage(IceTImage image)
buffer[i] = ((IceTFloat)(rand()%255))/255;
}
} else if (format != ICET_IMAGE_DEPTH_NONE) {
printf("*** Unknown depth format? ***\n");
printrank("*** Unknown depth format? ***\n");
}
}
......@@ -155,9 +155,9 @@ static int DoCompressionTest(IceTEnum color_format, IceTEnum depth_format,
result = TEST_PASSED;
printf("Using color format of 0x%x\n", (int)color_format);
printf("Using depth format of 0x%x\n", (int)depth_format);
printf("Using composite mode of 0x%x\n", (int)composite_mode);
printstat("Using color format of 0x%x\n", (int)color_format);
printstat("Using depth format of 0x%x\n", (int)depth_format);
printstat("Using composite mode of 0x%x\n", (int)composite_mode);
icetSetColorFormat(color_format);
icetSetDepthFormat(depth_format);
......@@ -165,8 +165,8 @@ static int DoCompressionTest(IceTEnum color_format, IceTEnum depth_format,
pixels = SCREEN_WIDTH*SCREEN_HEIGHT;
printf("Allocating memory for %dx%d pixel image.\n",
(int)SCREEN_WIDTH, (int)SCREEN_HEIGHT);
printstat("Allocating memory for %dx%d pixel image.\n",
(int)SCREEN_WIDTH, (int)SCREEN_HEIGHT);
imagesize = icetImageBufferSize(SCREEN_WIDTH, SCREEN_HEIGHT);
imagebuffer = malloc(imagesize);
image = icetImageAssignBuffer(imagebuffer, SCREEN_WIDTH, SCREEN_HEIGHT);
......@@ -187,74 +187,75 @@ static int DoCompressionTest(IceTEnum color_format, IceTEnum depth_format,
icetImageGetColorVoid(image, &color_pixel_size);
icetImageGetDepthVoid(image, &depth_pixel_size);
pixel_size = color_pixel_size + depth_pixel_size;
printf("Pixel size: color=%d, depth=%d, total=%d\n",
(int)color_pixel_size, (int)depth_pixel_size, (int)pixel_size);
printstat("Pixel size: color=%d, depth=%d, total=%d\n",
(int)color_pixel_size, (int)depth_pixel_size, (int)pixel_size);
printf("\nCreating worst possible image (with respect to compression).\n");
printstat("\nCreating worst possible image"
" (with respect to compression).\n");
InitPathologicalImage(image);
printf("Compressing image.\n");
printstat("Compressing image.\n");
icetCompressImage(image, compressedimage);
size = icetSparseImageGetCompressedBufferSize(compressedimage);
printf("Expected size: %d. Actual size: %d\n",
(int)(pixel_size*(pixels/2) + 2*sizeof(IceTUShort)*(pixels/2)),
(int)size);
printstat("Expected size: %d. Actual size: %d\n",
(int)(pixel_size*(pixels/2) + 2*sizeof(IceTUShort)*(pixels/2)),
(int)size);
if ( (size > compressedsize)
|| (size < pixel_size*(pixels/2)) ) {
printf("*** Size differs from expected size!\n");
printrank("*** Size differs from expected size!\n");
result = TEST_FAILED;
}
printf("Interlacing image.\n");
printstat("Interlacing image.\n");
icetSparseImageInterlace(compressedimage,
97,
ICET_SI_STRATEGY_BUFFER_0,
interlacedimage);
size = icetSparseImageGetCompressedBufferSize(compressedimage);
printf("Expected size: %d. Actual size: %d\n",
(int)(pixel_size*(pixels/2) + 2*sizeof(IceTUShort)*(pixels/2)),
(int)size);
printstat("Expected size: %d. Actual size: %d\n",
(int)(pixel_size*(pixels/2) + 2*sizeof(IceTUShort)*(pixels/2)),
(int)size);
if ( (size > compressedsize)
|| (size < pixel_size*(pixels/2)) ) {
printf("*** Size differs from expected size!\n");
printrank("*** Size differs from expected size!\n");
result = TEST_FAILED;
}
printf("\nCreating a different worst possible image.\n");
printstat("\nCreating a different worst possible image.\n");
InitActiveImage(image);
printf("Compressing image.\n");
printstat("Compressing image.\n");
icetCompressImage(image, compressedimage);
size = icetSparseImageGetCompressedBufferSize(compressedimage);
printf("Expected size: %d. Actual size: %d\n",
printstat("Expected size: %d. Actual size: %d\n",
(int)compressedsize, (int)size);
if ((size > compressedsize) || (size < pixel_size*pixels)) {
printf("*** Size differs from expected size!\n");
printrank("*** Size differs from expected size!\n");
result = TEST_FAILED;
}
printf("Interlacing image.\n");
printstat("Interlacing image.\n");
icetSparseImageInterlace(compressedimage,
97,
ICET_SI_STRATEGY_BUFFER_0,
interlacedimage);
size = icetSparseImageGetCompressedBufferSize(compressedimage);
printf("Expected size: %d. Actual size: %d\n",
printstat("Expected size: %d. Actual size: %d\n",
(int)(pixel_size*(pixels/2) + 2*sizeof(IceTUShort)*(pixels/2)),
(int)size);
if ( (size > compressedsize)
|| (size < pixel_size*(pixels/2)) ) {
printf("*** Size differs from expected size!\n");
printrank("*** Size differs from expected size!\n");
result = TEST_FAILED;
}
printf("\nCompressing zero size image.\n");
printstat("\nCompressing zero size image.\n");
icetImageSetDimensions(image, 0, 0);
icetCompressImage(image, compressedimage);
size = icetSparseImageGetCompressedBufferSize(compressedimage);
printf("Expected size: %d. Actual size: %d\n",
printstat("Expected size: %d. Actual size: %d\n",
(int)icetSparseImageBufferSize(0, 0), (int)size);
if (size > icetSparseImageBufferSize(0, 0)) {
printf("*** Size differs from expected size!\n");
printrank("*** Size differs from expected size!\n");
result = TEST_FAILED;
}
......@@ -264,7 +265,7 @@ static int DoCompressionTest(IceTEnum color_format, IceTEnum depth_format,
* we try to set up these parameters by hand. It is possible for this
* test to incorrectly fail if the two functions are mutually changed and
* this scaffolding is not updated correctly. */
printf("\nSetup for actual render.\n");
printstat("\nSetup for actual render.\n");
icetResetTiles();
icetAddTile(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0);
icetDrawCallback(drawCallback);
......@@ -273,17 +274,17 @@ static int DoCompressionTest(IceTEnum color_format, IceTEnum depth_format,
viewport[0] = viewport[1] = 0;
viewport[2] = (IceTInt)SCREEN_WIDTH; viewport[3] = (IceTInt)SCREEN_HEIGHT;
icetStateSetIntegerv(ICET_CONTAINED_VIEWPORT, 4, viewport);
printf("Now render and get compressed image.\n");
printstat("Now render and get compressed image.\n");
icetGetCompressedTileImage(0, compressedimage);
size = icetSparseImageGetCompressedBufferSize(compressedimage);
printf("Expected size: %d. Actual size: %d\n",
(int)compressedsize, (int)size);
printstat("Expected size: %d. Actual size: %d\n",
(int)compressedsize, (int)size);
if ((size > compressedsize) || (size < pixel_size*pixels)) {
printf("*** Size differs from expected size!\n");
printrank("*** Size differs from expected size!\n");
result = TEST_FAILED;
}
printf("Cleaning up.\n");
printstat("Cleaning up.\n");
free(imagebuffer);
free(compressedbuffer);
free(interlacedbuffer);
......@@ -296,11 +297,11 @@ static int CompressionSizeRun()
icetStrategy(ICET_STRATEGY_REDUCE);
printf("Compress depth only.\n");
printstat("Compress depth only.\n");
result = DoCompressionTest(ICET_IMAGE_COLOR_NONE, ICET_IMAGE_DEPTH_FLOAT,
ICET_COMPOSITE_MODE_Z_BUFFER);
printf("\n\nCompress 8-bit color only.\n");
printstat("\n\nCompress 8-bit color only.\n");
if (result == TEST_PASSED) {
result = DoCompressionTest(ICET_IMAGE_COLOR_RGBA_UBYTE,
ICET_IMAGE_DEPTH_NONE,
......@@ -311,7 +312,7 @@ static int CompressionSizeRun()
ICET_COMPOSITE_MODE_BLEND);
}
printf("\n\nCompress 32-bit color only.\n");
printstat("\n\nCompress 32-bit color only.\n");
if (result == TEST_PASSED) {
result = DoCompressionTest(ICET_IMAGE_COLOR_RGBA_FLOAT,
ICET_IMAGE_DEPTH_NONE,
......@@ -322,7 +323,7 @@ static int CompressionSizeRun()
ICET_COMPOSITE_MODE_BLEND);
}
printf("\n\nCompress depth and 8-bit color.\n");
printstat("\n\nCompress depth and 8-bit color.\n");
if (result == TEST_PASSED) {
result = DoCompressionTest(ICET_IMAGE_COLOR_RGBA_UBYTE,
ICET_IMAGE_DEPTH_FLOAT,
......@@ -333,7 +334,7 @@ static int CompressionSizeRun()
ICET_COMPOSITE_MODE_Z_BUFFER);
}
printf("\n\nCompress depth and 32-bit color.\n");
printstat("\n\nCompress depth and 32-bit color.\n");
if (result == TEST_PASSED) {
result = DoCompressionTest(ICET_IMAGE_COLOR_RGBA_FLOAT,
ICET_IMAGE_DEPTH_FLOAT,
......
......@@ -28,9 +28,9 @@ static int global_result;
static void draw(void)
{
printf("In draw\n");
/* printrank("In draw\n"); */
if (global_rank == 0) {
printf("ERROR: Draw called on rank 0!\n");
printrank("ERROR: Draw called on rank 0!\n");
global_result = TEST_FAILED;
}
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
......@@ -42,12 +42,12 @@ static void draw(void)
glVertex3d(-1.0, 1.0, 0.0);
glEnd();
}
printf("Leaving draw\n");
/* printrank("Leaving draw\n"); */
}
static void DisplayNoDrawInit(void)
{
printf("Setting tile.");
printstat("Setting tile.");
icetResetTiles();
icetAddTile(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0);
......@@ -81,7 +81,7 @@ static void DisplayNoDrawDoTest(void)
IceTImage image;
IceTUByte *color_buffer;
printf("Blank image is rank %d\n", global_iteration);
printstat("Blank image is rank %d\n", global_iteration);
image = icetGLDrawFrame();
swap_buffers();
......@@ -94,13 +94,13 @@ static void DisplayNoDrawDoTest(void)
&& ((global_num_proc > 2) || (global_iteration != 1)) ) {
int p;
int bad_count = 0;
printf("Checking pixels.\n");
printstat("Checking pixels.\n");
color_buffer = icetImageGetColorub(image);
for (p = 0;
(p < SCREEN_WIDTH*SCREEN_HEIGHT*4) && (bad_count < 10); p++) {
if (color_buffer[p] != 255) {
printf("BAD PIXEL %d.%d\n", p/4, p%4);
printf(" Expected 255, got %d\n", color_buffer[p]);
printrank("BAD PIXEL %d.%d\n", p/4, p%4);
printrank(" Expected 255, got %d\n", color_buffer[p]);
bad_count++;
}
}
......@@ -124,7 +124,7 @@ static int DisplayNoDrawRun(void)
icetGetIntegerv(ICET_RANK, &global_rank);
icetGetIntegerv(ICET_NUM_PROCESSES, &global_num_proc);
printf("Starting DisplayNoDraw.\n");
printstat("Starting DisplayNoDraw.\n");
global_result = TEST_PASSED;
......@@ -137,7 +137,7 @@ static int DisplayNoDrawRun(void)
int num_single_image_strategy;
icetStrategy(strategy);
printf("\n\nUsing %s strategy.\n", icetGetStrategyName());
printstat("\n\nUsing %s strategy.\n", icetGetStrategyName());
if (strategy_uses_single_image_strategy(strategy)) {
num_single_image_strategy = SINGLE_IMAGE_STRATEGY_LIST_SIZE;
......@@ -153,8 +153,8 @@ static int DisplayNoDrawRun(void)
= single_image_strategy_list[single_image_strategy_index];
icetSingleImageStrategy(single_image_strategy);
printf("Using %s single image sub-strategy.\n",
icetGetSingleImageStrategyName());
printstat("Using %s single image sub-strategy.\n",
icetGetSingleImageStrategyName());
DisplayNoDrawDoTest();
}
......
......@@ -73,7 +73,7 @@ static void LowerTriangleImage(IceTImage image)
} else if (icetImageGetColorFormat(image) == ICET_IMAGE_COLOR_NONE) {
/* Do nothing. */
} else {
printf("ERROR: Encountered unknown color format.");
printrank("ERROR: Encountered unknown color format.");
}
if (icetImageGetDepthFormat(image) == ICET_IMAGE_DEPTH_FLOAT) {
......@@ -91,7 +91,7 @@ static void LowerTriangleImage(IceTImage image)
} else if (icetImageGetDepthFormat(image) == ICET_IMAGE_DEPTH_NONE) {
/* Do nothing. */
} else {
printf("ERROR: Encountered unknown depth format.");
printrank("ERROR: Encountered unknown depth format.");
}
}
......@@ -124,7 +124,7 @@ static void FullImage(IceTImage image)
} else if (icetImageGetColorFormat(image) == ICET_IMAGE_COLOR_NONE) {
/* Do nothing. */
} else {
printf("ERROR: Encountered unknown color format.");
printrank("ERROR: Encountered unknown color format.");
}
if (icetImageGetDepthFormat(image) == ICET_IMAGE_DEPTH_FLOAT) {
......@@ -138,7 +138,7 @@ static void FullImage(IceTImage image)
} else if (icetImageGetDepthFormat(image) == ICET_IMAGE_DEPTH_NONE) {
/* Do nothing. */
} else {
printf("ERROR: Encountered unknown depth format.");
printrank("ERROR: Encountered unknown depth format.");
}
}
......@@ -155,13 +155,13 @@ static IceTBoolean CompareImageColors(const IceTImage image_a,
IceTSizeType y;
if (icetImageGetColorFormat(image_a) != icetImageGetColorFormat(image_b)) {
printf("ERROR: Image formats do not match.\n");
printrank("ERROR: Image formats do not match.\n");
return ICET_FALSE;
}
if ( (icetImageGetWidth(image_a) != icetImageGetWidth(image_b))
|| (icetImageGetHeight(image_a) != icetImageGetHeight(image_b)) ) {
printf("ERROR: Images have different dimensions.\n");
printrank("ERROR: Images have different dimensions.\n");
return ICET_FALSE;
}
......@@ -185,11 +185,11 @@ static IceTBoolean CompareImageColors(const IceTImage image_a,
|| (data_a[1] != data_b[1])
|| (data_a[2] != data_b[2])
|| (data_a[3] != data_b[3]) ) {
printf("ERROR: Encountered bad pixel @ (%d,%d).\n", x, y);
printf("Expected (%d, %d, %d, %d)\n",
data_a[0], data_a[1], data_a[2], data_a[3]);
printf("Got (%d, %d, %d, %d)\n",
data_b[0], data_b[1], data_b[2], data_b[3]);
printrank("ERROR: Encountered bad pixel @ (%d,%d).\n", x, y);
printrank("Expected (%d, %d, %d, %d)\n",
data_a[0], data_a[1], data_a[2], data_a[3]);
printrank("Got (%d, %d, %d, %d)\n",
data_b[0], data_b[1], data_b[2], data_b[3]);
return ICET_FALSE;
}
data_a += 4;
......@@ -216,13 +216,13 @@ static IceTBoolean CompareImageDepths(const IceTImage image_a,
IceTSizeType y;
if (icetImageGetDepthFormat(image_a) != icetImageGetDepthFormat(image_b)) {
printf("ERROR: Image formats do not match.\n");
printrank("ERROR: Image formats do not match.\n");
return ICET_FALSE;
}
if ( (icetImageGetWidth(image_a) != icetImageGetWidth(image_b))
|| (icetImageGetHeight(image_a) != icetImageGetHeight(image_b)) ) {
printf("ERROR: Images have different dimensions.\n");
printrank("ERROR: Images have different dimensions.\n");
return ICET_FALSE;
}
......@@ -243,8 +243,8 @@ static IceTBoolean CompareImageDepths(const IceTImage image_a,
for (y = 0; y < height; y++) {
for (x = 0; x < width; x++) {
if (data_a[0] != data_b[0]) {
printf("ERROR: Encountered bad pixel @ (%d,%d).\n", x, y);
printf("Expected %f, got %f\n", data_a[0], data_b[0]);
printrank("ERROR: Encountered bad pixel @ (%d,%d).\n", x, y);
printrank("Expected %f, got %f\n", data_a[0], data_b[0]);
return ICET_FALSE;
}
data_a++;
......@@ -307,13 +307,13 @@ static int TestInterlaceSplit(const IceTImage image)
icetCompressImage(image, original_sparse);
printf("Interlacing image for %d pieces\n", NUM_PARTITIONS);
printstat("Interlacing image for %d pieces\n", NUM_PARTITIONS);
icetSparseImageInterlace(original_sparse,
NUM_PARTITIONS,
ICET_SI_STRATEGY_BUFFER_0,
interlaced_sparse);
printf("Splitting image %d times\n", NUM_PARTITIONS);
printstat("Splitting image %d times\n", NUM_PARTITIONS);
icetSparseImageSplit(interlaced_sparse,
0,
NUM_PARTITIONS,
......@@ -321,7 +321,7 @@ static int TestInterlaceSplit(const IceTImage image)
sparse_partition,
offsets);
printf("Reconstructing image.\n");
printstat("Reconstructing image.\n");
for (partition = 0; partition < NUM_PARTITIONS; partition++) {
IceTSizeType real_offset = icetGetInterlaceOffset(partition,
NUM_PARTITIONS,
......@@ -353,13 +353,13 @@ static int InterlaceRunFormat()
imagebuffer = malloc(icetImageBufferSize(SCREEN_WIDTH, SCREEN_HEIGHT));
image = icetImageAssignBuffer(imagebuffer, SCREEN_WIDTH, SCREEN_HEIGHT);
printf("\n********* Creating lower triangle image\n");
printstat("\n********* Creating lower triangle image\n");
LowerTriangleImage(image);
result = TestInterlaceSplit(image);
if (result != TEST_PASSED) { return result; }
printf("\n********* Creating full image\n");
printstat("\n********* Creating full image\n");
FullImage(image);
result = TestInterlaceSplit(image);
......
......@@ -184,10 +184,10 @@ static int MaxImageSplitCheckImage(const IceTImage image)
for (y = 0; y < PROC_REGION_HEIGHT; y++) {
for (x = 0; x < PROC_REGION_WIDTH; x++) {
if (*pixel != proc) {
printf("**** Found bad pixel!!!! ****\n");
printf("Region for process %d, x = %d, y = %d\n",
proc, x, y);
printf("Reported %d\n", *pixel);
printrank("**** Found bad pixel!!!! ****\n");
printrank("Region for process %d, x = %d, y = %d\n",
proc, x, y);
printrank("Reported %d\n", *pixel);
return TEST_FAILED;
}
pixel++;
......@@ -227,8 +227,8 @@ static int MaxImageSplitTryStrategy()
si_strategy_idx < SINGLE_IMAGE_STRATEGY_LIST_SIZE;
si_strategy_idx++) {
icetSingleImageStrategy(single_image_strategy_list[si_strategy_idx]);
printf(" Trying single image strategy %s\n",
icetGetSingleImageStrategyName());
printstat(" Trying single image strategy %s\n",
icetGetSingleImageStrategyName());
result += MaxImageSplitTryRender();
}
......@@ -250,7 +250,7 @@ static int MaxImageSplitTryMax()
char image_split_string[32];
IceTInt reported_image_split;
printf("Trying max image split of %d\n", max_image_split);
printstat("Trying max image split of %d\n", max_image_split);
sprintf(image_split_string, "%d", max_image_split);
setenv("ICET_MAX_IMAGE_SPLIT", image_split_string, ICET_TRUE);
......@@ -266,7 +266,7 @@ static int MaxImageSplitTryMax()
icetGetIntegerv(ICET_MAX_IMAGE_SPLIT, &reported_image_split);
if (max_image_split != reported_image_split) {
printf("**** Max image split not set correctly!!!! ****\n");
printrank("**** Max image split not set correctly!!!! ****\n");
return TEST_FAILED;
}
......
......@@ -118,14 +118,14 @@ static int OddImageSizesRun(void)
width = c_image_sizes[image_size_index][0];
height = c_image_sizes[image_size_index][1];
printf("\n\nUsing image size %dx%d\n", (int)width, (int)height);
printstat("\n\nUsing image size %dx%d\n", (int)width, (int)height);
for (tile_dimensions = 1;
tile_dimensions*tile_dimensions <= num_proc;
tile_dimensions++) {
int strategy_index;
printf("Using tile dimensions %d\n", tile_dimensions);