From: Augustin Degomme Date: Fri, 25 Apr 2014 14:57:12 +0000 (+0200) Subject: Add an example of use of the previous interface. X-Git-Tag: v3_11~98^2~34 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/13923923e3d6b9d9bb2ab05a7b5ddd8b4f5aaa09 Add an example of use of the previous interface. This is based on the masterslave_mailbox example for MSG, but adds two instances of MPI application: one doing a simple send/recv, the other performing an alltoall. --- diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 0d0f09ac8e..86aa23abd1 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -512,6 +512,16 @@ if(NOT enable_memcheck) endif() endif() + + ADD_TEST(smpi-msg-masterslave-thread ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave --cd ${CMAKE_BINARY_DIR}/examples/smpi/smpi_msg_masterslave ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh) + if(CONTEXT_UCONTEXT) + ADD_TEST(smpi-msg-masterslave-ucontext ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave --cd ${CMAKE_BINARY_DIR}/examples/smpi/smpi_msg_masterslave ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh) + endif() + if(HAVE_RAWCTX) + ADD_TEST(smpi-msg-masterslave-raw ${TESH_COMMAND} ${TESH_OPTION} --cfg contexts/factory:raw --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave --cd ${CMAKE_BINARY_DIR}/examples/smpi/smpi_msg_masterslave ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh) + endif() + + if(HAVE_TRACING) ADD_TEST(smpi-tracing-ptp ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh) ADD_TEST(smpi-replay ${TESH_COMMAND} ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/smpi_replay.tesh) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 4d85ae8eb4..fd01ee7712 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -995,6 +995,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/simdag/properties/CMakeLists.txt examples/simdag/scheduling/CMakeLists.txt examples/smpi/CMakeLists.txt + examples/smpi/smpi_msg_masterslave/CMakeLists.txt examples/smpi/MM/CMakeLists.txt examples/smpi/energy/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake index 5b3c396d8f..23623f414d 100644 --- a/buildtools/Cmake/MakeExe.cmake +++ b/buildtools/Cmake/MakeExe.cmake @@ -73,6 +73,7 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/MM) +add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/energy) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f77) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f90) diff --git a/examples/smpi/smpi_msg_masterslave/CMakeLists.txt b/examples/smpi/smpi_msg_masterslave/CMakeLists.txt new file mode 100644 index 0000000000..5d03cf60a9 --- /dev/null +++ b/examples/smpi/smpi_msg_masterslave/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 2.6) + +if(enable_smpi) + set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}") + include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi") + + add_executable(masterslave_mailbox_smpi masterslave_mailbox_smpi.c) + target_link_libraries(masterslave_mailbox_smpi simgrid) +endif() + +set(tesh_files + ${tesh_files} + ${CMAKE_CURRENT_SOURCE_DIR}/msg_smpi.tesh + PARENT_SCOPE + ) +set(xml_files + ${xml_files} + ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox_smpi.xml + PARENT_SCOPE + ) +set(examples_src + ${examples_src} + ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_mailbox_smpi.c + PARENT_SCOPE + ) +set(bin_files + ${bin_files} + PARENT_SCOPE + ) +set(txt_files + ${txt_files} + PARENT_SCOPE + ) diff --git a/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml new file mode 100644 index 0000000000..0dc4672ccf --- /dev/null +++ b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c new file mode 100644 index 0000000000..f36ee995a1 --- /dev/null +++ b/examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c @@ -0,0 +1,187 @@ +/* Copyright (c) 2010-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include +#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "xbt/sysdep.h" /* calloc, printf */ +#include "mpi.h" +/* Create a log channel to have nice outputs. */ +#include "xbt/log.h" +#include "xbt/asserts.h" +#include "smpi/private.h" +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, + "Messages specific for this msg example"); + +int master(int argc, char *argv[]); +int slave(int argc, char *argv[]); +int master_mpi(int argc, char *argv[]); +int alltoall_mpi(int argc, char *argv[]); + +/** Emitter function */ +int master(int argc, char *argv[]) +{ + long number_of_tasks = atol(argv[1]); + double task_comp_size = atof(argv[2]); + double task_comm_size = atof(argv[3]); + long slaves_count = atol(argv[4]); + + int i; + + XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, + number_of_tasks); + + for (i = 0; i < number_of_tasks; i++) { + char mailbox[256]; + char sprintf_buffer[256]; + msg_task_t task = NULL; + + sprintf(mailbox, "slave-%ld", i % slaves_count); + sprintf(sprintf_buffer, "Task_%d", i); + task = + MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, + NULL); + if (number_of_tasks < 10000 || i % 10000 == 0) + XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, + number_of_tasks, mailbox); + + MSG_task_send(task, mailbox); + } + + XBT_INFO + ("All tasks have been dispatched. Let's tell everybody the computation is over."); + for (i = 0; i < slaves_count; i++) { + char mailbox[80]; + + sprintf(mailbox, "slave-%ld", i % slaves_count); + msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0); + MSG_task_send(finalize, mailbox); + } + +// XBT_INFO("Goodbye now!"); + return 0; +} /* end_of_master */ + + +int master_mpi(int argc, char *argv[]) +{ + MPI_Init(&argc, &argv); + + int rank; + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + XBT_INFO("here for rank %d", rank); + int test[1000]={rank}; + if(rank==0) + MPI_Send(&test, 1000, + MPI_INT, 1, 1, MPI_COMM_WORLD); + else + MPI_Recv(&test, 1000, + MPI_INT, 0, 1, MPI_COMM_WORLD, MPI_STATUSES_IGNORE); + + XBT_INFO("After comm %d", rank); + MPI_Finalize(); + + XBT_INFO("After finalize %d %d", rank, test[0]); + return 0; +} /* end_of_master */ + + + +int alltoall_mpi(int argc, char *argv[]) +{ + MPI_Init(&argc, &argv); + + int rank, size; + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + XBT_INFO("alltoall for rank %d", rank); + int* out=malloc(1000*size*sizeof(int)); + int* in=malloc(1000*size*sizeof(int)); + MPI_Alltoall(out, 1000, MPI_INT,in, 1000, MPI_INT, MPI_COMM_WORLD); + + XBT_INFO("after alltoall %d", rank); + free(out); + free(in); + MPI_Finalize(); + return 0; +} /* end_of_master */ + + +/** Receiver function */ +int slave(int argc, char *argv[]) +{ + msg_task_t task = NULL; + _XBT_GNUC_UNUSED int res; + int id = -1; + char mailbox[80]; + _XBT_GNUC_UNUSED int read; + + read = sscanf(argv[1], "%d", &id); + xbt_assert(read, "Invalid argument %s\n", argv[1]); + + sprintf(mailbox, "slave-%d", id); + + while (1) { + res = MSG_task_receive(&(task), mailbox); + xbt_assert(res == MSG_OK, "MSG_task_get failed"); + +// XBT_INFO("Received \"%s\"", MSG_task_get_name(task)); + if (!strcmp(MSG_task_get_name(task), "finalize")) { + MSG_task_destroy(task); + break; + } +// XBT_INFO("Processing \"%s\"", MSG_task_get_name(task)); + MSG_task_execute(task); +// XBT_INFO("\"%s\" done", MSG_task_get_name(task)); + MSG_task_destroy(task); + task = NULL; + } + XBT_INFO("I'm done. See you!"); + + return 0; +} /* end_of_slave */ + +/** Main function */ +int main(int argc, char *argv[]) +{ + msg_error_t res; + const char *platform_file; + const char *application_file; + + MSG_init(&argc, argv); + + if (argc < 3) { + printf("Usage: %s platform_file deployment_file\n", argv[0]); + printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]); + exit(1); + } + platform_file = argv[1]; + application_file = argv[2]; + + /* MSG_config("workstation/model","KCCFLN05"); */ + { /* Simulation setting */ + MSG_create_environment(platform_file); + } + { /* Application deployment */ + MSG_function_register("master", master); + MSG_function_register("slave", slave); + // launch two MPI applications as well, one using master_mpi function as main on 2 nodes + SMPI_app_instance_register("master_mpi", master_mpi,2); + // the second performing an alltoall on 4 nodes + SMPI_app_instance_register("alltoall_mpi", alltoall_mpi,4); + MSG_launch_application(application_file); + SMPI_init(); + } + res = MSG_main(); + + XBT_INFO("Simulation time %g", MSG_get_clock()); + + + SMPI_finalize(); + if (res == MSG_OK) + return 0; + else + return 1; +} /* end_of_main */ diff --git a/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh b/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh new file mode 100644 index 0000000000..2334119a32 --- /dev/null +++ b/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh @@ -0,0 +1,42 @@ +p Test the use of SMPI+MSG in the same file, as well as several different SMPI instances at the same time +$ ./masterslave_mailbox_smpi ${srcdir:=.}/../../msg/small_platform_with_routers.xml ./deployment_masterslave_mailbox_smpi.xml --log=smpi.:info +> [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/running_power:" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. +> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 1 slaves and 20 tasks to process +> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" (of 20) to mailbox "slave-0" +> [Ginette:master_mpi:(3) 0.000000] [msg_test/INFO] here for rank 0 +> [Bourassa:master_mpi:(4) 0.000000] [msg_test/INFO] here for rank 1 +> [Ginette:alltoall_mpi:(5) 0.000000] [msg_test/INFO] alltoall for rank 0 +> [Bourassa:alltoall_mpi:(6) 0.000000] [msg_test/INFO] alltoall for rank 1 +> [Jupiter:alltoall_mpi:(7) 0.000000] [msg_test/INFO] alltoall for rank 2 +> [Fafard:alltoall_mpi:(8) 0.000000] [msg_test/INFO] alltoall for rank 3 +> [Ginette:master_mpi:(3) 0.000000] [msg_test/INFO] After comm 0 +> [Tremblay:master:(1) 0.002265] [msg_test/INFO] Sending "Task_1" (of 20) to mailbox "slave-0" +> [Bourassa:master_mpi:(4) 0.016868] [msg_test/INFO] After comm 1 +> [Ginette:master_mpi:(3) 0.049112] [msg_test/INFO] After finalize 0 0 +> [Bourassa:master_mpi:(4) 0.049112] [msg_test/INFO] After finalize 1 0 +> [Ginette:alltoall_mpi:(5) 0.098642] [msg_test/INFO] after alltoall 0 +> [Fafard:alltoall_mpi:(8) 0.099069] [msg_test/INFO] after alltoall 3 +> [Bourassa:alltoall_mpi:(6) 0.127526] [msg_test/INFO] after alltoall 1 +> [Jupiter:alltoall_mpi:(7) 0.127802] [msg_test/INFO] after alltoall 2 +> [Tremblay:master:(1) 0.514241] [msg_test/INFO] Sending "Task_2" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 1.026216] [msg_test/INFO] Sending "Task_3" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 1.538191] [msg_test/INFO] Sending "Task_4" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 2.050166] [msg_test/INFO] Sending "Task_5" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 2.562142] [msg_test/INFO] Sending "Task_6" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 3.074117] [msg_test/INFO] Sending "Task_7" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 3.586092] [msg_test/INFO] Sending "Task_8" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 4.098067] [msg_test/INFO] Sending "Task_9" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 4.610043] [msg_test/INFO] Sending "Task_10" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 5.122018] [msg_test/INFO] Sending "Task_11" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 5.633993] [msg_test/INFO] Sending "Task_12" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 6.145968] [msg_test/INFO] Sending "Task_13" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 6.657944] [msg_test/INFO] Sending "Task_14" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 7.169919] [msg_test/INFO] Sending "Task_15" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 7.681894] [msg_test/INFO] Sending "Task_16" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 8.193869] [msg_test/INFO] Sending "Task_17" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 8.705845] [msg_test/INFO] Sending "Task_18" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 9.217820] [msg_test/INFO] Sending "Task_19" (of 20) to mailbox "slave-0" +> [Tremblay:master:(1) 9.729795] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over. +> [Tremblay:slave:(2) 10.239700] [msg_test/INFO] I'm done. See you! +> [10.239700] [msg_test/INFO] Simulation time 10.2397 +