Squashed commit of the following:

commit f778bb6 Author: Justin Chu <justinchu@microsoft.com> Date: Fri Sep 22 08:04:00 2023 -0700 Copilot and fix types commit 408d8c2 Author: Justin Chu <justinchu@microsoft.com> Date: Fri Sep 22 07:56:54 2023 -0700 Simplify using chatgpt commit 922a7b3 Author: Justin Chu <justinchu@microsoft.com> Date: Fri Sep 22 07:41:51 2023 -0700 Simplify cast commit c363da3 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 21:18:42 2023 -0700 Add inf back commit eb3526a Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 21:15:12 2023 -0700 Axis attribute commit 662e46e Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 21:12:23 2023 -0700 Lint commit 0969eea Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 21:12:10 2023 -0700 Compile commit 38b29c6 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 20:57:29 2023 -0700 AxisAttributeToInput commit e5a2c02 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 20:09:35 2023 -0700 EnsureAndReturnNode commit 482144b Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 20:00:30 2023 -0700 Update axis_input_to_attribute.h commit 74bb39c Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 19:25:07 2023 -0700 Add version converter Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 7afbfd3 Merge: 145f10d 3abb6b3 Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Thu Sep 21 16:34:26 2023 -0700 Merge branch 'main' into justinchu/dft commit 145f10d Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 16:33:36 2023 -0700 Fix annotations Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 4a08cdd Author: justinchuby <justinchuby@users.noreply.github.com> Date: Thu Sep 21 23:22:55 2023 +0000 CI:apply auto updated documentation/backend test data Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit cd755fe Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 16:12:32 2023 -0700 Wording and formatting Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 482ae2c Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 16:07:53 2023 -0700 Skip dft Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 57f6b14 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 16:06:14 2023 -0700 Sort lines Signed-off-by: Justin Chu <justinchu@microsoft.com> commit b560a07 Merge: 37c2e17 81ec6a5 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 16:05:13 2023 -0700 Merge branch 'main' into justinchu/dft commit 37c2e17 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 16:01:26 2023 -0700 Xfail version converter Signed-off-by: Justin Chu <justinchu@microsoft.com> commit cbf69ae Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 15:56:16 2023 -0700 Fix stft Signed-off-by: Justin Chu <justinchu@microsoft.com> commit a7168dd Author: justinchuby <justinchuby@users.noreply.github.com> Date: Thu Sep 21 22:49:29 2023 +0000 CI:apply auto updated documentation/backend test data Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit 3ac2ebe Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 15:36:56 2023 -0700 Fix test graphs Signed-off-by: Justin Chu <justinchu@microsoft.com> commit bb6b129 Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Thu Sep 21 15:21:34 2023 -0700 Update onnx/test/shape_inference_test.py Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com> commit 680059f Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 13:50:00 2023 -0700 Change default axis to -2 Signed-off-by: Justin Chu <justinchu@microsoft.com> commit e92256b Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 19:50:17 2023 +0000 Revert init Signed-off-by: Justin Chu <justinchu@microsoft.com> commit f5bbf06 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 19:48:26 2023 +0000 Fix node Signed-off-by: Justin Chu <justinchu@microsoft.com> commit d2a9069 Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Thu Sep 21 10:56:21 2023 -0700 Update onnx/backend/test/case/node/__init__.py Signed-off-by: Justin Chu <justinchuby@users.noreply.github.com> commit a017b3b Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 17:15:48 2023 +0000 Reference Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 5a84146 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 17:07:48 2023 +0000 Update tests Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 73bdff9 Merge: 5808dd6 a9e0a69 Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Thu Sep 21 10:08:38 2023 -0700 Merge branch 'main' into justinchu/dft commit 5808dd6 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 21 17:05:39 2023 +0000 Remove version converter Signed-off-by: Justin Chu <justinchu@microsoft.com> commit b2a07da Author: Justin Chu <justinchu@microsoft.com> Date: Tue Sep 19 16:44:08 2023 -0700 Snapshot Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 4d63e63 Author: justinchuby <justinchuby@users.noreply.github.com> Date: Tue Sep 19 23:43:42 2023 +0000 CI:apply auto updated documentation Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit b65b01b Author: Justin Chu <justinchu@microsoft.com> Date: Tue Sep 19 16:22:27 2023 -0700 Fix test Signed-off-by: Justin Chu <justinchu@microsoft.com> commit f35f162 Author: Justin Chu <justinchu@microsoft.com> Date: Tue Sep 19 16:22:05 2023 -0700 Rotate axis order Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 373c478 Author: Justin Chu <justinchu@microsoft.com> Date: Tue Sep 19 15:49:06 2023 -0700 shapshot Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 021de17 Author: Justin Chu <justinchu@microsoft.com> Date: Mon Sep 18 17:09:58 2023 -0700 shapshot Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 3300a64 Author: justinchuby <justinchuby@users.noreply.github.com> Date: Mon Sep 18 20:16:13 2023 +0000 CI:apply auto updated documentation Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit 08e001c Merge: c1d8a90 b302ccc Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Mon Sep 18 13:04:55 2023 -0700 Merge branch 'main' into justinchu/dft commit c1d8a90 Author: Justin Chu <justinchu@microsoft.com> Date: Mon Sep 18 13:04:20 2023 -0700 Add m Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 9e45c39 Author: justinchuby <justinchuby@users.noreply.github.com> Date: Fri Sep 15 20:33:03 2023 +0000 CI:apply auto updated documentation Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit f51a049 Author: Justin Chu <justinchu@microsoft.com> Date: Fri Sep 15 13:23:35 2023 -0700 Tweak spec Signed-off-by: Justin Chu <justinchu@microsoft.com> commit d72510e Author: justinchuby <justinchuby@users.noreply.github.com> Date: Fri Sep 15 19:55:22 2023 +0000 CI:apply auto updated documentation Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> commit 9750a39 Author: Justin Chu <justinchu@microsoft.com> Date: Fri Sep 15 12:44:15 2023 -0700 Fix import Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 8ea513a Author: Justin Chu <justinchu@microsoft.com> Date: Fri Sep 15 12:12:45 2023 -0700 Fix build errors Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 21a952e Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 22:08:13 2023 -0700 Test Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 1bb9254 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 22:01:39 2023 -0700 Try this Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 3402dfc Merge: fcce97f 821d156 Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Thu Sep 14 17:18:29 2023 -0700 Merge branch 'main' into justinchu/dft commit fcce97f Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 17:17:16 2023 -0700 Version converter Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 4069198 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 17:11:37 2023 -0700 Improve DFT doc Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 6396c13 Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 14:32:47 2023 -0700 Explain m Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 0cb9f3e Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 14:11:20 2023 -0700 Fix ONNX_NAMESPACE Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 3aa266c Merge: 0b99055 b82bd2d Author: Justin Chu <justinchu@microsoft.com> Date: Thu Sep 14 14:08:56 2023 -0700 Merge branch 'main' into justinchu/dft commit 0b99055 Merge: 94051ba 02a41bf Author: Justin Chu <justinchuby@users.noreply.github.com> Date: Wed Sep 13 11:57:00 2023 -0700 Merge branch 'main' into justinchu/dft commit 94051ba Author: Justin Chu <justinchu@microsoft.com> Date: Wed Sep 13 18:40:13 2023 +0000 format Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 5eea907 Author: Justin Chu <justinchu@microsoft.com> Date: Wed Sep 13 18:22:45 2023 +0000 Size check Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 5d702f8 Author: Justin Chu <justinchu@microsoft.com> Date: Wed Sep 13 18:20:08 2023 +0000 spec Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 88fb79f Author: Justin Chu <justinchu@microsoft.com> Date: Wed Sep 13 18:17:47 2023 +0000 Implement version converter Signed-off-by: Justin Chu <justinchu@microsoft.com> commit f809264 Author: Justin Chu <justinchu@microsoft.com> Date: Wed Sep 13 18:00:59 2023 +0000 register Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 6f37327 Author: Justin Chu <justinchu@microsoft.com> Date: Wed Sep 13 17:59:34 2023 +0000 Fix function call Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 43d4316 Author: Justin Chu <justinchu@microsoft.com> Date: Tue Sep 12 23:23:34 2023 +0000 Update defs Signed-off-by: Justin Chu <justinchu@microsoft.com> commit fcbd610 Merge: b9895a0 fdefbe8 Author: Justin Chu <justinchu@microsoft.com> Date: Tue Sep 12 23:15:23 2023 +0000 Merge branch 'main' into justinchu/dft commit b9895a0 Author: Justin Chu <justinchu@microsoft.com> Date: Tue Aug 22 18:46:45 2023 +0000 namespace Signed-off-by: Justin Chu <justinchu@microsoft.com> commit dba3f96 Author: Justin Chu <justinchu@microsoft.com> Date: Tue Aug 22 17:39:30 2023 +0000 Static functions? Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 69d0f4e Author: Justin Chu <justinchu@microsoft.com> Date: Tue Aug 22 17:02:32 2023 +0000 Refactor ref implementation Signed-off-by: Justin Chu <justinchu@microsoft.com> commit b712886 Author: Justin Chu <justinchu@microsoft.com> Date: Mon Aug 21 23:43:05 2023 +0000 utils Signed-off-by: Justin Chu <justinchu@microsoft.com> commit 632e9e1 Author: Justin Chu <justinchu@microsoft.com> Date: Mon Aug 21 23:14:15 2023 +0000 Reference Signed-off-by: Justin Chu <justinchu@microsoft.com> commit b1ac96a Author: Justin Chu <justinchu@microsoft.com> Date: Mon Aug 21 22:23:29 2023 +0000 typo Signed-off-by: Justin Chu <justinchu@microsoft.com> commit a9db6ad Author: Justin Chu <justinchu@microsoft.com> Date: Mon Aug 21 18:58:08 2023 +0000 Create DFT-20 Signed-off-by: Justin Chu <justinchu@microsoft.com> Signed-off-by: Justin Chu <justinchu@microsoft.com>
onnx · Sep 23, 2023 · 0839a31 · 0839a31
1 parent 2b770ab
commit 0839a31
Show file tree

Hide file tree

Showing 4 changed files with 177 additions and 2 deletions.
diff --git a/onnx/test/automatic_upgrade_test.py b/onnx/test/automatic_upgrade_test.py
@@ -1532,7 +1532,6 @@ def test_HannWindow(self) -> None:
     def test_HammingWindow(self) -> None:
         self._test_window_function("HammingWindow")
 
-    @pytest.mark.xfail(reason="FIXME(#5613): Implement version converters for DFT")
     def test_DFT(self) -> None:
         self._test_op_upgrade("DFT", 17, [[2, 16, 1], []], [[2, 16, 2]])
         self._test_op_upgrade("DFT", 17, [[2, 16, 2], []], [[2, 16, 2]])
@@ -1548,6 +1547,9 @@ def test_DFT(self) -> None:
         self._test_op_upgrade(
             "DFT", 17, [[2, 16, 2], []], [[2, 16, 2]], attrs={"inverse": 1}
         )
+        self._test_op_upgrade(
+            "DFT", 17, [[2, 16, 2], []], [[2, 16, 2]], attrs={"inverse": 1, "axis": 0}
+        )
 
     def _test_short_time_fourier_transform(self, operator_name: str) -> None:
         # Real

diff --git a/onnx/version_converter/adapters/axis_attribute_to_input.h b/onnx/version_converter/adapters/axis_attribute_to_input.h
@@ -0,0 +1,74 @@
+// Copyright (c) ONNX Project Contributors
+
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "onnx/version_converter/adapters/adapter.h"
+
+namespace ONNX_NAMESPACE {
+namespace version_conversion {
+
+class AxisAttributeToInput : public Adapter {
+ public:
+  AxisAttributeToInput(
+      const std::string& op_name,
+      const OpSetID& initial,
+      const OpSetID& target,
+      size_t axis_index,
+      int64_t default_axis)
+      : Adapter(op_name, initial, target), axis_index(axis_index), default_axis(default_axis) {}
+
+  Node* adapt(std::shared_ptr<Graph> graph, Node* node) const override {
+    if (node->hasAttribute(kaxis)) {
+      AttrToInput(graph, node, node->i(kaxis), this->axis_index);
+      node->removeAttribute(kaxis);
+      return node;
+    }
+
+    // Fill in the default value for axis
+    AttrToInput(graph, node, default_axis, this->axis_index);
+    return node;
+  }
+
+ private:
+  size_t axis_index;
+  int64_t default_axis;
+
+  void AttrToInput(std::shared_ptr<Graph> graph, Node* node, int64_t axis, size_t axis_index) const {
+    const ArrayRef<Value*>& inputs = node->inputs();
+
+    // Add the optional inputs if they don't exist
+    for (size_t i = inputs.size(); i < axis_index; ++i) {
+      Node* empty_input = graph->create(kUndefined);
+      empty_input->insertBefore(node);
+      node->addInput(empty_input->output());
+    }
+
+    // Add the axis input
+    Node* constant = CreateAxisInput(graph, node, axis);
+    node->addInput(constant->output());
+  }
+
+  Node* CreateAxisInput(std::shared_ptr<Graph> graph, Node* node, int64_t axis) const {
+    Tensor t;
+    t.elem_type() = TensorProto_DataType_INT64;
+    t.sizes() = std::vector<int64_t>{};
+    auto& data = t.int64s();
+    data.emplace_back(axis);
+
+    Node* constant = graph->create(kConstant);
+    constant->insertBefore(node);
+    constant->t_(kvalue, t);
+    return constant;
+  }
+};
+
+} // namespace version_conversion
+} // namespace ONNX_NAMESPACE
diff --git a/onnx/version_converter/adapters/axis_input_to_attribute.h b/onnx/version_converter/adapters/axis_input_to_attribute.h
@@ -0,0 +1,95 @@
+// Copyright (c) ONNX Project Contributors
+
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "onnx/version_converter/adapters/adapter.h"
+
+namespace ONNX_NAMESPACE {
+namespace version_conversion {
+class AxisInputToAttribute : public Adapter {
+ public:
+  explicit AxisInputToAttribute(
+      const std::string& op_name,
+      const OpSetID& initial,
+      const OpSetID& target,
+      size_t axis_index,
+      int64_t default_axis)
+      : Adapter(op_name, initial, target), axis_index(axis_index), default_axis(default_axis) {}
+
+  Node* adapt(std::shared_ptr<Graph> graph, Node* node) const override {
+    if (!HasAxisInput(node)) {
+      node->i_(kaxis, this->default_axis);
+      return EnsureAndReturnNode(node);
+    }
+
+    const ArrayRef<Value*>& inputs = node->inputs();
+    Value* axis_val = inputs[this->axis_index];
+    Node* axis_node = axis_val->node();
+
+    if (axis_node->kind() == kConstant) {
+      HandleConstantNode(node, axis_node, axis_val);
+      return EnsureAndReturnNode(node);
+    }
+
+    HandleInitializerNode(graph, node, inputs, axis_val);
+    return EnsureAndReturnNode(node);
+  }
+
+ private:
+  size_t axis_index;
+  int64_t default_axis;
+
+  bool HasAxisInput(const Node* node) const {
+    const ArrayRef<const Value*>& inputs = node->inputs();
+    return inputs.size() > this->axis_index && inputs[this->axis_index]->node()->kind() != kUndefined;
+  }
+
+  void HandleConstantNode(Node* node, Node* axis_node, Value* axis_val) const {
+    const std::vector<int64_t>& int64s = axis_node->t(kvalue).int64s();
+    if (int64s.empty()) {
+      std::string raw_data = axis_node->t(kvalue).raw();
+      ONNX_ASSERTM(
+          raw_data.size() != 0 && raw_data.size() % 8 == 0,
+          "Raw Data must be non-empty and size must be a multiple of 8");
+      const int64_t* raw = reinterpret_cast<const int64_t*>(raw_data.c_str());
+      node->i_(kaxis, raw[0]);
+    } else {
+      node->i_(kaxis, int64s.at(0));
+    }
+    node->removeInput(this->axis_index);
+    if (axis_val->uses().size() < 1) {
+      node->destroy();
+    }
+  }
+
+  void HandleInitializerNode(std::shared_ptr<Graph> graph, Node* node, const ArrayRef<Value*>& inputs, Value* axis_val)
+      const {
+    for (const auto& initializer : graph->initializers()) {
+      if (initializer.name() == inputs[this->axis_index]->uniqueName()) {
+        node->i_(kaxis, initializer.int64s().at(0));
+        node->removeInput(this->axis_index);
+        // Remove initializer
+        if (axis_val->uses().size() < 1)
+          graph->eraseInitializerAndInput(axis_val);
+        break;
+      }
+    }
+  }
+
+  inline Node* EnsureAndReturnNode(Node* node) const {
+    ONNX_ASSERTM(node->hasAttribute(kaxis), "Axis attribute not created. This may be a bug.");
+    return node;
+  }
+};
+
+} // namespace version_conversion
+} // namespace ONNX_NAMESPACE
diff --git a/onnx/version_converter/convert.h b/onnx/version_converter/convert.h
@@ -19,6 +19,8 @@
 #include "onnx/version_converter/BaseConverter.h"
 #include "onnx/version_converter/adapters/axes_attribute_to_input.h"
 #include "onnx/version_converter/adapters/axes_input_to_attribute.h"
+#include "onnx/version_converter/adapters/axis_attribute_to_input.h"
+#include "onnx/version_converter/adapters/axis_input_to_attribute.h"
 #include "onnx/version_converter/adapters/batch_normalization_13_14.h"
 #include "onnx/version_converter/adapters/broadcast_backward_compatibility.h"
 #include "onnx/version_converter/adapters/broadcast_forward_compatibility.h"
@@ -564,9 +566,10 @@ class DefaultVersionConverter : public BaseVersionConverter {
     registerAdapter(std::make_unique<CompatibleAdapter>("Size", OpSetID(18), OpSetID(19)));
 
     /******** 19 -> 20 ********/
+    registerAdapter(std::make_unique<AxisAttributeToInput>("DFT", OpSetID(19), OpSetID(20), 2, 1));
     registerAdapter(std::make_unique<CompatibleAdapter>("ConstantOfShape", OpSetID(19), OpSetID(20)));
-    registerAdapter(std::make_unique<CompatibleAdapter>("IsNaN", OpSetID(19), OpSetID(20)));
     registerAdapter(std::make_unique<CompatibleAdapter>("IsInf", OpSetID(19), OpSetID(20)));
+    registerAdapter(std::make_unique<CompatibleAdapter>("IsNaN", OpSetID(19), OpSetID(20)));
     registerAdapter(std::make_unique<CompatibleAdapter>("ReduceMax", OpSetID(19), OpSetID(20)));
     registerAdapter(std::make_unique<CompatibleAdapter>("ReduceMin", OpSetID(19), OpSetID(20)));
     registerAdapter(std::make_unique<GridSample_19_20>());
@@ -586,6 +589,7 @@ class DefaultVersionConverter : public BaseVersionConverter {
         TensorProto_DataType_FLOAT8E5M2,
         TensorProto_DataType_FLOAT8E5M2FNUZ};
     registerAdapter(std::make_unique<TypeRestriction>("IsInf", OpSetID(19), OpSetID(20), is_inf_10_unallowed_types));
+    registerAdapter(std::make_unique<AxisInputToAttribute>("DFT", OpSetID(20), OpSetID(19), 2, -2));
     const std::vector<TensorProto_DataType> reduce_min_max_18_unallowed_types = {TensorProto_DataType_BOOL};
     registerAdapter(
         std::make_unique<TypeRestriction>("ReduceMax", OpSetID(20), OpSetID(19), reduce_min_max_18_unallowed_types));