Klockwork issues: (#3883)

Comparing size_t >= 0 |= for bools
NervanaSystems · Nov 13, 2019 · 66ce838 · 66ce838
1 parent e5bc085
commit 66ce838
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/ngraph/op/gather.cpp b/src/ngraph/op/gather.cpp
@@ -134,7 +134,7 @@ void op::v1::Gather::validate_and_infer_types()
     if (input_rank.is_static() && axis != AXIS_NOT_SET_VALUE)
     {
         NODE_VALIDATION_CHECK(this,
-                              axis >= 0 && axis < static_cast<size_t>(input_rank),
+                              axis < static_cast<size_t>(input_rank),
                               "The axis must => 0 and <= input_rank (axis: ",
                               axis,
                               ").");

diff --git a/src/ngraph/op/pad.cpp b/src/ngraph/op/pad.cpp
@@ -286,8 +286,7 @@ void op::v1::Pad::validate_and_infer_types()
     {
         NODE_VALIDATION_CHECK(
             this,
-            static_cast<size_t>(pads_begin_shape[0]) >= 0 &&
-                static_cast<size_t>(pads_begin_shape[0]) <= static_cast<size_t>(arg_shape_rank),
+            static_cast<size_t>(pads_begin_shape[0]) <= static_cast<size_t>(arg_shape_rank),
             "Number of elements of pads_begin must be >= 0 and <= arg rank (pads_begin_shape[0]: ",
             pads_begin_shape[0],
             ").");
@@ -296,8 +295,7 @@ void op::v1::Pad::validate_and_infer_types()
     {
         NODE_VALIDATION_CHECK(
             this,
-            static_cast<size_t>(pads_end_shape[0]) >= 0 &&
-                static_cast<size_t>(pads_end_shape[0]) <= static_cast<size_t>(arg_shape_rank),
+            static_cast<size_t>(pads_end_shape[0]) <= static_cast<size_t>(arg_shape_rank),
             "Number of elements of pads_end must be >= 0 and <= arg rank (pads_end_shape[0]: ",
             pads_end_shape[0],
             ").");

diff --git a/src/ngraph/op/softmax.cpp b/src/ngraph/op/softmax.cpp
@@ -96,7 +96,7 @@ void op::v0::Softmax::validate_and_infer_types()
             for (auto axis : m_axes)
             {
                 NODE_VALIDATION_CHECK(this,
-                                      axis >= 0 && axis < static_cast<size_t>(input_shape.rank()),
+                                      axis < static_cast<size_t>(input_shape.rank()),
                                       "Reduction axis (",
                                       axis,
                                       ") is out of bounds (argument shape: ",

diff --git a/test/util.cpp b/test/util.cpp
@@ -678,8 +678,14 @@ TEST(util, clone_function_op_annotations)
     {
         if (auto op_annotation = parameter->get_op_annotations())
         {
-            found_A |= op_annotation->is_cacheable();
-            found_B |= !op_annotation->is_cacheable();
+            if (op_annotation->is_cacheable())
+            {
+                found_A = true;
+            }
+            else
+            {
+                found_B = true;
+            }
         }
     }
     EXPECT_TRUE(found_A);