X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d2995483b57463581ffdc4365fe1999ddc306c2..8e5fd16d72295f8ddcb7181f5c2760cd2f10c72d:/src/smpi/internals/smpi_global.cpp diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 9518a17884..5f63d1a6b8 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -3,13 +3,14 @@ /* 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 "smpi_host.hpp" #include "mc/mc.h" #include "simgrid/s4u/Engine.hpp" #include "smpi_coll.hpp" -#include "smpi_process.hpp" -#include "src/msg/msg_private.hpp" +#include "smpi_f2c.hpp" +#include "smpi_host.hpp" +#include "src/kernel/activity/CommImpl.hpp" #include "src/simix/smx_private.hpp" +#include "src/smpi/include/smpi_actor.hpp" #include "xbt/config.hpp" #include /* DBL_MAX */ @@ -41,6 +42,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke #include #include /* trim_right / trim_left */ +#if defined(__INTEL_COMPILER) || defined(__ICC) + extern "C" void for_rtl_init_ (int *, char **); +#elif defined(__GNUC__) + extern "C" void _gfortran_set_args(int, char **); +#elif defined(__FLANG) + extern "C" void __io_set_argc(int); + extern "C" void __io_set_argv(char **); +#endif + #ifndef RTLD_DEEPBIND /* RTLD_DEEPBIND is a bad idea of GNU ld that obviously does not exist on other platforms * See https://www.akkadia.org/drepper/dsohowto.pdf @@ -51,19 +61,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (ke #if HAVE_PAPI #include "papi.h" -const char* papi_default_config_name = "default"; - -struct papi_process_data { - papi_counter_t counter_data; - int event_set; -}; +std::string papi_default_config_name = "default"; +std::map units2papi_setup; #endif using simgrid::s4u::Actor; using simgrid::s4u::ActorPtr; std::unordered_map location2speedup; -static std::map process_data; +static std::map process_data; int process_count = 0; static int smpi_exit_status = 0; int smpi_universe_size = 0; @@ -99,16 +105,17 @@ int smpi_process_count() return process_count; } -simgrid::smpi::Process* smpi_process() +simgrid::smpi::ActorExt* smpi_process() { ActorPtr me = Actor::self(); + if (me == nullptr) // This happens sometimes (eg, when linking against NS3 because it pulls openMPI...) return nullptr; - simgrid::msg::ActorExt* msgExt = static_cast(me->get_impl()->get_user_data()); - return static_cast(msgExt->data); + + return process_data.at(me); } -simgrid::smpi::Process* smpi_process_remote(ActorPtr actor) +simgrid::smpi::ActorExt* smpi_process_remote(ActorPtr actor) { return process_data.at(actor); } @@ -118,7 +125,7 @@ MPI_Comm smpi_process_comm_self(){ } void smpi_process_init(int *argc, char ***argv){ - simgrid::smpi::Process::init(argc, argv); + simgrid::smpi::ActorExt::init(argc, argv); } int smpi_process_index(){ @@ -126,11 +133,11 @@ int smpi_process_index(){ } void * smpi_process_get_user_data(){ - return smpi_process()->get_user_data(); + return Actor::self()->get_impl()->get_user_data(); } void smpi_process_set_user_data(void *data){ - return smpi_process()->set_user_data(data); + Actor::self()->get_impl()->set_user_data(data); } @@ -279,13 +286,11 @@ void smpi_global_init() // This map holds for each computation unit (such as "default" or "process1" etc.) // the configuration as given by the user (counter data as a pair of (counter_name, counter_counter)) // and the (computed) event_set. - std::map units2papi_setup; if (not simgrid::config::get_value("smpi/papi-events").empty()) { if (PAPI_library_init(PAPI_VER_CURRENT) != PAPI_VER_CURRENT) XBT_ERROR("Could not initialize PAPI library; is it correctly installed and linked?" - " Expected version is %i", - PAPI_VER_CURRENT); + " Expected version is %u", PAPI_VER_CURRENT); typedef boost::tokenizer> Tokenizer; boost::char_separator separator_units(";"); @@ -362,6 +367,8 @@ void smpi_global_destroy() if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) smpi_destroy_global_memory_segments(); smpi_free_static(); + if(simgrid::smpi::F2C::lookup() != nullptr) + simgrid::smpi::F2C::delete_lookup(); } static void smpi_init_options(){ @@ -372,7 +379,7 @@ static void smpi_init_options(){ simgrid::smpi::Colls::smpi_coll_cleanup_callback = nullptr; smpi_cpu_threshold = simgrid::config::get_value("smpi/cpu-threshold"); smpi_host_speed = simgrid::config::get_value("smpi/host-speed"); - xbt_assert(smpi_host_speed >= 0, "You're trying to set the host_speed to a negative value (%f)", smpi_host_speed); + xbt_assert(smpi_host_speed > 0.0, "You're trying to set the host_speed to a non-positive value (given: %f)", smpi_host_speed); std::string smpi_privatize_option = simgrid::config::get_value("smpi/privatization"); if (smpi_privatize_option == "no" || smpi_privatize_option == "0") smpi_privatize_global_variables = SmpiPrivStrategies::NONE; @@ -419,13 +426,22 @@ typedef void (*smpi_fortran_entry_point_type)(); static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector args) { char noarg[] = {'\0'}; - const int argc = args.size(); + int argc = args.size(); std::unique_ptr argv(new char*[argc + 1]); for (int i = 0; i != argc; ++i) argv[i] = args[i].empty() ? noarg : &args[i].front(); argv[argc] = nullptr; - - int res = entry_point(argc, argv.get()); + char ** argvptr=argv.get(); + simgrid::smpi::ActorExt::init(&argc, &argvptr); +#if defined(__GNUC__) + _gfortran_set_args(argc, argvptr); +#elif defined(__FLANG) + __io_set_argc(argc); + __io_set_argv(argvptr); +#elif defined(__INTEL_COMPILER) || defined(__ICC) + for_rtl_init_ (&argc, argvptr); +#endif + int res = entry_point(argc, argvptr); if (res != 0){ XBT_WARN("SMPI process did not return 0. Return value : %d", res); if (smpi_exit_status == 0) @@ -441,7 +457,6 @@ static smpi_entry_point_type smpi_resolve_function(void* handle) smpi_fortran_entry_point_type entry_point_fortran = (smpi_fortran_entry_point_type)dlsym(handle, "user_main_"); if (entry_point_fortran != nullptr) { return [entry_point_fortran](int argc, char** argv) { - smpi_process_init(&argc, &argv); entry_point_fortran(); return 0; }; @@ -629,20 +644,18 @@ int smpi_main(const char* executable, int argc, char* argv[]) } TRACE_global_init(); - SIMIX_global_init(&argc, argv); - MSG_init(&argc, argv); // FIXME Remove this MSG call. Once it's removed, we can remove the msg header include as well SMPI_switch_data_segment = &smpi_switch_data_segment; // TODO This will not be executed in the case where smpi_main is not called, // e.g., not for smpi_msg_masterslave. This should be moved to another location - // that is always called -- maybe close to Actor::onCreation? + // that is always called -- maybe close to Actor::on_creation? simgrid::s4u::Host::on_creation.connect( [](simgrid::s4u::Host& host) { host.extension_set(new simgrid::smpi::Host(&host)); }); // parse the platform file: get the host list - SIMIX_create_environment(argv[1]); + simgrid::s4u::Engine::get_instance()->load_platform(argv[1]); SIMIX_comm_set_copy_data_callback(smpi_comm_copy_buffer_callback); smpi_init_options(); @@ -652,7 +665,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) smpi_init_privatization_no_dlopen(executable); SMPI_init(); - SIMIX_launch_application(argv[2]); + simgrid::s4u::Engine::get_instance()->load_deployment(argv[2]); SMPI_app_instance_register(smpi_default_instance_name.c_str(), nullptr, process_data.size()); // This call has a side effect on process_count... MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name); @@ -691,7 +704,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) void SMPI_init(){ simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::ActorPtr actor) { if (not actor->is_daemon()) { - process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)}); + process_data.insert({actor, new simgrid::smpi::ActorExt(actor, nullptr)}); } }); simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::ActorPtr actor) { @@ -705,7 +718,6 @@ void SMPI_init(){ smpi_init_options(); smpi_global_init(); smpi_check_options(); - simgrid::s4u::on_simulation_end.connect(TRACE_smpi_release); } void SMPI_finalize(){ @@ -713,6 +725,7 @@ void SMPI_finalize(){ } void smpi_mpi_init() { + smpi_init_fortran_types(); if(smpi_init_sleep > 0) simcall_process_sleep(smpi_init_sleep); }