Skip to content

Commit d47a5ac

Browse files
benson31graham63
benson31
authored and
graham63
committed
Clang-format
1 parent 25a743d commit d47a5ac

File tree

4 files changed

+36
-42
lines changed

4 files changed

+36
-42
lines changed

‎include/lbann/layers/operator_layer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class OperatorLayer final : public data_type_layer<InputT, OutputT>
8383

8484
#ifdef LBANN_HAS_ONNX
8585
void fill_onnx_node(onnx::GraphProto& graph) const override;
86-
#endif //LBANN_HAS_ONNX
86+
#endif // LBANN_HAS_ONNX
8787

8888
void fp_compute() final;
8989
void bp_compute() final;

‎include/lbann/operators/math/binary_with_constant.hpp

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ inline onnx::NodeProto get_constant_node(float val)
177177
}
178178

179179
template <typename T, El::Device D>
180-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
181-
AddConstantOperator<T, D> const op)
180+
std::vector<onnx::NodeProto>
181+
get_onnx_nodes_impl(AddConstantOperator<T, D> const op)
182182
{
183183
std::vector<onnx::NodeProto> nodes(2UL);
184184
nodes.front().set_op_type("Add");
@@ -188,8 +188,7 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
188188
}
189189

190190
template <typename T, El::Device D>
191-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
192-
ScaleOperator<T, D> const op)
191+
std::vector<onnx::NodeProto> get_onnx_nodes_impl(ScaleOperator<T, D> const op)
193192
{
194193
std::vector<onnx::NodeProto> nodes(2UL);
195194
nodes.front().set_op_type("Mul");
@@ -199,8 +198,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
199198
}
200199

201200
template <typename T, El::Device D>
202-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
203-
SubtractConstantOperator<T, D> const op)
201+
std::vector<onnx::NodeProto>
202+
get_onnx_nodes_impl(SubtractConstantOperator<T, D> const op)
204203
{
205204
std::vector<onnx::NodeProto> nodes(2UL);
206205
nodes.front().set_op_type("Sub");
@@ -210,8 +209,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
210209
}
211210

212211
template <typename T, El::Device D>
213-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
214-
ConstantSubtractOperator<T, D> const op)
212+
std::vector<onnx::NodeProto>
213+
get_onnx_nodes_impl(ConstantSubtractOperator<T, D> const op)
215214
{
216215
std::vector<onnx::NodeProto> nodes(2UL);
217216
nodes.front().set_op_type("Sub");
@@ -221,8 +220,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
221220
}
222221

223222
template <typename T, El::Device D>
224-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
225-
MaxConstantOperator<T, D> const op)
223+
std::vector<onnx::NodeProto>
224+
get_onnx_nodes_impl(MaxConstantOperator<T, D> const op)
226225
{
227226
std::vector<onnx::NodeProto> nodes(2UL);
228227
nodes.front().set_op_type("Max");
@@ -232,8 +231,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
232231
}
233232

234233
template <typename T, El::Device D>
235-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
236-
MinConstantOperator<T, D> const op)
234+
std::vector<onnx::NodeProto>
235+
get_onnx_nodes_impl(MinConstantOperator<T, D> const op)
237236
{
238237
std::vector<onnx::NodeProto> nodes(2UL);
239238
nodes.front().set_op_type("Min");
@@ -243,8 +242,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
243242
}
244243

245244
template <typename T, El::Device D>
246-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
247-
EqualConstantOperator<T, D> const op)
245+
std::vector<onnx::NodeProto>
246+
get_onnx_nodes_impl(EqualConstantOperator<T, D> const op)
248247
{
249248
std::vector<onnx::NodeProto> nodes(2UL);
250249
nodes.front().set_op_type("Equal");
@@ -254,8 +253,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
254253
}
255254

256255
template <typename T, El::Device D>
257-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
258-
NotEqualConstantOperator<T, D> const op)
256+
std::vector<onnx::NodeProto>
257+
get_onnx_nodes_impl(NotEqualConstantOperator<T, D> const op)
259258
{
260259
std::vector<onnx::NodeProto> nodes(3UL);
261260
nodes.front().set_op_type("Equal");
@@ -266,8 +265,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
266265
}
267266

268267
template <typename T, El::Device D>
269-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
270-
LessConstantOperator<T, D> const op)
268+
std::vector<onnx::NodeProto>
269+
get_onnx_nodes_impl(LessConstantOperator<T, D> const op)
271270
{
272271
std::vector<onnx::NodeProto> nodes(2UL);
273272
nodes.front().set_op_type("Less");
@@ -277,8 +276,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
277276
}
278277

279278
template <typename T, El::Device D>
280-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
281-
LessEqualConstantOperator<T, D> const op)
279+
std::vector<onnx::NodeProto>
280+
get_onnx_nodes_impl(LessEqualConstantOperator<T, D> const op)
282281
{
283282
std::vector<onnx::NodeProto> nodes(2UL);
284283
nodes.front().set_op_type("LessOrEqual");
@@ -288,8 +287,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
288287
}
289288

290289
template <typename T, El::Device D>
291-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
292-
GreaterConstantOperator<T, D> const op)
290+
std::vector<onnx::NodeProto>
291+
get_onnx_nodes_impl(GreaterConstantOperator<T, D> const op)
293292
{
294293
std::vector<onnx::NodeProto> nodes(2UL);
295294
nodes.front().set_op_type("Greater");
@@ -299,8 +298,8 @@ std::vector<onnx::NodeProto> get_onnx_nodes_impl(
299298
}
300299

301300
template <typename T, El::Device D>
302-
std::vector<onnx::NodeProto> get_onnx_nodes_impl(
303-
GreaterEqualConstantOperator<T, D> const op)
301+
std::vector<onnx::NodeProto>
302+
get_onnx_nodes_impl(GreaterEqualConstantOperator<T, D> const op)
304303
{
305304
std::vector<onnx::NodeProto> nodes(2UL);
306305
nodes.front().set_op_type("GreaterOrEqual");

‎include/lbann/operators/operator.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ void Operator<InputT, OutputT, D>::serialize(ArchiveT& ar)
218218

219219
#ifdef LBANN_HAS_ONNX
220220
template <typename InputT, typename OutputT, El::Device D>
221-
std::vector<onnx::NodeProto> Operator<InputT, OutputT, D>::get_onnx_nodes() const
221+
std::vector<onnx::NodeProto>
222+
Operator<InputT, OutputT, D>::get_onnx_nodes() const
222223
{
223224
// The default assumption is that we don't know how to represent
224225
// this operator in ONNX terms yet.

‎src/layers/operator_layer.cpp

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ void OperatorLayer<T, O, L, D>::write_specific_proto(lbann_data::Layer& proto) c
5757

5858
#ifdef LBANN_HAS_ONNX
5959
template <typename T, typename O, data_layout L, El::Device D>
60-
void OperatorLayer<T, O, L, D>::fill_onnx_node(
61-
onnx::GraphProto& graph) const
60+
void OperatorLayer<T, O, L, D>::fill_onnx_node(onnx::GraphProto& graph) const
6261
{
6362
const auto& parents = this->get_parent_layers();
6463
auto nodes = m_ops.front()->get_onnx_nodes();
@@ -70,27 +69,22 @@ void OperatorLayer<T, O, L, D>::fill_onnx_node(
7069
op_node->set_domain("");
7170
op_node->set_doc_string(this->get_name());
7271

73-
//binary operators
74-
if(nodes.size() == 1)
75-
{
76-
for(auto* parent : parents)
77-
{
72+
// binary operators
73+
if (nodes.size() == 1) {
74+
for (auto* parent : parents) {
7875
size_t idx = parent->find_child_layer_index(*this);
7976
op_node->add_input(parent->get_name() + "_" + std::to_string(idx));
8077
}
8178
}
8279
// Binary w/ constant operators
83-
else if(nodes.size() == 2 || nodes.size() == 3)
84-
{
80+
else if (nodes.size() == 2 || nodes.size() == 3) {
8581
auto* const_node = graph.add_node();
8682
*const_node = nodes.back();
87-
if(const_node->op_type() == "PostConstant")
88-
{
83+
if (const_node->op_type() == "PostConstant") {
8984
op_node->add_input(parents[0]->get_name() + "_0");
9085
op_node->add_input(const_node->output(0));
9186
}
92-
else if(const_node->op_type() == "PreConstant")
93-
{
87+
else if (const_node->op_type() == "PreConstant") {
9488
op_node->add_input(const_node->output(0));
9589
op_node->add_input(parents[0]->get_name() + "_0");
9690
}
@@ -100,11 +94,11 @@ void OperatorLayer<T, O, L, D>::fill_onnx_node(
10094
const_node->set_op_type("Constant");
10195
}
10296
else
103-
LBANN_ERROR("Expected 1-3 ONNX nodes for binary operation, received ", nodes.size());
97+
LBANN_ERROR("Expected 1-3 ONNX nodes for binary operation, received ",
98+
nodes.size());
10499

105100
// Not equal operator
106-
if(nodes.size() == 3)
107-
{
101+
if (nodes.size() == 3) {
108102
op_node->add_output("EqualOperator");
109103
auto* not_node = graph.add_node();
110104
not_node->add_input(op_node->output(0));

0 commit comments

Comments
 (0)