Skip to content

Commit

Permalink
clang format
Browse files Browse the repository at this point in the history
  • Loading branch information
fiedorowicz1 committed Jun 13, 2024
1 parent 7ad843a commit 2b6564d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 23 deletions.
11 changes: 2 additions & 9 deletions include/lbann/utils/dnn_lib/cudnn/transform_tensor.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC.
// Copyright (c) 2014-2024, Lawrence Livermore National Security, LLC.
// Produced at the Lawrence Livermore National Laboratory.
// Written by the LBANN Research Team (B. Van Essen, et al.) listed in
// the CONTRIBUTORS file. <[email protected]>
Expand Down Expand Up @@ -51,14 +51,7 @@ void transform_tensor(ScalarParameterType const& alpha_in,
using LibScalingParamT = dnn_lib::ScalingParamType<TensorDataType>;
auto alpha = static_cast<LibScalingParamT>(alpha_in);
auto beta = static_cast<LibScalingParamT>(beta_in);
CHECK_CUDNN(
cudnnTransformTensor(handle,
&alpha,
xDesc,
x,
&beta,
yDesc,
y));
CHECK_CUDNN(cudnnTransformTensor(handle, &alpha, xDesc, x, &beta, yDesc, y));
}

} // namespace dnn_lib
Expand Down
10 changes: 2 additions & 8 deletions include/lbann/utils/dnn_lib/miopen/transform_tensor.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC.
// Copyright (c) 2014-2024, Lawrence Livermore National Security, LLC.
// Produced at the Lawrence Livermore National Laboratory.
// Written by the LBANN Research Team (B. Van Essen, et al.) listed in
// the CONTRIBUTORS file. <[email protected]>
Expand Down Expand Up @@ -52,13 +52,7 @@ void transform_tensor(ScalarParameterType const& alpha_in,
auto alpha = static_cast<LibScalingParamT>(alpha_in);
auto beta = static_cast<LibScalingParamT>(beta_in);
CHECK_MIOPEN(
miopenTransformTensor(handle,
&alpha,
xDesc,
x,
&beta,
yDesc,
y));
miopenTransformTensor(handle, &alpha, xDesc, x, &beta, yDesc, y));
}

} // namespace dnn_lib
Expand Down
2 changes: 1 addition & 1 deletion include/lbann/utils/dnn_lib/transform_tensor.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2014-2023, Lawrence Livermore National Security, LLC.
// Copyright (c) 2014-2024, Lawrence Livermore National Security, LLC.
// Produced at the Lawrence Livermore National Laboratory.
// Written by the LBANN Research Team (B. Van Essen, et al.) listed in
// the CONTRIBUTORS file. <[email protected]>
Expand Down
19 changes: 14 additions & 5 deletions src/layers/distconv_adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,13 @@ void distconv_adapter::setup_distributions(
m_error_signals_dists.emplace_back(error_signals_dist);

std::string layer_name = layer().get_name();
constraints.update_name(get_prev_activations_dist(), layer_name + " prev_activations ");
constraints.update_name(get_prev_activations_dist(),
layer_name + " prev_activations ");
constraints.update_name(get_activations_dist(), layer_name + " activations ");
constraints.update_name(get_prev_error_signals_dist(), layer_name + " prev_error_signals ");
constraints.update_name(get_error_signals_dist(), layer_name + " error_signals ");
constraints.update_name(get_prev_error_signals_dist(),
layer_name + " prev_error_signals ");
constraints.update_name(get_error_signals_dist(),
layer_name + " error_signals ");
}

void distconv_adapter::impose_adjacent_overlap_constraints(
Expand Down Expand Up @@ -476,7 +479,8 @@ void tensor_overlap_constraints::mark_invariant(const dc::Dist& d)
m_invariants.insert(&d);
}

void tensor_overlap_constraints::update_name(const dc::Dist& d, std::string name)
void tensor_overlap_constraints::update_name(const dc::Dist& d,
std::string name)
{
m_names[&d] = name;
}
Expand All @@ -494,7 +498,12 @@ void tensor_overlap_constraints::find_valid_overlap()
// p must have equal dist as d but is different.
if (m_invariants.find(p) != m_invariants.end()) {
// p can't be changed, so we can't solve the constraint.
LBANN_ERROR("Incompatible overlap: ", m_names[d], *d, " <=> ", m_names[p], *p);
LBANN_ERROR("Incompatible overlap: ",
m_names[d],
*d,
" <=> ",
m_names[p],
*p);
}
p->set_overlap(d->get_overlap());
updated_new.insert(p);
Expand Down

0 comments on commit 2b6564d

Please sign in to comment.