|
@@ -46,7 +46,7 @@ static unsigned do_warmup = 0;
|
|
|
#ifdef STARPU_HAVE_CURAND
|
|
|
/* RNG for the CURAND library */
|
|
|
static curandGenerator_t curandgens[STARPU_NMAXWORKERS];
|
|
|
-#endif
|
|
|
+#endif
|
|
|
|
|
|
/* state for the erand48 function : note the huge padding to avoid false-sharing */
|
|
|
#define PADDING 1024
|
|
@@ -132,7 +132,7 @@ static void pi_func_cpu(void *descr[], void *cl_arg __attribute__ ((unused)))
|
|
|
|
|
|
unsigned short *worker_xsub;
|
|
|
worker_xsub = &xsubi[PADDING*workerid];
|
|
|
-
|
|
|
+
|
|
|
struct drand48_data *buffer;
|
|
|
buffer = &randbuffer[PADDING*workerid];
|
|
|
|
|
@@ -165,7 +165,7 @@ extern void pi_redux_cuda_kernel(float *x, float *y, unsigned n, unsigned long *
|
|
|
#ifdef STARPU_HAVE_CURAND
|
|
|
static void pi_func_cuda(void *descr[], void *cl_arg __attribute__ ((unused)))
|
|
|
{
|
|
|
- curandStatus_t res;
|
|
|
+ curandStatus_t res;
|
|
|
|
|
|
int workerid = starpu_worker_get_id();
|
|
|
|
|
@@ -260,7 +260,7 @@ static void redux_cuda_func(void *descr[], void *cl_arg)
|
|
|
unsigned long *d_b = (unsigned long *)STARPU_VARIABLE_GET_PTR(descr[1]);
|
|
|
|
|
|
unsigned long h_a, h_b;
|
|
|
-
|
|
|
+
|
|
|
cudaMemcpyAsync(&h_a, d_a, sizeof(h_a), cudaMemcpyDeviceToHost, starpu_cuda_get_local_stream());
|
|
|
cudaMemcpyAsync(&h_b, d_b, sizeof(h_b), cudaMemcpyDeviceToHost, starpu_cuda_get_local_stream());
|
|
|
cudaStreamSynchronize(starpu_cuda_get_local_stream());
|
|
@@ -269,7 +269,7 @@ static void redux_cuda_func(void *descr[], void *cl_arg)
|
|
|
|
|
|
cudaMemcpyAsync(d_a, &h_a, sizeof(h_a), cudaMemcpyHostToDevice, starpu_cuda_get_local_stream());
|
|
|
cudaStreamSynchronize(starpu_cuda_get_local_stream());
|
|
|
-};
|
|
|
+}
|
|
|
#endif
|
|
|
|
|
|
static void redux_cpu_func(void *descr[], void *cl_arg)
|
|
@@ -278,7 +278,7 @@ static void redux_cpu_func(void *descr[], void *cl_arg)
|
|
|
unsigned long *b = (unsigned long *)STARPU_VARIABLE_GET_PTR(descr[1]);
|
|
|
|
|
|
*a = *a + *b;
|
|
|
-};
|
|
|
+}
|
|
|
|
|
|
static struct starpu_codelet redux_codelet =
|
|
|
{
|
|
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
|
|
|
task->handles[0] = xy_scratchpad_handle;
|
|
|
task->handles[1] = shot_cnt_handle;
|
|
|
|
|
|
- int ret = starpu_task_submit(task);
|
|
|
+ ret = starpu_task_submit(task);
|
|
|
STARPU_ASSERT(!ret);
|
|
|
}
|
|
|
|
|
@@ -356,7 +356,7 @@ int main(int argc, char **argv)
|
|
|
task->handles[0] = xy_scratchpad_handle;
|
|
|
task->handles[1] = shot_cnt_handle;
|
|
|
|
|
|
- int ret = starpu_task_submit(task);
|
|
|
+ ret = starpu_task_submit(task);
|
|
|
STARPU_ASSERT(!ret);
|
|
|
}
|
|
|
|