merge manually what svn merge failed to do

mpi/tests/mpi_probe.c

@@ -1,105 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-#include <starpu_mpi.h>
-#include <common/thread.h>
-#include "helper.h"
-
-#ifdef STARPU_QUICK_CHECK
-#  define NITER	16
-#else
-#  define NITER	2048
-#endif
-#define SIZE	16
-
-float *tab;
-starpu_data_handle_t tab_handle;
-
-static starpu_pthread_mutex_t mutex = STARPU_PTHREAD_MUTEX_INITIALIZER;
-static starpu_pthread_cond_t cond = STARPU_PTHREAD_COND_INITIALIZER;
-
-void callback(void *arg __attribute__((unused)))
-{
-	unsigned *received = arg;
-
-	_STARPU_PTHREAD_MUTEX_LOCK(&mutex);
-	*received = 1;
-	_STARPU_PTHREAD_COND_SIGNAL(&cond);
-	_STARPU_PTHREAD_MUTEX_UNLOCK(&mutex);
-}
-
-
-int main(int argc, char **argv)
-{
-	return 77;
-	/*
-	int ret, rank, size;
-
-	MPI_Init(NULL, NULL);
-	MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-	MPI_Comm_size(MPI_COMM_WORLD, &size);
-
-	if (size%2 != 0)
-	{
-		if (rank == 0)
-			FPRINTF(stderr, "We need a even number of processes.\n");
-
-		MPI_Finalize();
-		return STARPU_TEST_SKIPPED;
-	}
-
-	ret = starpu_init(NULL);
-	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
-	ret = starpu_mpi_init(NULL, NULL, 0);
-	STARPU_CHECK_RETURN_VALUE(ret, "starpu_mpi_init");
-
-	tab = malloc(SIZE*sizeof(float));
-	starpu_vector_data_register(&tab_handle, 0, (uintptr_t)tab, SIZE, sizeof(float));
-
-	int nloops = NITER;
-	int loop;
-	int other_rank = rank%2 == 0 ? rank+1 : rank-1;
-
-	for (loop = 0; loop < nloops; loop++)
-	{
-		if ((loop % 2) == (rank%2))
-		{
-			starpu_mpi_send(tab_handle, other_rank, loop, MPI_COMM_WORLD);
-		}
-		else
-		{
-			int received = 0;
-			starpu_mpi_irecv_probe_detached(tab_handle, other_rank, loop, MPI_COMM_WORLD, callback, &received);
-
-			_STARPU_PTHREAD_MUTEX_LOCK(&mutex);
-			while (!received)
-				_STARPU_PTHREAD_COND_WAIT(&cond, &mutex);
-			_STARPU_PTHREAD_MUTEX_UNLOCK(&mutex);
-		}
-	}
-
-	starpu_data_unregister(tab_handle);
-	free(tab);
-
-	starpu_mpi_shutdown();
-	starpu_shutdown();
-
-	MPI_Finalize();
-
-	return 0;
-	*/
-}

socl/examples/matmul/matmul.c

@@ -363,7 +363,7 @@ int main(int argc, const char** argv) {
 		check(clEnqueueNDRangeKernel(commandQueue[platform][dev], multiplicationKernel[platform], 2, NULL, globalWorkSize, localWorkSize, 0, NULL, &GPUExecution[i]));
 
 		// Non-blocking copy of result from device to host
-		 cqs[i] = commandQueue[p][dev];
+		cqs[i] = commandQueue[platform][dev];
 		check2(ptrs[i] = clEnqueueMapBuffer(cqs[i], d_C[i], CL_FALSE, CL_MAP_READ, 0, WC * sizeof(TYPE) * workSize[i], 1, &GPUExecution[i], &GPUDone[i], &err));
 
 		if(i+1 < BLOCKS)