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
Solver as an configuration option for CPU
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
62c30c4
..
18df256
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
2
. 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. */
/* 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. */
@@
-12,7
+12,6
@@
#include "src/surf/cpu_cas01.hpp"
#include "src/surf/cpu_ti.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/cpu_cas01.hpp"
#include "src/surf/cpu_ti.hpp"
#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu_cas, res_cpu, "CPU resource, CAS01 model (used by default)");
@@
-35,6
+34,9
@@
static simgrid::config::Flag<std::string>
"Cannot change the optimization algorithm after the initialization");
});
"Cannot change the optimization algorithm after the initialization");
});
+static simgrid::config::Flag<std::string> cfg_cpu_solver("cpu/solver", "Set linear equations solver used by CPU model",
+ "maxmin", &simgrid::kernel::lmm::System::validate_solver);
+
/*********
* Model *
*********/
/*********
* Model *
*********/
@@
-68,7
+70,7
@@
CpuCas01Model::CpuCas01Model(const std::string& name) : CpuModel(name)
select = true;
}
select = true;
}
- set_maxmin_system(
new lmm::System(
select));
+ set_maxmin_system(
lmm::System::build(config::get_value<std::string>("cpu/solver"),
select));
}
CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
}
CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate)
@@
-115,7
+117,7
@@
void CpuCas01::apply_event(profile::Event* event, double value)
}
} else {
const lmm::Element* elem = nullptr;
}
} else {
const lmm::Element* elem = nullptr;
- double date =
surf_
get_clock();
+ double date =
EngineImpl::
get_clock();
get_iface()->turn_off();
get_iface()->turn_off();