onnx 1.19.0__cp311-cp311-win_amd64.whl → 1.19.1rc1__cp311-cp311-win_amd64.whl

onnx/reference/ops/op_rotary_embedding.py

@@ -42,26 +42,28 @@ def rotary_embedding(
 
     # Retrieve sin and cos caches using position ids
     if position_ids is not None:
-        cos = cos_cache[
+        cos_cache = cos_cache[
             position_ids
-        ]  # Shape: [batch_size, sequence_length, head_size/2]
-        sin = sin_cache[
+        ]  # Shape: [batch_size, sequence_length, rotary_embedding_dim/2]
+        sin_cache = sin_cache[
             position_ids
-        ]  # Shape: [batch_size, sequence_length, head_size/2]
-    else:
-        cos = cos_cache
-        sin = sin_cache
-    cos = cos[
-        :, :, :rotary_embedding_dim_half
-    ]  # Shape: [batch_size, sequence_length, rotary_embedding_dim/2]
-    sin = sin[
-        :, :, :rotary_embedding_dim_half
-    ]  # Shape: [batch_size, sequence_length, rotary_embedding_dim/2]
-    cos = np.expand_dims(
-        cos, axis=2
+        ]  # Shape: [batch_size, sequence_length, rotary_embedding_dim/2]
+
+    # Shape: [batch_size, sequence_length, rotary_embedding_dim/2]
+    if cos_cache.shape[-1] != rotary_embedding_dim_half:
+        raise ValueError(
+            f"Last dimension of cos cache ({cos_cache.shape[-1]}) does not match rotary_embedding_dim/2 ({rotary_embedding_dim_half})."
+        )
+    if sin_cache.shape[-1] != rotary_embedding_dim_half:
+        raise ValueError(
+            f"Last dimension of sin cache ({sin_cache.shape[-1]}) does not match rotary_embedding_dim/2 ({rotary_embedding_dim_half})."
+        )
+
+    cos_cache = np.expand_dims(
+        cos_cache, axis=2
     )  # Shape: [batch_size, sequence_length, 1, rotary_embedding_dim/2]
-    sin = np.expand_dims(
-        sin, axis=2
+    sin_cache = np.expand_dims(
+        sin_cache, axis=2
     )  # Shape: [batch_size, sequence_length, 1, rotary_embedding_dim/2]
 
     # Either divide the input in halves or interleave (based on interleaved attribute)
@@ -72,8 +74,8 @@ def rotary_embedding(
         x1, x2 = np.split(x_rotate, 2, axis=-1)
 
     # Calculate real and imaginary values
-    real = (cos * x1) - (sin * x2)
-    imag = (sin * x1) + (cos * x2)
+    real = (cos_cache * x1) - (sin_cache * x2)
+    imag = (sin_cache * x1) + (cos_cache * x2)
 
     # Inserted rotated embeddings back to the original input
     if interleaved:

onnx/test/basic_test.py

@@ -227,6 +227,90 @@ class TestBasicFunctions(unittest.TestCase):
         # Check if the version is correct.
         self.assertEqual(model.ir_version, onnx.IR_VERSION)
 
+    def test_model_and_graph_repr(self) -> None:
+        # Check if the __repr__ methods work without error
+        model = _simple_model()
+        model_repr = repr(model)
+        self.assertEqual(
+            model_repr,
+            "ModelProto(ir_version=12, producer_name='onnx-test', graph=GraphProto('test'))",
+        )
+
+        text_model = """
+           <
+             ir_version: 10,
+             opset_import: [ "" : 19]
+           >
+           agraph (float[N] X) => (float[N] C)
+           <
+             float[1] weight = {1}
+           >
+           {
+              C = Cast<to=1>(X)
+           }
+        """
+        model = onnx.parser.parse_model(text_model)
+        model_repr = repr(model)
+        self.assertEqual(
+            model_repr,
+            "ModelProto(ir_version=10, opset_import={'': 19}, graph=GraphProto('agraph', input=<1 inputs>, output=<1 outputs>, initializer=<1 initializers>, node=<1 nodes>))",
+        )
+
+        graph_repr = repr(model.graph)
+        self.assertEqual(
+            graph_repr,
+            "GraphProto('agraph', input=<1 inputs>, output=<1 outputs>, initializer=<1 initializers>, node=<1 nodes>)",
+        )
+
+    def test_function_repr(self) -> None:
+        text = """
+            <
+            ir_version: 9,
+            opset_import: [ "" : 15, "custom_domain" : 1],
+            producer_name: "FunctionProtoTest",
+            producer_version: "1.0",
+            model_version: 1,
+            doc_string: "A test model for model local functions."
+          >
+         agraph (float[N] x) => (float[N] out)
+         {
+            out = custom_domain.Selu<alpha=2.0, gamma=3.0>(x)
+         }
+         <
+         domain: "custom_domain",
+         opset_import: [ "" : 15],
+         doc_string: "Test function proto"
+         >
+           Selu
+           <alpha: float=1.67326319217681884765625, gamma: float=1.05070102214813232421875>
+           (X) => (C)
+           {
+               constant_alpha = Constant<value_float: float=@alpha>()
+               constant_gamma = Constant<value_float: float=@gamma>()
+               alpha_x = CastLike(constant_alpha, X)
+               gamma_x = CastLike(constant_gamma, X)
+               exp_x = Exp(X)
+               alpha_x_exp_x = Mul(alpha_x, exp_x)
+               alpha_x_exp_x_ = Sub(alpha_x_exp_x, alpha_x)
+               neg = Mul(gamma_x, alpha_x_exp_x_)
+               pos = Mul(gamma_x, X)
+               _zero = Constant<value_float=0.0>()
+               zero = CastLike(_zero, X)
+               less_eq = LessOrEqual(X, zero)
+               C = Where(less_eq, neg, pos)
+           }
+        """
+        model = onnx.parser.parse_model(text)
+        self.assertEqual(
+            repr(model),
+            "ModelProto(ir_version=9, opset_import={'': 15, 'custom_domain': 1}, producer_name='FunctionProtoTest', producer_version='1.0', graph=GraphProto('agraph', input=<1 inputs>, output=<1 outputs>, node=<1 nodes>), functions=<1 functions>)",
+        )
+        function_repr = repr(model.functions[0])
+        self.assertEqual(
+            function_repr,
+            "FunctionProto('Selu', domain='custom_domain', opset_import={'': 15}, input=<1 inputs>, output=<1 outputs>, node=<13 nodes>)",
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

onnx/test/reference_evaluator_test.py

@@ -62,6 +62,7 @@ from onnx.reference.ops import load_op
 from onnx.reference.ops._op_common_indices import _get_indices, _is_out
 from onnx.reference.ops._op_list import Cast_19, Celu
 from onnx.reference.ops.aionnx_preview_training._op_list import Adam
+from onnx.reference.ops.op_attention import _apply_causal
 from onnx.reference.ops.op_celu import _vcelu1
 from onnx.reference.ops.op_col2im import (
     _col2im_naive_implementation_2d,
@@ -6118,6 +6119,28 @@ class TestReferenceEvaluator(unittest.TestCase):
         got = ref.run(None, {"X": x})
         self.assertEqual(x.dtype, got[0].dtype)
 
+    def test_apply_causal(self):
+        m = np.ones((3, 3), dtype=np.float16)
+        _apply_causal(m, 0)
+        self.assertEqual(m.dtype, np.float16)
+        assert_allclose(
+            np.array(
+                [[1, -np.inf, -np.inf], [1, 1, -np.inf], [1, 1, 1]], dtype=m.dtype
+            ),
+            m,
+        )
+
+        m = np.zeros((3, 4), dtype=np.float16)
+        _apply_causal(m, 1)
+        self.assertEqual(m.dtype, np.float16)
+        assert_allclose(
+            np.array(
+                [[0, 0, -np.inf, -np.inf], [0, 0, 0, -np.inf], [0, 0, 0, 0]],
+                dtype=m.dtype,
+            ),
+            m,
+        )
+
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)

onnx/test/test_backend_reference.py

@@ -21,6 +21,7 @@ from onnx.backend.base import Device, DeviceType
 from onnx.reference import ReferenceEvaluator
 
 # The following just executes a backend based on ReferenceEvaluator through the backend test
+VERBOSE = int(os.environ.get("VERBOSE", "0"))
 
 
 class ReferenceEvaluatorBackendRep(onnx.backend.base.BackendRep):
@@ -65,7 +66,7 @@ class ReferenceEvaluatorBackend(onnx.backend.base.Backend):
 
     @classmethod
     def create_inference_session(cls, model):
-        return ReferenceEvaluator(model)
+        return ReferenceEvaluator(model, verbose=VERBOSE)
 
     @classmethod
     def prepare(

onnx/version.py

@@ -1,5 +1,5 @@
 # This file is generated by setup.py. DO NOT EDIT!
 
 
-version = "1.19.0"
-git_version = "57b9c6a4f6eebb09ae1b34cfb632078518f72832"
+version = "1.19.1rc1"
+git_version = "e11938a232432630e1ff8904bb80091af6823021"

{onnx-1.19.0.dist-info → onnx-1.19.1rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onnx
-Version: 1.19.0
+Version: 1.19.1rc1
 Summary: Open Neural Network Exchange
 Author-email: ONNX Contributors <onnx-technical-discuss@lists.lfaidata.foundation>
 License: Apache License v2.0
@@ -13,7 +13,7 @@ License-File: LICENSE
 Requires-Dist: numpy>=1.22
 Requires-Dist: protobuf>=4.25.1
 Requires-Dist: typing_extensions>=4.7.1
-Requires-Dist: ml_dtypes
+Requires-Dist: ml_dtypes>=0.5.0
 Provides-Extra: reference
 Requires-Dist: Pillow; extra == "reference"
 Dynamic: license-file