Samuel Thibault %!s(int64=10) %!d(string=hai) anos
pai
achega
3c12dcfa36
Modificáronse 3 ficheiros con 11 adicións e 10 borrados
  1. 5 4
      starpufft/src/starpufftx.c
  2. 3 3
      starpufft/src/starpufftx1d.c
  3. 3 3
      starpufft/src/starpufftx2d.c

+ 5 - 4
starpufft/src/starpufftx.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2012  Université de Bordeaux
+ * Copyright (C) 2009-2012, 2014  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -174,7 +174,7 @@ compute_roots(STARPUFFT(plan) plan)
 
 /* Only CUDA capability >= 1.3 supports doubles, rule old card out.  */
 #ifdef DOUBLE
-static int can_execute(unsigned workerid, struct starpu_task *task, unsigned nimpl) {
+static int can_execute(unsigned workerid, struct starpu_task *task STARPU_ATTRIBUTE_UNUSED, unsigned nimpl STARPU_ATTRIBUTE_UNUSED) {
 	if (starpu_worker_get_type(workerid) == STARPU_CPU_WORKER)
 		return 1;
 #ifdef STARPU_USE_CUDA
@@ -307,7 +307,8 @@ STARPUFFT(execute_handle)(STARPUFFT(plan) plan, starpu_data_handle_t in, starpu_
 void
 STARPUFFT(destroy_plan)(STARPUFFT(plan) plan)
 {
-	int workerid, dim, i;
+	unsigned workerid;
+	int dim, i;
 
 	for (workerid = 0; workerid < starpu_worker_get_count(); workerid++)
 	{
@@ -436,7 +437,7 @@ STARPUFFT(free)(void *p)
 void
 STARPUFFT(showstats)(FILE *out)
 {
-	int worker;
+	unsigned worker;
 	unsigned total;
 
 #define TIMING(begin,end) (double)((end.tv_sec - begin.tv_sec)*1000000 + (end.tv_usec - begin.tv_usec))

+ 3 - 3
starpufft/src/starpufftx1d.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2013  Université de Bordeaux
+ * Copyright (C) 2009-2014  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -508,7 +508,7 @@ static struct starpu_codelet STARPUFFT(fft_1d_codelet) = {
 STARPUFFT(plan)
 STARPUFFT(plan_dft_1d)(int n, int sign, unsigned flags)
 {
-	int workerid;
+	unsigned workerid;
 	int n1 = DIV_1D;
 	int n2 = n / n1;
 	int n3;
@@ -848,7 +848,7 @@ if (PARALLEL) {
 static void
 STARPUFFT(free_1d_tags)(STARPUFFT(plan) plan)
 {
-	unsigned i;
+	int i;
 	int n1 = plan->n1[0];
 
 	if (!PARALLEL)

+ 3 - 3
starpufft/src/starpufftx2d.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- ; Copyright (C) 2009-2013  Université de Bordeaux
+ ; Copyright (C) 2009-2014  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -484,7 +484,7 @@ static struct starpu_codelet STARPUFFT(fft_2d_codelet) = {
 STARPUFFT(plan)
 STARPUFFT(plan_dft_2d)(int n, int m, int sign, unsigned flags)
 {
-	int workerid;
+	unsigned workerid;
 	int n1 = DIV_2D_N;
 	int n2 = n / n1;
 	int n3;
@@ -846,7 +846,7 @@ if (PARALLEL) {
 static void
 STARPUFFT(free_2d_tags)(STARPUFFT(plan) plan)
 {
-	unsigned i, j;
+	int i, j;
 	int n1 = plan->n1[0];
 	int m1 = plan->n1[1];