Merge branch 'develop' into cse-fix

src/onnx/onnx.cpp

@@ -524,15 +524,7 @@ struct onnx_parser
 
         if(contains(attributes, "ends"))
         {
-            literal s = parse_value(attributes.at("ends"));
-            s.visit([&](auto v) { copy(v, std::back_inserter(op.ends)); });
-            for(size_t i = 0; i < num_dims; i++)
-            {
-                if(static_cast<size_t>(op.ends[i]) > dims[i])
-                {
-                    op.ends[i] = dims[i];
-                }
-            }
+            op.ends = get_indices(attributes.at("ends"));
         }
         if(contains(attributes, "starts"))
         {
@@ -1548,6 +1540,20 @@ struct onnx_parser
         return result;
     }
 
+    static std::vector<int64_t> get_indices(const onnx::AttributeProto& attr)
+    {
+        std::vector<int64_t> result;
+        literal s = parse_value(attr);
+        s.visit([&](auto v) { copy(v, std::back_inserter(result)); });
+        // Clamp large indices to -1
+        std::replace_if(
+            result.begin(),
+            result.end(),
+            [](auto x) { return x > int64_t{std::numeric_limits<std::int32_t>::max()} / 2; },
+            -1);
+        return result;
+    }
+
     template <class T>
     static literal from_repeated(shape::type_t t, const T& r)
     {