From: Frederic Suter Date: Fri, 26 Feb 2016 12:32:22 +0000 (+0100) Subject: replace dumb deployment file by C X-Git-Tag: v3_13~647^2~14 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5ff2cc523323c13420258f7984461904c856a620 replace dumb deployment file by C --- diff --git a/examples/msg/pmm/CMakeLists.txt b/examples/msg/pmm/CMakeLists.txt index 330bf98f4a..9159113b19 100644 --- a/examples/msg/pmm/CMakeLists.txt +++ b/examples/msg/pmm/CMakeLists.txt @@ -5,10 +5,6 @@ set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/pmm.tesh PARENT_SCOPE) -set(xml_files - ${xml_files} - ${CMAKE_CURRENT_SOURCE_DIR}/pmm_9_deploy.xml - PARENT_SCOPE) set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/msg_pmm.c diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c index f1e02aac43..587742acbd 100644 --- a/examples/msg/pmm/msg_pmm.c +++ b/examples/msg/pmm/msg_pmm.c @@ -9,22 +9,15 @@ #include "simgrid/msg.h" #include "xbt/matrix.h" #include "xbt/log.h" - -// #define BENCH_THIS_CODE /* Will only work from within the source tree as we require xbt/xbt_os_time.h, that is not public yet) */ -#ifdef BENCH_THIS_CODE #include "xbt/xbt_os_time.h" -#endif /** @addtogroup MSG_examples * - * - pmm/msg_pmm.c: Parallel Matrix Multiplication is a little - * application. This is something that most MPI developper have - * written during their class, here implemented using MSG instead - * of MPI. + * - pmm/msg_pmm.c: Parallel Matrix Multiplication is a little application. This is something that most MPI + * developers have written during their class, here implemented using MSG instead of MPI. */ -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pmm, - "Messages specific for this msg example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pmm, "Messages specific for this msg example"); /* This example should always be executed using a deployment of * GRID_SIZE * GRID_SIZE nodes. */ @@ -144,15 +137,12 @@ int node(int argc, char **argv) receive_results(results); /* First add our results */ - xbt_matrix_copy_values(C, sC, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, - 0, 0, 0, 0, NULL); + xbt_matrix_copy_values(C, sC, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, 0, 0, 0, 0, NULL); /* Reconstruct the rest of the result matrix */ for (node = 1; node < GRID_NUM_NODES; node++){ - xbt_matrix_copy_values(C, results[node]->sC, - NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, - NODE_MATRIX_SIZE * results[node]->row, - NODE_MATRIX_SIZE * results[node]->col, + xbt_matrix_copy_values(C, results[node]->sC, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, + NODE_MATRIX_SIZE * results[node]->row, NODE_MATRIX_SIZE * results[node]->col, 0, 0, NULL); xbt_matrix_free(results[node]->sC); xbt_free(results[node]); @@ -173,8 +163,7 @@ int node(int argc, char **argv) result = xbt_new0(s_result_t, 1); result->row = myjob->row; result->col = myjob->col; - result->sC = - xbt_matrix_new_sub(sC, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, 0, 0, NULL); + result->sC = xbt_matrix_new_sub(sC, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, 0, 0, NULL); task = MSG_task_create("result",100,100,result); MSG_task_send(task, "0"); } @@ -217,8 +206,7 @@ static node_job_t wait_job(int selfid) msg_error_t err; snprintf(self_mbox, MAILBOX_NAME_SIZE - 1, "%d", selfid); err = MSG_task_receive(&task, self_mbox); - xbt_assert(err == MSG_OK, "Error while receiving from %s (%d)", - self_mbox, (int)err); + xbt_assert(err == MSG_OK, "Error while receiving from %s (%d)", self_mbox, (int)err); job = (node_job_t)MSG_task_get_data(task); MSG_task_destroy(task); XBT_VERB("Got Job (%d,%d)", job->row, job->col); @@ -240,7 +228,6 @@ static void broadcast_matrix(xbt_matrix_t M, int num_nodes, int *nodes) MSG_task_dsend(task, node_mbox, task_cleanup); XBT_DEBUG("sub-matrix sent to %s", node_mbox); } - } static void get_sub_matrix(xbt_matrix_t *sM, int selfid) @@ -266,9 +253,6 @@ static void task_cleanup(void *arg){ MSG_task_destroy(task); } -/** - * \brief Main function. - */ int main(int argc, char *argv[]) { #ifdef BENCH_THIS_CODE @@ -277,14 +261,18 @@ int main(int argc, char *argv[]) MSG_init(&argc, argv); - char **options = &argv[1]; - const char* platform_file = options[0]; - const char* application_file = options[1]; - - MSG_create_environment(platform_file); + MSG_create_environment(argv[1]); MSG_function_register("node", node); - MSG_launch_application(application_file); + for(int i = 0 ; i< 9; i++) { + char *hostname = bprintf("node-%d.acme.org", i); + char **argvF = xbt_new(char *, 3); + argvF[0] = xbt_strdup("node"); + argvF[1] = bprintf("%d", i); + argvF[2] = NULL; + MSG_process_create_with_arguments("node", node, NULL, MSG_host_by_name(hostname), 2, argvF); + xbt_free(hostname); + } #ifdef BENCH_THIS_CODE xbt_os_cputimer_start(timer); @@ -326,13 +314,9 @@ static void create_jobs(xbt_matrix_t A, xbt_matrix_t B, node_job_t *jobs) /* Assign a sub matrix of A and B to the job */ jobs[node]->A = - xbt_matrix_new_sub(A, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, - NODE_MATRIX_SIZE * row, NODE_MATRIX_SIZE * col, - NULL); + xbt_matrix_new_sub(A, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE * row, NODE_MATRIX_SIZE * col, NULL); jobs[node]->B = - xbt_matrix_new_sub(B, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, - NODE_MATRIX_SIZE * row, NODE_MATRIX_SIZE * col, - NULL); + xbt_matrix_new_sub(B, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE * row, NODE_MATRIX_SIZE * col, NULL); if (++col >= GRID_SIZE){ col = 0; diff --git a/examples/msg/pmm/pmm.tesh b/examples/msg/pmm/pmm.tesh index 44c61f4ea2..bb6abf7552 100644 --- a/examples/msg/pmm/pmm.tesh +++ b/examples/msg/pmm/pmm.tesh @@ -3,7 +3,7 @@ p Testing the Parallel Matrix Multiplication ! timeout 120 -$ ./pmm/msg_pmm --log=msg_pmm.thres:verbose --log=no_loc ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/pmm/pmm_9_deploy.xml +$ ./pmm/msg_pmm --log=msg_pmm.thres:verbose --log=no_loc ${srcdir:=.}/../platforms/cluster.xml > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 0 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 1 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 2 diff --git a/examples/msg/pmm/pmm_9_deploy.xml b/examples/msg/pmm/pmm_9_deploy.xml deleted file mode 100644 index 140d9f532a..0000000000 --- a/examples/msg/pmm/pmm_9_deploy.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - -