Resolved errors introduced by include-what-you-use and various other PRs

LLNL · Mar 21, 2023 · cb9b040 · cb9b040
1 parent 41766ae
commit cb9b040
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/lbann/operators/declare_stateless_op.hpp b/include/lbann/operators/declare_stateless_op.hpp
@@ -140,7 +140,7 @@
     }                                                                          \
     void do_fill_description(description&) const final                         \
     {}                                                                         \
-  }
+  };
 
 namespace lbann {
 

diff --git a/include/lbann/operators/math/binary_with_constant.hpp b/include/lbann/operators/math/binary_with_constant.hpp
@@ -33,7 +33,7 @@
 #include "lbann/utils/cloneable.hpp"
 
 #ifdef LBANN_HAS_ONNX
-#include <onnx/onnx-ml.pb.h>
+#include <onnx/onnx_pb.h>
 #endif // LBANN_HAS_ONNX
 
 
@@ -163,6 +163,7 @@ LBANN_DECLARE_BINARY_WITH_CONSTANT_OPERATOR(GreaterEqualConstant,
 LBANN_DECLARE_BINARY_WITH_CONSTANT_OPERATOR(GreaterConstant,
                                             "greater than constant");
 
+#ifdef LBANN_HAS_ONNX
 inline onnx::NodeProto get_constant_node(float val)
 {
   onnx::NodeProto const_node;
@@ -307,6 +308,7 @@ get_onnx_nodes_impl(GreaterEqualConstantOperator<T, D> const op)
   nodes.back().set_op_type("PreConstant");
   return nodes;
 }
+#endif // LBANN_HAS_ONNX
 
 } // namespace lbann
 #endif // LBANN_INCLUDE_LBANN_OPERATORS_BINARY_WITH_CONSTANT_HPP_INCLUDED