Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MapperApp and ModelApp in bin folder #34

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix MapperApp and ModelApp in bin folder #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions bin/timeloop-mapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def load_configs(input_fnames):
with open(fname, 'r') as f:
yaml_str += f.read()
yaml_str += '\n'
config = Config.load_yaml(yaml_str)
config = Config(yaml_str, "yaml")
config.in_files = input_files
return config


Expand Down Expand Up @@ -58,7 +59,7 @@ def load_configs(input_fnames):
out_stats_fname = os.path.join(out_dir, 'timeloop-mapper.stats.txt')
out_mapping_fname = os.path.join(out_dir, 'timeloop-mapper.map.txt')

app = MapperApp(config, out_dir, log_level=log_level)
eval_stats, _ = app.run()
logger.info(f'Evaluation status: {eval_stats.eval_status}')
logger.info(f'Pre-evaluation status: {eval_stats.pre_eval_status}')
name = "timeloop-mapper"
app = MapperApp(config, out_dir, name)
eval_stats = app.run()
logger.info('Evaluation status: {}'.format(eval_stats.stats_string))
9 changes: 5 additions & 4 deletions bin/timeloop-model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def load_configs(input_fnames):
with open(fname, 'r') as f:
yaml_str += f.read()
yaml_str += '\n'
config = Config.load_yaml(yaml_str)
config = Config(yaml_str, "yaml")
config.in_files = input_files
return config


Expand Down Expand Up @@ -58,7 +59,7 @@ def load_configs(input_fnames):
out_stats_fname = os.path.join(out_dir, 'timeloop-model.stats.txt')
out_mapping_fname = os.path.join(out_dir, 'timeloop-model.map.txt')

app = ModelApp(config, out_dir, log_level=log_level)
name = "timeloop-model"
app = ModelApp(config, out_dir, name)
eval_stats = app.run()
logger.info('Evaluation status: {}'.format(eval_stats.eval_status))
logger.info('Pre-evaluation status: {}'.format(eval_stats.pre_eval_status))
logger.info('Evaluation status: {}'.format(eval_stats.stats_string))
19 changes: 11 additions & 8 deletions bindings/applications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,24 @@ namespace pytimeloop::application_bindings
py::class_<application::Model::Stats>(m, "ModelResult")
.def_readwrite("cycles", &application::Model::Stats::cycles)
.def_readwrite("energy", &application::Model::Stats::energy)
.def_readwrite("stats_string", &application::Model::Stats::stats_string);
.def_readwrite("stats_string", &application::Model::Stats::stats_string)
.def_readwrite("map_string", &application::Model::Stats::map_string)
.def_readwrite("xml_map_and_stats_string", &application::Model::Stats::xml_map_and_stats_string)
.def_readwrite("tensella_string", &application::Model::Stats::tensella_string);

py::class_<application::Mapper>(m, "MapperApp")
.def(py::init<config::CompoundConfig*, std::string, std::string>())
.def("run", &application::Mapper::Run)
.def("get_global_best", &application::Mapper::GetGlobalBest);

py::class_<application::Mapper::Result>(m, "MapperResult")
.PROPERTY(mapping_cpp_string, application::Mapper::Result)
.PROPERTY(mapping_yaml_string, application::Mapper::Result)
.PROPERTY(mapping_string, application::Mapper::Result)
.PROPERTY(stats_string, application::Mapper::Result)
.PROPERTY(tensella_string, application::Mapper::Result)
.PROPERTY(xml_mapping_stats_string, application::Mapper::Result)
.PROPERTY(orojenesis_string, application::Mapper::Result);
.def_readwrite("mapping_cpp_string", &application::Mapper::Result::mapping_cpp_string)
.def_readwrite("mapping_yaml_string", &application::Mapper::Result::mapping_yaml_string)
.def_readwrite("mapping_string", &application::Mapper::Result::mapping_string)
.def_readwrite("stats_string", &application::Mapper::Result::stats_string)
.def_readwrite("tensella_string", &application::Mapper::Result::tensella_string)
.def_readwrite("xml_mapping_stats_string", &application::Mapper::Result::xml_mapping_stats_string)
.def_readwrite("orojenesis_string", &application::Mapper::Result::orojenesis_string);

// EvaluationResult in mapper-thread.cpp
py::class_<EvaluationResult>(m, "MapperEvaluationResult")
Expand Down
4 changes: 4 additions & 0 deletions bindings/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@ void BindConfigClasses(py::module& m) {
)DOCSTRING";

config
/// @brief Initializer. Uses list of input file paths
.def(py::init<std::vector<std::string> &>())
/// @brief Initializer. Uses the CompoundConfig string + type constructor.
.def(py::init<std::string &, std::string &>())
/// @brief Fetches the root CompoundConfigNode.
.def_property_readonly("root", &CompoundConfig::getRoot)
/// @brief Member variable.
.def_readwrite("in_files", &CompoundConfig::inFiles)
/// @brief Pickling and unpickling support
.def(py::pickle(
[](CompoundConfig& config)
Expand Down