Skip to content

Commit

Permalink
Format files
Browse files Browse the repository at this point in the history
Co-authored-by: Terry Cojean <tcojean@users.noreply.github.com>
  • Loading branch information
ginkgo-bot and tcojean committed Apr 30, 2021
1 parent 7d82023 commit 55917da
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 20 deletions.
12 changes: 6 additions & 6 deletions core/test/log/logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ TEST(DummyLogged, CanAddLogger)
auto exec = gko::ReferenceExecutor::create();
DummyLoggedClass c;

c.add_logger(
gko::log::Convergence<>::create(exec, gko::log::Logger::all_events_mask));
c.add_logger(gko::log::Convergence<>::create(
exec, gko::log::Logger::all_events_mask));

ASSERT_EQ(c.get_num_loggers(), 1);
}
Expand All @@ -78,8 +78,8 @@ TEST(DummyLogged, CanAddMultipleLoggers)
auto exec = gko::ReferenceExecutor::create();
DummyLoggedClass c;

c.add_logger(
gko::log::Convergence<>::create(exec, gko::log::Logger::all_events_mask));
c.add_logger(gko::log::Convergence<>::create(
exec, gko::log::Logger::all_events_mask));
c.add_logger(gko::log::Stream<>::create(
exec, gko::log::Logger::all_events_mask, std::cout));

Expand Down Expand Up @@ -125,8 +125,8 @@ TEST(DummyLogged, CanRemoveLogger)
{
auto exec = gko::ReferenceExecutor::create();
DummyLoggedClass c;
auto r = gko::share(
gko::log::Convergence<>::create(exec, gko::log::Logger::all_events_mask));
auto r = gko::share(gko::log::Convergence<>::create(
exec, gko::log::Logger::all_events_mask));
c.add_logger(r);
c.add_logger(gko::log::Stream<>::create(
exec, gko::log::Logger::all_events_mask, std::cout));
Expand Down
18 changes: 6 additions & 12 deletions dpcpp/test/base/executor.dp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,12 @@ class DpcppExecutor : public ::testing::Test {
if (gko::DpcppExecutor::get_num_devices("gpu") > 1) {
dpcpp2 = gko::DpcppExecutor::create(1, omp, "gpu");
}
}
else if (gko::DpcppExecutor::get_num_devices("cpu") > 0) {
} else if (gko::DpcppExecutor::get_num_devices("cpu") > 0) {
dpcpp = gko::DpcppExecutor::create(0, omp, "cpu");
if (gko::DpcppExecutor::get_num_devices("cpu") > 1)
{
if (gko::DpcppExecutor::get_num_devices("cpu") > 1) {
dpcpp2 = gko::DpcppExecutor::create(1, omp, "cpu");
}
}
else {
} else {
GKO_NOT_IMPLEMENTED;
}
}
Expand All @@ -82,8 +79,7 @@ class DpcppExecutor : public ::testing::Test {
{
// ensure that previous calls finished and didn't throw an error
ASSERT_NO_THROW(dpcpp->synchronize());
if (dpcpp2 != nullptr)
{
if (dpcpp2 != nullptr) {
ASSERT_NO_THROW(dpcpp2->synchronize());
}
}
Expand All @@ -97,8 +93,7 @@ class DpcppExecutor : public ::testing::Test {
TEST_F(DpcppExecutor, CanInstantiateTwoExecutorsOnOneDevice)
{
auto dpcpp = gko::DpcppExecutor::create(0, omp);
if (dpcpp2 != nullptr)
{
if (dpcpp2 != nullptr) {
auto dpcpp2 = gko::DpcppExecutor::create(0, omp);
}

Expand Down Expand Up @@ -236,8 +231,7 @@ TEST_F(DpcppExecutor, CopiesDataFromCPU)

TEST_F(DpcppExecutor, CopiesDataFromDpcppToDpcpp)
{
if (dpcpp2 == nullptr)
{
if (dpcpp2 == nullptr) {
GTEST_SKIP();
}

Expand Down
4 changes: 2 additions & 2 deletions include/ginkgo/core/log/logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected: \
public: \
template <size_type Event, typename... Params> \
std::enable_if_t<Event == _id && (_id < event_count_max)> on( \
Params &&...params) const \
Params &&... params) const \
{ \
if (enabled_events_ & (mask_type{1} << _id)) { \
this->on_##_event_name(std::forward<Params>(params)...); \
Expand Down Expand Up @@ -616,7 +616,7 @@ class EnableLogging : public Loggable {

protected:
template <size_type Event, typename... Params>
void log(Params &&...params) const
void log(Params &&... params) const
{
for (auto &logger : loggers_) {
logger->template on<Event>(std::forward<Params>(params)...);
Expand Down

0 comments on commit 55917da

Please sign in to comment.