Merge branch 'dyn_check_shapes' of github.com:ROCmSoftwarePlatform/AMDMIGraphX into dyn_topK

src/include/migraphx/check_shapes.hpp

@@ -43,26 +43,28 @@ struct check_shapes
     check_shapes(const shape* b, const shape* e, const std::string& n, const bool d = false)
         : begin(b), end(e), name(n), dynamic_allowed(d)
     {
+        check_dynamic();
     }
 
     template <class Op>
     check_shapes(const shape* b, const shape* e, const Op& op, const bool d = false)
         : begin(b), end(e), name(op.name()), dynamic_allowed(d)
     {
+        check_dynamic();
     }
 
     template <class Op>
     check_shapes(const std::vector<shape>& s, const Op& op, const bool d = false)
         : begin(s.data()), end(s.data() + s.size()), name(op.name()), dynamic_allowed(d)
     {
+        check_dynamic();
     }
 
-    ~check_shapes()
+    void check_dynamic() const
     {
         if(not dynamic_allowed and this->any_of([&](const shape& s) { return s.dynamic(); }))
         {
-            std::cerr << prefix() << "Dynamic shapes not supported" << std::endl;
-            std::abort();
+            MIGRAPHX_THROW(prefix() + "Dynamic shapes not supported");
         }
     }
 
@@ -184,6 +186,9 @@ struct check_shapes
     {
         if(!this->same([](const shape& s) { return s.max_lens(); }))
             MIGRAPHX_THROW(prefix() + "Dimensions do not match");
+        if(this->any_of([&](const shape& s) { return s.dynamic(); }))
+            if(!this->same([](const shape& s) { return s.min_lens(); }))
+                MIGRAPHX_THROW(prefix() + "Min dynamic dimensions do not match");
         return *this;
     }
 

test/check_shapes_test.cpp

+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015-2022 Advanced Micro Devices, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "test.hpp"
+#include <migraphx/check_shapes.hpp>
+#include <migraphx/make_op.hpp>
+
+/*!
+ * Tests for check_shapes object handling dynamic shapes
+ */
+
+using migraphx::shape;
+
+TEST_CASE(fail_dynamic_shape)
+{
+    shape a{shape::int64_type, {3}};
+    shape b{shape::float_type, {{3, 6, 0}, {4, 4, 0}}};
+    auto op = migraphx::make_op("add");
+    EXPECT(test::throws([&] { migraphx::check_shapes{{a, b}, op}; }));
+}
+
+TEST_CASE(allow_dynamic_shape)
+{
+    shape a{shape::int64_type, {3}};
+    shape b{shape::float_type, {{3, 6, 0}, {4, 4, 0}}};
+    auto op = migraphx::make_op("add");
+    migraphx::check_shapes{{a, b}, op, true};
+    // Should have no exceptions
+}
+
+int main(int argc, const char* argv[]) { test::run(argc, argv); }