Skip to content

Commit 7e547f7

Browse files
committed
Update env
1 parent ab5944d commit 7e547f7

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

diffdrr/metrics.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def forward(
158158
return pose_2.compose(pose_1.inverse()).get_se3_log().norm(dim=1)
159159

160160
# %% ../notebooks/api/05_metrics.ipynb 18
161-
from .pose import so3_log_map
161+
from roma import rotmat_geodesic_distance
162162

163163

164164
class DoubleGeodesicSE3(torch.nn.Module):
@@ -175,9 +175,7 @@ def __init__(
175175
self.sdr = sdd / 2
176176
self.eps = eps
177177

178-
self.rot_geo = lambda r1, r2: self.sdr * so3_log_map(
179-
r1.transpose(-1, -2) @ r2
180-
).norm(dim=-1)
178+
self.rot_geo = lambda r1, r2: rotmat_geodesic_distance(r1, r2)
181179
self.xyz_geo = lambda t1, t2: (t1 - t2).norm(dim=-1)
182180

183181
def forward(self, pose_1: RigidTransform, pose_2: RigidTransform):

environment.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ dependencies:
2020
- tqdm
2121
- pyvista>=0.45.0
2222
- vtk>9.4.0
23+
- pip:
24+
- roma

notebooks/api/05_metrics.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
"outputs": [],
432432
"source": [
433433
"#| export\n",
434-
"from diffdrr.pose import so3_log_map\n",
434+
"from roma import rotmat_geodesic_distance\n",
435435
"\n",
436436
"\n",
437437
"class DoubleGeodesicSE3(torch.nn.Module):\n",
@@ -448,7 +448,7 @@
448448
" self.sdr = sdd / 2\n",
449449
" self.eps = eps\n",
450450
"\n",
451-
" self.rot_geo = lambda r1, r2: self.sdr * so3_log_map(r1.transpose(-1, -2) @ r2).norm(dim=-1)\n",
451+
" self.rot_geo = lambda r1, r2: rotmat_geodesic_distance(r1, r2)\n",
452452
" self.xyz_geo = lambda t1, t2: (t1 - t2).norm(dim=-1)\n",
453453
"\n",
454454
" def forward(self, pose_1: RigidTransform, pose_2: RigidTransform):\n",

settings.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@ clean_ids = True
3838
clear_all = False
3939
cell_number = True
4040
skip_procs =
41-

0 commit comments

Comments
 (0)