tests: remove second definition of FPRINTF

tests/core/empty_task.c

@@ -23,8 +23,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 
 static void usage(char **argv)

tests/core/get_current_task.c

@@ -21,8 +21,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 
 static void check_task_func(void *descr[], void *arg)

tests/core/insert_task.c

@@ -17,8 +17,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 void func_cpu(void *descr[], void *_args)
 {
 	int *x0 = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);

tests/core/regenerate.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 static unsigned cnt = 0;
 

tests/core/restart.c

@@ -24,8 +24,6 @@
 
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 #define N	10
 
 struct timeval start;

tests/core/starpu_task_wait.c

@@ -23,8 +23,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))

tests/core/starpu_task_wait_for_all.c

@@ -22,8 +22,6 @@
 #include <unistd.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 
 static void dummy_func(void *descr[], void *arg)

tests/core/static_restartable.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))

tests/core/static_restartable_tag.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 65536;
 static starpu_tag_t tag = 0x32;
 

tests/core/static_restartable_using_initializer.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 /* This is equivalent to calling starpu_task_init later on */
 struct starpu_task task = STARPU_TASK_INITIALIZER;
 

tests/core/tag_wait_api.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 }

tests/core/task_wait_api.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 }

tests/core/wait_all_regenerable_tasks.c

@@ -22,8 +22,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 1024;
 
 static void callback(void *arg)

tests/datawizard/acquire_cb.c

@@ -17,8 +17,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 unsigned token = 0;
 starpu_data_handle token_handle;
 

tests/datawizard/acquire_cb_insert.c

@@ -21,8 +21,6 @@
 #define M 4
 #define X 2
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 void which_index_cpu(void *descr[], void *_args)
 {
 	int *x0 = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);

tests/datawizard/acquire_release.c

@@ -18,8 +18,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 10000;
 
 #ifdef STARPU_USE_CUDA

tests/datawizard/acquire_release2.c

@@ -17,8 +17,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned ntasks = 40000;
 
 #ifdef STARPU_USE_CUDA

tests/datawizard/copy.c

@@ -18,8 +18,6 @@
 #include <starpu.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static unsigned nloops = 1000;
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))

tests/datawizard/data_implicit_deps.c

@@ -23,7 +23,6 @@
 #include "../common/helper.h"
 
 #define VECTORSIZE	1024
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 static unsigned *A, *B, *C, *D;
 starpu_data_handle A_handle, B_handle, C_handle, D_handle;

tests/datawizard/data_invalidation.c

@@ -24,7 +24,6 @@
 
 #define NLOOPS		1000
 #define VECTORSIZE	1024
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 static starpu_data_handle v_handle;
 

tests/datawizard/dining_philosophers.c

@@ -24,8 +24,6 @@
 starpu_data_handle fork_handles[N];
 unsigned forks[N];
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 static void eat_kernel(void *descr[], void *arg)
 {
 }

tests/datawizard/lazy_allocation.c

@@ -23,7 +23,6 @@
 #include "../common/helper.h"
 
 #define VECTORSIZE	1024
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 static starpu_data_handle v_handle;
 

tests/datawizard/manual_reduction.c

@@ -26,7 +26,6 @@
 
 #define INIT_VALUE	42
 #define NTASKS		10000
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 static unsigned variable;
 static starpu_data_handle variable_handle;

tests/datawizard/reclaim.c

@@ -32,7 +32,6 @@
 #else
 #  define BLOCK_SIZE (64*1024*1024)
 #endif
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 static unsigned ntasks = 1000;
 

tests/datawizard/sync_and_notify_data.c

@@ -28,7 +28,6 @@
 
 #define N	100
 #define K	256
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 /*
  * In this test, we maintain a vector v = (a,b,c).

tests/datawizard/sync_and_notify_data_implicit.c

@@ -30,7 +30,6 @@
 #define K	256
 //#define N	1
 //#define K	1
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 /*
  * In this test, we maintain a vector v = (a,b,c).

tests/helper/cublas_init.c

@@ -23,8 +23,6 @@
 #include <stdlib.h>
 #include "../common/helper.h"
 
-#define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
-
 struct timeval start;
 struct timeval end;