imt-ring 1.6.23__tar.gz → 1.6.25__tar.gz

{imt_ring-1.6.23 → imt_ring-1.6.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.6.23
+Version: 1.6.25
 Summary: RING: Recurrent Inertial Graph-based Estimator
 Author-email: Simon Bachhuber <simon.bachhuber@fau.de>
 Project-URL: Homepage, https://github.com/SimiPixel/ring

{imt_ring-1.6.23 → imt_ring-1.6.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "imt-ring"
-version = "1.6.23"
+version = "1.6.25"
 authors = [
   { name="Simon Bachhuber", email="simon.bachhuber@fau.de" },
 ]

{imt_ring-1.6.23 → imt_ring-1.6.25}/src/imt_ring.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imt-ring
-Version: 1.6.23
+Version: 1.6.25
 Summary: RING: Recurrent Inertial Graph-based Estimator
 Author-email: Simon Bachhuber <simon.bachhuber@fau.de>
 Project-URL: Homepage, https://github.com/SimiPixel/ring

{imt_ring-1.6.23 → imt_ring-1.6.25}/src/ring/algorithms/_random.py

@@ -272,14 +272,14 @@ def _resolve_range_of_motion(
     key_ang,
     max_iter,
 ):
+    # legacy reasons, without range of motion the `sign` value, so going
+    # left or right is 50-50 for free joints and spherical joints
+    if not range_of_motion:
+        range_of_motion_method = "coinflip"
+
     def _next_phi(key, dt):
         key, consume = random.split(key)
 
-        # legacy reasons, without range of motion the `sign` value, so going
-        # left or right is 50-50 for free joints and spherical joints
-        if not range_of_motion:
-            range_of_motion_method = "coinflip"
-
         if range_of_motion_method == "coinflip":
             probs = jnp.array([0.5, 0.5])
         elif range_of_motion_method == "uniform":

{imt_ring-1.6.23 → imt_ring-1.6.25}/src/ring/ml/ml_utils.py

@@ -243,5 +243,60 @@ def save_model_tf(jax_func, path: str, *input, validate: bool = True):
         )
 
 
+def to_onnx(
+    fn,
+    output_path,
+    *args: tuple[np.ndarray],
+    in_args_names: Optional[list[str]] = None,
+    out_args_names: Optional[list[str]] = None,
+    validate: bool = False,
+):
+    import jax.experimental.jax2tf as jax2tf
+    import tensorflow as tf
+    import tf2onnx
+
+    tf_fn = tf.function(jax2tf.convert(fn, enable_xla=False))
+    tf_args = [tf.TensorSpec(np.shape(x), np.result_type(x)) for x in args]
+    tf2onnx.convert.from_function(
+        tf_fn, input_signature=tf_args, output_path=output_path
+    )
+
+    if in_args_names is not None or out_args_names is not None:
+        import onnx
+        from sor4onnx import rename
+
+        model = onnx.load(output_path)
+
+        if in_args_names is not None:
+            old_names = [inp.name for inp in model.graph.input]
+            assert len(old_names) == len(in_args_names)
+            for old_name, new_name in zip(old_names, in_args_names):
+                model = rename([old_name, new_name], None, model, None, mode="inputs")
+
+        if out_args_names is not None:
+            old_names = [out.name for out in model.graph.output]
+            assert len(old_names) == len(out_args_names)
+            for old_name, new_name in zip(old_names, out_args_names):
+                model = rename([old_name, new_name], None, model, None, mode="outputs")
+
+        onnx.save(model, output_path)
+
+    if validate:
+        import onnxruntime as ort
+
+        output_jax = fn(*args)
+        session = ort.InferenceSession(output_path)
+        input_names = [inp.name for inp in session.get_inputs()]
+        output_onnx = session.run(
+            None, {name: np.array(arg) for name, arg in zip(input_names, args)}
+        )
+
+        for o1, o2 in zip(output_jax, output_onnx):
+            assert np.allclose(o1, o2, atol=1e-5, rtol=1e-5)
+
+        if out_args_names is not None:
+            assert [out.name for out in session.get_outputs()] == out_args_names
+
+
 def _unknown_link_names(N: int):
     return [f"link{i}" for i in range(N)]