Merge branch 'develop' into resize_parse_opt

.clang-tidy

@@ -117,3 +117,7 @@ CheckOptions:
     value:           MIGRAPHX_
   - key:             readability-identifier-naming.ConstexprMethodIgnoredRegexp
     value:           'quiet_NaN|signaling_NaN'
+  - key:             readability-operators-representation.BinaryOperators
+    value:           'and;or;not'
+  - key:             readability-operators-representation.OverloadedOperators
+    value:           'and;or;not'

docs/sphinx/requirements.in

@@ -1,2 +1,2 @@
-rocm-docs-core==1.13.0
+rocm-docs-core==1.14.1
 sphinx-collapse

docs/sphinx/requirements.txt

@@ -1,7 +1,7 @@
 #####################################################################################
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) 2015-2025 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
@@ -32,6 +32,13 @@ accessible-pygments==0.0.5
     # via pydata-sphinx-theme
 alabaster==0.7.16
     # via sphinx
+asttokens==3.0.0
+    # via stack-data
+attrs==24.3.0
+    # via
+    #   jsonschema
+    #   jupyter-cache
+    #   referencing
 babel==2.15.0
     # via
     #   pydata-sphinx-theme
@@ -49,9 +56,17 @@ cffi==1.16.0
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
-    # via sphinx-external-toc
+    # via
+    #   jupyter-cache
+    #   sphinx-external-toc
+comm==0.2.2
+    # via ipykernel
 cryptography==43.0.1
     # via pyjwt
+debugpy==1.8.12
+    # via ipykernel
+decorator==5.1.1
+    # via ipython
 deprecated==1.2.14
     # via pygithub
 docutils==0.21.2
@@ -60,36 +75,104 @@ docutils==0.21.2
     #   myst-parser
     #   pydata-sphinx-theme
     #   sphinx
+exceptiongroup==1.2.2
+    # via ipython
+executing==2.1.0
+    # via stack-data
 fastjsonschema==2.20.0
-    # via rocm-docs-core
+    # via
+    #   nbformat
+    #   rocm-docs-core
 gitdb==4.0.11
     # via gitpython
 gitpython==3.1.43
     # via rocm-docs-core
+greenlet==3.1.1
+    # via sqlalchemy
 idna==3.7
     # via requests
 imagesize==1.4.1
     # via sphinx
+importlib-metadata==8.6.1
+    # via
+    #   jupyter-cache
+    #   myst-nb
+ipykernel==6.29.5
+    # via myst-nb
+ipython==8.31.0
+    # via
+    #   ipykernel
+    #   myst-nb
+jedi==0.19.2
+    # via ipython
 jinja2==3.1.4
     # via
     #   myst-parser
     #   sphinx
+jsonschema==4.23.0
+    # via nbformat
+jsonschema-specifications==2024.10.1
+    # via jsonschema
+jupyter-cache==1.0.1
+    # via myst-nb
+jupyter-client==8.6.3
+    # via
+    #   ipykernel
+    #   nbclient
+jupyter-core==5.7.2
+    # via
+    #   ipykernel
+    #   jupyter-client
+    #   nbclient
+    #   nbformat
 markdown-it-py==3.0.0
     # via
     #   mdit-py-plugins
     #   myst-parser
 markupsafe==2.1.5
     # via jinja2
+matplotlib-inline==0.1.7
+    # via
+    #   ipykernel
+    #   ipython
 mdit-py-plugins==0.4.1
     # via myst-parser
 mdurl==0.1.2
     # via markdown-it-py
-myst-parser==3.0.1
+myst-nb==1.1.2
     # via rocm-docs-core
+myst-parser==3.0.1
+    # via myst-nb
+nbclient==0.10.2
+    # via
+    #   jupyter-cache
+    #   myst-nb
+nbformat==5.10.4
+    # via
+    #   jupyter-cache
+    #   myst-nb
+    #   nbclient
+nest-asyncio==1.6.0
+    # via ipykernel
 packaging==24.1
     # via
+    #   ipykernel
     #   pydata-sphinx-theme
     #   sphinx
+parso==0.8.4
+    # via jedi
+pexpect==4.9.0
+    # via ipython
+platformdirs==4.3.6
+    # via jupyter-core
+prompt-toolkit==3.0.50
+    # via ipython
+psutil==6.1.1
+    # via ipykernel
+ptyprocess==0.7.0
+    # via pexpect
+pure-eval==0.2.3
+    # via stack-data
 pycparser==2.22
     # via cffi
 pydata-sphinx-theme==0.15.4
@@ -101,23 +184,42 @@ pygithub==2.3.0
 pygments==2.18.0
     # via
     #   accessible-pygments
+    #   ipython
     #   pydata-sphinx-theme
     #   sphinx
 pyjwt[crypto]==2.8.0
     # via pygithub
 pynacl==1.5.0
     # via pygithub
+python-dateutil==2.9.0.post0
+    # via jupyter-client
 pyyaml==6.0.1
     # via
+    #   jupyter-cache
+    #   myst-nb
     #   myst-parser
     #   rocm-docs-core
     #   sphinx-external-toc
+pyzmq==26.2.0
+    # via
+    #   ipykernel
+    #   jupyter-client
+referencing==0.36.1
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
 requests==2.32.3
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==1.13.0
+rocm-docs-core==1.14.1
     # via -r requirements.in
+rpds-py==0.22.3
+    # via
+    #   jsonschema
+    #   referencing
+six==1.17.0
+    # via python-dateutil
 smmap==5.0.1
     # via gitdb
 snowballstemmer==2.2.0
@@ -127,6 +229,7 @@ soupsieve==2.5
 sphinx==7.4.7
     # via
     #   breathe
+    #   myst-nb
     #   myst-parser
     #   pydata-sphinx-theme
     #   rocm-docs-core
@@ -160,15 +263,43 @@ sphinxcontrib-qthelp==1.0.8
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
+sqlalchemy==2.0.37
+    # via jupyter-cache
+stack-data==0.6.3
+    # via ipython
+tabulate==0.9.0
+    # via jupyter-cache
 tomli==2.0.1
     # via sphinx
+tornado==6.4.2
+    # via
+    #   ipykernel
+    #   jupyter-client
+traitlets==5.14.3
+    # via
+    #   comm
+    #   ipykernel
+    #   ipython
+    #   jupyter-client
+    #   jupyter-core
+    #   matplotlib-inline
+    #   nbclient
+    #   nbformat
 typing-extensions==4.12.2
     # via
+    #   ipython
+    #   myst-nb
     #   pydata-sphinx-theme
     #   pygithub
+    #   referencing
+    #   sqlalchemy
 urllib3==2.2.2
     # via
     #   pygithub
     #   requests
+wcwidth==0.2.13
+    # via prompt-toolkit
 wrapt==1.16.0
     # via deprecated
+zipp==3.21.0
+    # via importlib-metadata

requirements.txt

@@ -1,7 +1,7 @@
 #####################################################################################
 # The MIT License (MIT)
 #
-# Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+# Copyright (c) 2015-2025 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
@@ -28,4 +28,4 @@ pybind/pybind11@3e9dfa2866941655c56877882565e7577de6fc7b --build
 msgpack/msgpack-c@cpp-3.3.0 -DMSGPACK_BUILD_TESTS=Off
 sqlite3@3.43.2 -DCMAKE_POSITION_INDEPENDENT_CODE=On
 ROCm/composable_kernel@b7775add2d28251674d81e220cd4a857b90b997a -DCK_BUILD_JIT_LIB=On -DCMAKE_POSITION_INDEPENDENT_CODE=On
-ROCm/rocMLIR@a4e823033fa9ce016d24fd7df9133982634646e3 -DBUILD_FAT_LIBROCKCOMPILER=On
+ROCm/rocMLIR@9bffae0f4929e14d4d269af4af19e7d0482dd67a -DBUILD_FAT_LIBROCKCOMPILER=On

src/apply_alpha_beta.cpp

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2022 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 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
@@ -51,7 +51,7 @@ instruction_ref insert_apply_alpha_beta(module& m,
     auto op_res = m.insert_instruction(pos, op, a, b);
     if(args.size() == 3)
     {
-        if(not float_equal(beta.at<float>(0), 0.0) && args[2]->get_shape().elements() > 0)
+        if(not float_equal(beta.at<float>(0), 0.0) and args[2]->get_shape().elements() > 0)
         {
             auto out_lens = op_res->get_shape().lens();
             auto c        = args[2];

src/driver/argument_parser.hpp

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 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
@@ -433,7 +433,7 @@ struct argument_parser
             argument* input_argument =
                 self.find_argument([](const auto& arg) { return arg.flags.empty(); });
             auto required_usages = get_argument_usages(get_required_arguments());
-            if(required_usages.empty() && input_argument)
+            if(required_usages.empty() and input_argument)
                 required_usages.push_back(input_argument->metavar);
             required_usages.insert(required_usages.begin(), "<options>");
             print_usage(required_usages);

src/driver/perf.cpp

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 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
@@ -127,7 +127,7 @@ bool is_offload_copy_set(const program& p)
             for(const auto& j : return_args)
             {
                 auto alias_ins = instruction::get_output_alias(j, true);
-                if((alias_ins->name() == "@param" && param_ins.erase(alias_ins) == 0) or
+                if((alias_ins->name() == "@param" and param_ins.erase(alias_ins) == 0) or
                    (alias_ins->name() != "hip::copy_from_gpu"))
                     return false;
             }

src/include/migraphx/op/nonmaxsuppression.hpp

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2023 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 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
@@ -335,7 +335,7 @@ struct nonmaxsuppression
             auto batch_boxes_start = boxes.begin() + batch_idx * num_boxes * 4;
             auto boxes_heap = filter_boxes_by_score(scores_start, num_boxes, score_threshold);
             int64_t selected_boxes_inside_class = 0;
-            while(not boxes_heap.empty() &&
+            while(not boxes_heap.empty() and
                   selected_boxes_inside_class < max_output_boxes_per_class)
             {
                 // select next top scorer box and remove any boxes from boxes_heap that exceeds IOU

src/include/migraphx/raw_data.hpp

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 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
@@ -275,7 +275,7 @@ auto visit_all(const std::vector<T>& x)
 
 template <class T,
           class U,
-          MIGRAPHX_REQUIRES(std::is_base_of<raw_data_base, T>{} &&
+          MIGRAPHX_REQUIRES(std::is_base_of<raw_data_base, T>{} and
                             std::is_base_of<raw_data_base, U>{})>
 bool operator==(const T& x, const U& y)
 {
@@ -294,7 +294,7 @@ bool operator==(const T& x, const U& y)
 
 template <class T,
           class U,
-          MIGRAPHX_REQUIRES(std::is_base_of<raw_data_base, T>{} &&
+          MIGRAPHX_REQUIRES(std::is_base_of<raw_data_base, T>{} and
                             std::is_base_of<raw_data_base, U>{})>
 bool operator!=(const T& x, const U& y)
 {

src/include/migraphx/requires.hpp

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2015-2022 Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2015-2025 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
@@ -47,10 +47,10 @@ using bool_c = std::integral_constant<bool, B>;
 #define MIGRAPHX_REQUIRES(...) class = void
 #define MIGRAPHX_CLASS_REQUIRES(...) void
 #else
-#define MIGRAPHX_REQUIRES(...)                                           \
-    long MIGRAPHX_REQUIRES_VAR()            = __LINE__,                  \
-         typename std::enable_if<(MIGRAPHX_REQUIRES_VAR() == __LINE__ && \
-                                  (migraphx::and_<__VA_ARGS__>{})),      \
+#define MIGRAPHX_REQUIRES(...)                                            \
+    long MIGRAPHX_REQUIRES_VAR()            = __LINE__,                   \
+         typename std::enable_if<(MIGRAPHX_REQUIRES_VAR() == __LINE__ and \
+                                  (migraphx::and_<__VA_ARGS__>{})),       \
                                  int>::type = 0
 #define MIGRAPHX_CLASS_REQUIRES(...) typename std::enable_if<(migraphx::and_<__VA_ARGS__>{})>::type
 #endif