testcases

mpi/Makefile.am

@@ -158,6 +158,7 @@ check_PROGRAMS +=					\
 	tests/insert_task_cache				\
 	tests/insert_task_block				\
 	tests/insert_task_owner				\
+	tests/insert_task_owner2			\
 	tests/multiple_send
 
 testbin_PROGRAMS =				\
@@ -177,6 +178,7 @@ testbin_PROGRAMS =				\
 	tests/insert_task_cache				\
 	tests/insert_task_block				\
 	tests/insert_task_owner				\
+	tests/insert_task_owner2			\
 	tests/multiple_send
 
 tests_mpi_isend_LDADD =					\
@@ -275,6 +277,12 @@ tests_insert_task_owner_LDADD =				\
 tests_insert_task_owner_SOURCES =			\
 	tests/insert_task_owner.c
 
+tests_insert_task_owner2_LDADD =			\
+	libstarpumpi.la
+
+tests_insert_task_owner2_SOURCES =			\
+	tests/insert_task_owner2.c
+
 tests_multiple_send_LDADD =				\
 	libstarpumpi.la
 

mpi/tests/insert_task_owner.c

@@ -19,11 +19,11 @@
 
 void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
 {
-	unsigned *x = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[0]);
-	unsigned *y = (unsigned *)STARPU_VARIABLE_GET_PTR(descr[1]);
+	int *x = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
+	int *y = (int *)STARPU_VARIABLE_GET_PTR(descr[1]);
 
-        fprintf(stdout, "VALUES: %d %d\n", *x, *y);
-        *x = (*x + *y) / 2;
+        *x = *x + 1;
+        *y = *y + 1;
 }
 
 starpu_codelet mycodelet = {
@@ -32,10 +32,23 @@ starpu_codelet mycodelet = {
         .nbuffers = 2
 };
 
+#define ACQUIRE_DATA \
+        if (rank == 0) starpu_data_acquire(data_handlesx0, STARPU_R);    \
+        if (rank == 1) starpu_data_acquire(data_handlesx1, STARPU_R);    \
+        fprintf(stderr, "[%d] Values: %d %d\n", rank, x0, x1);
+
+#define RELEASE_DATA \
+        if (rank == 0) starpu_data_release(data_handlesx0); \
+        if (rank == 1) starpu_data_release(data_handlesx1); \
+
+#define CHECK_RESULT \
+        if (rank == 0) assert(x0 == vx0[0] && x1 == vx1[0]); \
+        if (rank == 1) assert(x0 == vx0[1] && x1 == vx1[1]);
+
 int main(int argc, char **argv)
 {
-        int rank, size;
-        unsigned x0, x1;
+        int rank, size, err;
+        int x0=0, x1=0, vx0[2] = {x0, x0}, vx1[2]={x1,x1};
         starpu_data_handle data_handlesx0;
         starpu_data_handle data_handlesx1;
 
@@ -45,23 +58,69 @@ int main(int argc, char **argv)
         if (rank == 0) {
                 starpu_variable_data_register(&data_handlesx0, 0, (uintptr_t)&x0, sizeof(x0));
                 starpu_data_set_rank(data_handlesx0, rank);
-                starpu_variable_data_register(&data_handlesx1, -1, (uintptr_t)NULL, sizeof(unsigned));
+                starpu_variable_data_register(&data_handlesx1, -1, (uintptr_t)NULL, sizeof(int));
                 starpu_data_set_rank(data_handlesx1, 1);
         }
         else if (rank == 1) {
                 starpu_variable_data_register(&data_handlesx1, 0, (uintptr_t)&x1, sizeof(x1));
                 starpu_data_set_rank(data_handlesx1, rank);
-                starpu_variable_data_register(&data_handlesx0, -1, (uintptr_t)NULL, sizeof(unsigned));
+                starpu_variable_data_register(&data_handlesx0, -1, (uintptr_t)NULL, sizeof(int));
                 starpu_data_set_rank(data_handlesx0, 0);
         }
 
-        int err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_RW, data_handlesx0, STARPU_RW, data_handlesx1, 0);
-        if (err == -EINVAL) {
-                fprintf(stderr, "starpu_mpi_insert_task failed as expected\n");
-        }
-        else {
-                return 1;
-        }
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_R, data_handlesx0, STARPU_W, data_handlesx1, 0);
+        assert(err == 0);
+        ACQUIRE_DATA;
+        vx1[1]++;
+        CHECK_RESULT;
+        RELEASE_DATA;
+
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_RW, data_handlesx0, STARPU_R, data_handlesx1, 0);
+        assert(err == 0);
+        ACQUIRE_DATA;
+        vx0[0] ++;
+        CHECK_RESULT;
+        RELEASE_DATA;
+
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_RW, data_handlesx0, STARPU_RW, data_handlesx1, 0);
+        assert(err == -EINVAL);
+        ACQUIRE_DATA;
+        CHECK_RESULT;
+        RELEASE_DATA;
+
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_RW, data_handlesx0, STARPU_RW, data_handlesx1, STARPU_EXECUTE, 1, 0);
+        assert(err == 0);
+        ACQUIRE_DATA;
+        vx0[0] ++ ; vx1[1] ++;
+        CHECK_RESULT;
+        RELEASE_DATA;
+
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_RW, data_handlesx0, STARPU_RW, data_handlesx1, STARPU_EXECUTE, 0, 0);
+        assert(err == 0);
+        ACQUIRE_DATA;
+        vx0[0] ++ ; vx1[1] ++;
+        CHECK_RESULT;
+        RELEASE_DATA;
+
+        /* Here the value specified by the property STARPU_EXECUTE is
+           going to be ignored as the data model clearly specifies
+           which task is going to execute the codelet */
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_R, data_handlesx0, STARPU_W, data_handlesx1, STARPU_EXECUTE, 12, 0);
+        assert(err == 0);
+        ACQUIRE_DATA;
+        vx1[1] ++;
+        CHECK_RESULT;
+        RELEASE_DATA;
+
+        /* Here the value specified by the property STARPU_EXECUTE is
+           going to be ignored as the data model clearly specifies
+           which task is going to execute the codelet */
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet, STARPU_W, data_handlesx0, STARPU_R, data_handlesx1, STARPU_EXECUTE, 11, 0);
+        assert(err == 0);
+        ACQUIRE_DATA;
+        vx0[0] ++;
+        CHECK_RESULT;
+        RELEASE_DATA;
 
         starpu_task_wait_for_all();
 	starpu_mpi_shutdown();

mpi/tests/insert_task_owner2.c

@@ -0,0 +1,100 @@
+/* StarPU --- Runtime system for heterogeneous multicore architectures.
+ *
+ * Copyright (C) 2011  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 <math.h>
+
+void func_cpu(void *descr[], __attribute__ ((unused)) void *_args)
+{
+	int *x0 = (int *)STARPU_VARIABLE_GET_PTR(descr[0]);
+	int *x1 = (int *)STARPU_VARIABLE_GET_PTR(descr[1]);
+	int *x2 = (int *)STARPU_VARIABLE_GET_PTR(descr[2]);
+	int *y = (int *)STARPU_VARIABLE_GET_PTR(descr[3]);
+
+//        fprintf(stderr, "-------> CODELET VALUES: %d %d %d %d\n", *x0, *x1, *x2, *y);
+//
+//        *x2 = 45;
+//        *y = 144;
+//
+        fprintf(stderr, "-------> CODELET VALUES: %d %d %d %d\n", *x0, *x1, *x2, *y);
+        *y = (*x0 + *x1) * -100;
+        *x1 = 12;
+        *x2 = 24;
+        fprintf(stderr, "-------> CODELET VALUES: %d %d %d %d\n", *x0, *x1, *x2, *y);
+}
+
+starpu_codelet mycodelet = {
+	.where = STARPU_CPU,
+	.cpu_func = func_cpu,
+        .nbuffers = 4
+};
+
+int main(int argc, char **argv)
+{
+        int rank, size, err;
+        int x[3], y=0;
+        int i;
+        starpu_data_handle data_handles[4];
+
+	starpu_init(NULL);
+	starpu_mpi_initialize_extended(1, &rank, &size);
+
+        if (rank == 0) {
+                for(i=0 ; i<3 ; i++) {
+                        x[i] = -10*(i+1);
+                        starpu_variable_data_register(&data_handles[i], 0, (uintptr_t)&x[i], sizeof(x[i]));
+                        starpu_data_set_rank(data_handles[i], rank);
+                }
+                y = -40;
+                starpu_variable_data_register(&data_handles[3], -1, (uintptr_t)NULL, sizeof(int));
+                starpu_data_set_rank(data_handles[3], 1);
+        }
+        else if (rank == 1) {
+                for(i=0 ; i<3 ; i++) {
+                        x[i] = -20;
+                        starpu_variable_data_register(&data_handles[i], -1, (uintptr_t)NULL, sizeof(int));
+                        starpu_data_set_rank(data_handles[i], 0);
+                }
+                y=-20;
+                starpu_variable_data_register(&data_handles[3], 0, (uintptr_t)&y, sizeof(int));
+                starpu_data_set_rank(data_handles[3], rank);
+        }
+        fprintf(stderr, "[%d] VALUES: %d %d %d %d\n", rank, x[0], x[1], x[2], y);
+
+        err = starpu_mpi_insert_task(MPI_COMM_WORLD, &mycodelet,
+                                     STARPU_R, data_handles[0], STARPU_RW, data_handles[1],
+                                     STARPU_W, data_handles[2],
+                                     STARPU_W, data_handles[3],
+                                     STARPU_EXECUTE, 1, 0);
+        assert(err == 0);
+        starpu_task_wait_for_all();
+
+        if (rank == 0) {
+                for(i=0 ; i<3 ; i++) {
+                        starpu_data_acquire(data_handles[i], STARPU_R);
+                }
+        }
+        else if (rank == 1) {
+                starpu_data_acquire(data_handles[3], STARPU_R);
+        }
+        fprintf(stderr, "[%d] VALUES: %d %d %d %d\n", rank, x[0], x[1], x[2], y);
+
+	starpu_mpi_shutdown();
+	starpu_shutdown();
+
+	return 0;
+}
+