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

Jump to bottom

Fixing Cori #1979

Merged
merged 5 commits into from Feb 10, 2016
Merged

Fixing Cori #1979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95fbaa2
Fixing issue with parsing the slurm node list when node numbers are l…
sithhell Feb 9, 2016
7697612
Fixing warning about overriding virtual functions with different numb…
sithhell Feb 9, 2016
6dbe057
Fixing compile error with std::ref
sithhell Feb 9, 2016
f19c947
Merge branch 'master' into fixing_cori
sithhell Feb 10, 2016
2ef857d
Fixing merge conflict
sithhell Feb 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hpx/lcos/detail/future_data.hpp
View file
Open in desktop
Expand Up @@ -392,7 +392,7 @@ namespace detail
if (!run_on_completed_on_new_thread(
util::deferred_call(&future_data::run_on_completed,
std::move(this_), std::move(on_completed),
std::ref(ptr)),
boost::ref(ptr)),
ec))
{
// thread creation went wrong
Expand Down
12 changes: 6 additions & 6 deletions hpx/runtime/actions/manage_object_action.hpp
View file
Open in desktop
Expand Up @@ -95,11 +95,11 @@ namespace hpx { namespace actions
virtual manage_object_action_base const& get_instance() const;

// serialization support
virtual serialize_save_function save() const
virtual serialize_save_function save_function() const
{
return &manage_object_action_base::save_;
}
virtual serialize_load_function load() const
virtual serialize_load_function load_function() const
{
return &manage_object_action_base::load_;
}
Expand Down Expand Up @@ -180,11 +180,11 @@ namespace hpx { namespace actions
}

// serialization support
serialize_save_function save() const
serialize_save_function save_function() const
{
return &manage_object_action::save_;
}
serialize_load_function load() const
serialize_load_function load_function() const
{
return &manage_object_action::load_;
}
Expand Down Expand Up @@ -273,11 +273,11 @@ namespace hpx { namespace actions

private:
// serialization support
serialize_save_function save() const
serialize_save_function save_function() const
{
return &manage_object_action::save_;
}
serialize_load_function load() const
serialize_load_function load_function() const
{
return &manage_object_action::load_;
}
Expand Down
12 changes: 6 additions & 6 deletions hpx/runtime/components/server/memory_block.hpp
View file
Open in desktop
Expand Up @@ -300,13 +300,13 @@ namespace hpx { namespace components
ar << size; //-V128
ar << hpx::serialization::detail::raw_ptr(act);

HPX_ASSERT(act->save());
HPX_ASSERT(act->save_function());
if (config) {
act->save()(data->get_ptr(), data->get_size(), ar, version,
act->save_function()(data->get_ptr(), data->get_size(), ar, version,
config->get_ptr());
}
else {
act->save()(data->get_ptr(), data->get_size(), ar, version, 0);
act->save_function()(data->get_ptr(), data->get_size(), ar, version, 0);
}
}

Expand Down Expand Up @@ -337,13 +337,13 @@ namespace hpx { namespace components
new (server::detail::allocate_block<alloc_type>(size))
alloc_type(size, act->get_instance()); //-V522

HPX_ASSERT(act->load()); //-V522
HPX_ASSERT(act->load_function()); //-V522
if (config) {
act->load()(p->get_ptr(), size, ar, version, //-V522
act->load_function()(p->get_ptr(), size, ar, version, //-V522
config->get_ptr());
}
else {
act->load()(p->get_ptr(), size, ar, version, 0); //-V522
act->load_function()(p->get_ptr(), size, ar, version, 0); //-V522
}

delete act;
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/applier/applier.cpp
View file
Open in desktop
Expand Up @@ -494,7 +494,7 @@ namespace hpx { namespace applier
client.route(
std::move(p),
util::bind(&detail::parcel_sent_handler,
std::ref(parcel_handler_),
boost::ref(parcel_handler_),
util::placeholders::_1, util::placeholders::_2),
threads::thread_priority_normal);
break;
Expand Down
14 changes: 10 additions & 4 deletions src/util/batch_environments/slurm_environment.cpp
View file
Open in desktop
Expand Up @@ -210,10 +210,16 @@ namespace hpx { namespace util { namespace batch_environments
for(std::size_t i = begin; i <= end; ++i)
{
std::string s(prefix);
if(i < 10 && range[0].length() > 1)
s += "0";
if(i < 100 && range[0].length() > 2)
s += "0";
std::size_t dec = 10;
// pad with zeros
for(std::size_t j = 0; j < range[0].length()-1; ++j)
{
if(i < dec)
{
s += "0";
}
dec *= 10;
}
s += boost::lexical_cast<std::string>(i);
if(push_now)
{
Expand Down