A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce scope for variable 'rank'.
[simgrid.git]
/
src
/
smpi
/
internals
/
smpi_deployment.cpp
diff --git
a/src/smpi/internals/smpi_deployment.cpp
b/src/smpi/internals/smpi_deployment.cpp
index
f7eea95
..
441d608
100644
(file)
--- a/
src/smpi/internals/smpi_deployment.cpp
+++ b/
src/smpi/internals/smpi_deployment.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
8
. The SimGrid Team.
+/* Copyright (c) 2004-201
9
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-16,8
+16,7
@@
namespace app {
class Instance {
public:
class Instance {
public:
- Instance(const std::string name, int max_no_processes, int process_count, MPI_Comm comm,
- simgrid::s4u::Barrier* finalization_barrier)
+ Instance(const std::string name, int max_no_processes, MPI_Comm comm, simgrid::s4u::Barrier* finalization_barrier)
: name(name)
, size(max_no_processes)
, present_processes(0)
: name(name)
, size(max_no_processes)
, present_processes(0)
@@
-44,7
+43,10
@@
extern int process_count; // How many processes have been allocated over all ins
* @brief Registers a running instance of a MPI program.
*
* @param name the reference name of the function.
* @brief Registers a running instance of a MPI program.
*
* @param name the reference name of the function.
- * @param code the main mpi function (must have a int ..(int argc, char *argv[])) prototype
+ * @param code either the main mpi function
+ * (must have a int ..(int argc, char *argv[]) prototype) or nullptr
+ * (if the function deployment is managed somewhere else —
+ * e.g., when deploying manually or using smpirun)
* @param num_processes the size of the instance we want to deploy
*/
void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes)
* @param num_processes the size of the instance we want to deploy
*/
void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes)
@@
-62,8
+64,7
@@
void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
}
}
}
}
- Instance instance(std::string(name), num_processes, process_count, MPI_COMM_NULL,
- new simgrid::s4u::Barrier(num_processes));
+ Instance instance(std::string(name), num_processes, MPI_COMM_NULL, new simgrid::s4u::Barrier(num_processes));
MPI_Group group = new simgrid::smpi::Group(instance.size);
instance.comm_world = new simgrid::smpi::Comm(group, nullptr);
// FIXME : using MPI_Attr_put with MPI_UNIVERSE_SIZE is forbidden and we make it a no-op (which triggers a warning as MPI_ERR_ARG is returned).
MPI_Group group = new simgrid::smpi::Group(instance.size);
instance.comm_world = new simgrid::smpi::Comm(group, nullptr);
// FIXME : using MPI_Attr_put with MPI_UNIVERSE_SIZE is forbidden and we make it a no-op (which triggers a warning as MPI_ERR_ARG is returned).