Skip to content

Commit

Permalink
[SymForce] Ruff upgrade 0.1.7->0.3.2
Browse files Browse the repository at this point in the history
GitOrigin-RevId: 1bf0204f2ceb91f0e31e649b891d21bc2013e536
  • Loading branch information
william-almy-skydio authored and aaron-skydio committed Mar 18, 2024
1 parent c7454fa commit f04f311
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 68 deletions.
1 change: 1 addition & 0 deletions cmake/rerun_if_needed.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
For builds not in a git repo, we just run the command every time.
"""

from __future__ import print_function

import argparse
Expand Down
2 changes: 1 addition & 1 deletion dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ rpds-py==0.18.0
# via
# jsonschema
# referencing
ruff==0.1.15
ruff==0.3.2
# via symforce (setup.py)
scipy==1.10.1
# via symforce (setup.py)
Expand Down
1 change: 1 addition & 0 deletions gen/python/sym/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ def fixed_readme() -> str:
# NOTE(aaron): v1.0 changed lots of things, we'll need to update and regenerate
"pybind11-stubgen<1.0",
"pylint",
"ruff~=0.1.7",
"ruff~=0.3.2",
# NOTE(brad): A transitive dependency of pylint. Added here only to pin the version.
"lazy-object-proxy>=1.9.0",
"types-jinja2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
Script to download the matrices used for the benchmark into this folder, in Matrix Market format.
"""

import ssgetpy # type: ignore

# Matrix ID's used by the benchmark
Expand Down
1 change: 1 addition & 0 deletions symforce/cam/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
Package for symbolic camera models.
"""

from .atan_camera_cal import ATANCameraCal
from .camera import Camera
from .camera_cal import CameraCal
Expand Down
1 change: 1 addition & 0 deletions symforce/cc_sym.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
Locate and re-export cc_sym as symforce.cc_sym
"""

import logging as _logging
import os
import sys
Expand Down
1 change: 1 addition & 0 deletions symforce/codegen/slam_factors_codegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
cameras that do not have backprojection, it instead operates on a ray in the source camera frame and
a pixel in the target camera.
"""

import functools
from pathlib import Path

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
This file builds a Values with all symbols needed for the fixed-size example.
"""

import symforce.symbolic as sf
from symforce.values import Values

Expand Down
1 change: 1 addition & 0 deletions symforce/python_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
General python utilities.
"""

import asyncio
import functools
import inspect
Expand Down
1 change: 1 addition & 0 deletions symforce/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
Common type definitions.
"""

import abc
import dataclasses
import os
Expand Down
12 changes: 6 additions & 6 deletions symforce/values/values.py
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,9 @@ def storage_D_tangent(self) -> geo.Matrix:
for v in self.values():
s_dim = ops.StorageOps.storage_dim(v)
t_dim = ops.LieGroupOps.tangent_dim(v)
storage_D_tangent[
s_inx : s_inx + s_dim, t_inx : t_inx + t_dim
] = ops.LieGroupOps.storage_D_tangent(v)
storage_D_tangent[s_inx : s_inx + s_dim, t_inx : t_inx + t_dim] = (
ops.LieGroupOps.storage_D_tangent(v)
)
s_inx += s_dim
t_inx += t_dim
return storage_D_tangent
Expand All @@ -483,9 +483,9 @@ def tangent_D_storage(self) -> geo.Matrix:
for v in self.values():
t_dim = ops.LieGroupOps.tangent_dim(v)
s_dim = ops.StorageOps.storage_dim(v)
tangent_D_storage[
t_inx : t_inx + t_dim, s_inx : s_inx + s_dim
] = ops.LieGroupOps.tangent_D_storage(v)
tangent_D_storage[t_inx : t_inx + t_dim, s_inx : s_inx + s_dim] = (
ops.LieGroupOps.tangent_D_storage(v)
)
t_inx += t_dim
s_inx += s_dim
return tangent_D_storage
Expand Down
90 changes: 30 additions & 60 deletions test/cam_package_python_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,9 @@ def test_pixel_from_camera_point_ATANCameraCal(self):
np.testing.assert_allclose(pixel, np.array([4.43702966477849, 7.83207910607598]))
self.assertEqual(is_valid, 1.0)

(
j_pixel,
j_is_valid,
pixel_D_cal,
pixel_D_point,
) = cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
j_pixel, j_is_valid, pixel_D_cal, pixel_D_point = (
cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
)

np.testing.assert_allclose(j_pixel, np.array([4.43702966477849, 7.83207910607598]))
self.assertEqual(j_is_valid, 1.0)
Expand All @@ -160,12 +157,9 @@ def test_camera_ray_from_pixel_ATANCameraCal(self):
np.testing.assert_allclose(ray, np.array([-12.60188996700083, -8.401259978000553, 1.0]))
self.assertEqual(is_valid, 1.0)

(
j_ray,
j_is_valid,
point_D_cal,
point_D_pixel,
) = cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
j_ray, j_is_valid, point_D_cal, point_D_pixel = (
cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
)

np.testing.assert_allclose(j_ray, np.array([-12.60188996700083, -8.401259978000553, 1.0]))
self.assertEqual(j_is_valid, 1.0)
Expand Down Expand Up @@ -260,12 +254,9 @@ def test_pixel_from_camera_point_DoubleSphereCameraCal(self):
np.testing.assert_allclose(pixel, np.array([3.12417556254144, 4.33113483344385]))
self.assertEqual(is_valid, 1.0)

(
j_pixel,
j_is_valid,
pixel_D_cal,
pixel_D_point,
) = cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
j_pixel, j_is_valid, pixel_D_cal, pixel_D_point = (
cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
)

np.testing.assert_allclose(j_pixel, np.array([3.12417556254144, 4.33113483344385]))
self.assertEqual(j_is_valid, 1.0)
Expand All @@ -288,12 +279,9 @@ def test_camera_ray_from_pixel_DoubleSphereCameraCal(self):
)
self.assertEqual(is_valid, 0.0)

(
j_ray,
j_is_valid,
point_D_cal,
point_D_pixel,
) = cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
j_ray, j_is_valid, point_D_cal, point_D_pixel = (
cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
)

np.testing.assert_allclose(
j_ray, np.array([-1.7554218715299938, -1.1702812476866626, -1.117691027921969])
Expand Down Expand Up @@ -389,12 +377,9 @@ def test_pixel_from_camera_point_EquirectangularCameraCal(self):
np.testing.assert_allclose(pixel, np.array([4.24904574989825, 5.80366449289037]))
self.assertEqual(is_valid, 1.0)

(
j_pixel,
j_is_valid,
pixel_D_cal,
pixel_D_point,
) = cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
j_pixel, j_is_valid, pixel_D_cal, pixel_D_point = (
cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
)

np.testing.assert_allclose(j_pixel, np.array([4.24904574989825, 5.80366449289037]))
self.assertEqual(j_is_valid, 1.0)
Expand All @@ -417,12 +402,9 @@ def test_camera_ray_from_pixel_EquirectangularCameraCal(self):
)
self.assertEqual(is_valid, 0.0)

(
j_ray,
j_is_valid,
point_D_cal,
point_D_pixel,
) = cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
j_ray, j_is_valid, point_D_cal, point_D_pixel = (
cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
)

np.testing.assert_allclose(
j_ray, np.array([0.019723202204202806, -0.9995736030415051, 0.021531544241776817])
Expand Down Expand Up @@ -518,12 +500,9 @@ def test_pixel_from_camera_point_LinearCameraCal(self):
np.testing.assert_allclose(pixel, np.array([6.0, 12.0]))
self.assertEqual(is_valid, 1.0)

(
j_pixel,
j_is_valid,
pixel_D_cal,
pixel_D_point,
) = cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
j_pixel, j_is_valid, pixel_D_cal, pixel_D_point = (
cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
)

np.testing.assert_allclose(j_pixel, np.array([6.0, 12.0]))
self.assertEqual(j_is_valid, 1.0)
Expand All @@ -544,12 +523,9 @@ def test_camera_ray_from_pixel_LinearCameraCal(self):
np.testing.assert_allclose(ray, np.array([-2.4, -1.6, 1.0]))
self.assertEqual(is_valid, 1.0)

(
j_ray,
j_is_valid,
point_D_cal,
point_D_pixel,
) = cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
j_ray, j_is_valid, point_D_cal, point_D_pixel = (
cam_cal.camera_ray_from_pixel_with_jacobians(pixel=pixel, epsilon=1e-08)
)

np.testing.assert_allclose(j_ray, np.array([-2.4, -1.6, 1.0]))
self.assertEqual(j_is_valid, 1.0)
Expand Down Expand Up @@ -652,12 +628,9 @@ def test_pixel_from_camera_point_PolynomialCameraCal(self):
np.testing.assert_allclose(pixel, np.array([289.8750003573, 769.0000009528001]))
self.assertEqual(is_valid, 0.0)

(
j_pixel,
j_is_valid,
pixel_D_cal,
pixel_D_point,
) = cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
j_pixel, j_is_valid, pixel_D_cal, pixel_D_point = (
cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
)

np.testing.assert_allclose(j_pixel, np.array([289.8750003573, 769.0000009528001]))
self.assertEqual(j_is_valid, 0.0)
Expand Down Expand Up @@ -763,12 +736,9 @@ def test_pixel_from_camera_point_SphericalCameraCal(self):
np.testing.assert_allclose(pixel, np.array([3.82821053086175, 6.20856141563133]))
self.assertEqual(is_valid, 1.0)

(
j_pixel,
j_is_valid,
pixel_D_cal,
pixel_D_point,
) = cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
j_pixel, j_is_valid, pixel_D_cal, pixel_D_point = (
cam_cal.pixel_from_camera_point_with_jacobians(point=point, epsilon=1e-08)
)

np.testing.assert_allclose(j_pixel, np.array([3.82821053086175, 6.20856141563133]))
self.assertEqual(j_is_valid, 1.0)
Expand Down

0 comments on commit f04f311

Please sign in to comment.