Skip to content
This repository was archived by the owner on Aug 20, 2026. It is now read-only.

regularisers: fix bending RLS/JRLS cross-term self-adjointness bug#38

Merged
balbasty merged 1 commit into from
Jul 28, 2026
+56 −56
Merged

regularisers: fix bending RLS/JRLS cross-term self-adjointness bug #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions regularisers/field/2d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -958,10 +958,10 @@ struct Kernels<Config<two, _C, T...>>

reduce_t m21 = (b01 - 2*b02) * (w22 + w21)
- 2*b02 * (w23 + w20)
- b11 * (w12 + w11 + w32 + w13);
- b11 * (w12 + w11 + w32 + w31);
reduce_t m23 = (b01 - 2*b02) * (w22 + w23)
- 2*b02 * (w24 + w21)
- b11 * (w32 + w33 + w12 + w31);
- b11 * (w32 + w33 + w12 + w13);

return (m12*get(ix1, fx1) + m32*get(ix3, fx3) +
m21*get(iy1, fy1) + m23*get(iy3, fy3));
Expand DownExpand Up@@ -1068,10 +1068,10 @@ struct Kernels<Config<two, _C, T...>>

reduce_t m21 = (b01 - 2*b02) * (w22 + w21)
- 2*b02 * (w23 + w20)
- b11 * (w12 + w11 + w32 + w13);
- b11 * (w12 + w11 + w32 + w31);
reduce_t m23 = (b01 - 2*b02) * (w22 + w23)
- 2*b02 * (w24 + w21)
- b11 * (w32 + w33 + w12 + w31);
- b11 * (w32 + w33 + w12 + w13);

reduce_t m02 = b20 * (2 * w12 + w02 + w22);
reduce_t m42 = b20 * (2 * w32 + w42 + w22);
Expand DownExpand Up@@ -1201,10 +1201,10 @@ struct Kernels<Config<two, _C, T...>>

reduce_t m21 = (b01 - 2*b02) * (w22 + w21)
- 2*b02 * (w23 + w20)
- b11 * (w12 + w11 + w32 + w13);
- b11 * (w12 + w11 + w32 + w31);
reduce_t m23 = (b01 - 2*b02) * (w22 + w23)
- 2*b02 * (w24 + w21)
- b11 * (w32 + w33 + w12 + w31);
- b11 * (w32 + w33 + w12 + w13);


return (m12*get(ix1, fx1) + m32*get(ix3, fx3) +
Expand DownExpand Up@@ -1313,10 +1313,10 @@ struct Kernels<Config<two, _C, T...>>

reduce_t m21 = (b01 - 2*b02) * (w22 + w21)
- 2*b02 * (w23 + w20)
- b11 * (w12 + w11 + w32 + w13);
- b11 * (w12 + w11 + w32 + w31);
reduce_t m23 = (b01 - 2*b02) * (w22 + w23)
- 2*b02 * (w24 + w21)
- b11 * (w32 + w33 + w12 + w31);
- b11 * (w32 + w33 + w12 + w13);

reduce_t m02 = b20 * (2 * w12 + w02 + w22);
reduce_t m42 = b20 * (2 * w32 + w42 + w22);
Expand Down
64 changes: 32 additions & 32 deletions regularisers/field/3d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1090,20 +1090,20 @@ struct Kernels<Config<three, _C, T...>>

reduce_t m212 = (b010 - 2*b020) * (w222 + w212)
- 2*b020 * (w232 + w202)
- b110 * (w122 + w112 + w322 + w132)
- b110 * (w122 + w112 + w322 + w312)
- b011 * (w221 + w211 + w223 + w213);
reduce_t m232 = (b010 - 2*b020) * (w222 + w232)
- 2*b020 * (w242 + w212)
- b110 * (w322 + w332 + w122 + w312)
- b110 * (w322 + w332 + w122 + w132)
- b011 * (w223 + w233 + w221 + w231);

reduce_t m221 = (b001 - 2*b002) * (w222 + w221)
- 2*b002 * (w223 + w220)
- b101 * (w122 + w121 + w322 + w123)
- b101 * (w122 + w121 + w322 + w321)
- b011 * (w212 + w211 + w232 + w231);
reduce_t m223 = (b001 - 2*b002) * (w222 + w223)
- 2*b002 * (w224 + w221)
- b101 * (w322 + w323 + w122 + w321)
- b101 * (w322 + w323 + w122 + w123)
- b011 * (w232 + w233 + w212 + w213);

return (m122*get(ix1, fx1) + m322*get(ix3, fx3) +
Expand DownExpand Up@@ -1137,10 +1137,10 @@ struct Kernels<Config<three, _C, T...>>
reduce_t m321 = b101 * (w222 + w322 + w221 + w321);
reduce_t m323 = b101 * (w222 + w322 + w223 + w323);

reduce_t m211 = b011 * (w222 + w221 + w212 + w112);
reduce_t m213 = b011 * (w222 + w221 + w232 + w132);
reduce_t m231 = b011 * (w222 + w223 + w212 + w312);
reduce_t m233 = b011 * (w222 + w223 + w232 + w332);
reduce_t m211 = b011 * (w222 + w212 + w221 + w211);
reduce_t m213 = b011 * (w222 + w212 + w223 + w213);
reduce_t m231 = b011 * (w222 + w232 + w221 + w231);
reduce_t m233 = b011 * (w222 + w232 + w223 + w233);

return (m112*get(ix1+iy1, fx1*fy1) + m132*get(ix1+iy3, fx1*fy3) +
m312*get(ix3+iy1, fx3*fy1) + m332*get(ix3+iy3, fx3*fy3) +
Expand DownExpand Up@@ -1251,20 +1251,20 @@ struct Kernels<Config<three, _C, T...>>

reduce_t m212 = (b010 - 2*b020) * (w222 + w212)
- 2*b020 * (w232 + w202)
- b110 * (w122 + w112 + w322 + w132)
- b110 * (w122 + w112 + w322 + w312)
- b011 * (w221 + w211 + w223 + w213);
reduce_t m232 = (b010 - 2*b020) * (w222 + w232)
- 2*b020 * (w242 + w212)
- b110 * (w322 + w332 + w122 + w312)
- b110 * (w322 + w332 + w122 + w132)
- b011 * (w223 + w233 + w221 + w231);

reduce_t m221 = (b001 - 2*b002) * (w222 + w221)
- 2*b002 * (w223 + w220)
- b101 * (w122 + w121 + w322 + w123)
- b101 * (w122 + w121 + w322 + w321)
- b011 * (w212 + w211 + w232 + w231);
reduce_t m223 = (b001 - 2*b002) * (w222 + w223)
- 2*b002 * (w224 + w221)
- b101 * (w322 + w323 + w122 + w321)
- b101 * (w322 + w323 + w122 + w123)
- b011 * (w232 + w233 + w212 + w213);

reduce_t m022 = b200 * (2 * w122 + w022 + w222);
Expand All@@ -1284,10 +1284,10 @@ struct Kernels<Config<three, _C, T...>>
reduce_t m321 = b101 * (w222 + w322 + w221 + w321);
reduce_t m323 = b101 * (w222 + w322 + w223 + w323);

reduce_t m211 = b011 * (w222 + w221 + w212 + w112);
reduce_t m213 = b011 * (w222 + w221 + w232 + w132);
reduce_t m231 = b011 * (w222 + w223 + w212 + w312);
reduce_t m233 = b011 * (w222 + w223 + w232 + w332);
reduce_t m211 = b011 * (w222 + w212 + w221 + w211);
reduce_t m213 = b011 * (w222 + w212 + w223 + w213);
reduce_t m231 = b011 * (w222 + w232 + w221 + w231);
reduce_t m233 = b011 * (w222 + w232 + w223 + w233);

b000 -= (m122*fx1 + m322*fx3 +
m212*fy1 + m232*fy3 +
Expand DownExpand Up@@ -1444,20 +1444,20 @@ struct Kernels<Config<three, _C, T...>>

reduce_t m212 = (b010 - 2*b020) * (w222 + w212)
- 2*b020 * (w232 + w202)
- b110 * (w122 + w112 + w322 + w132)
- b110 * (w122 + w112 + w322 + w312)
- b011 * (w221 + w211 + w223 + w213);
reduce_t m232 = (b010 - 2*b020) * (w222 + w232)
- 2*b020 * (w242 + w212)
- b110 * (w322 + w332 + w122 + w312)
- b110 * (w322 + w332 + w122 + w132)
- b011 * (w223 + w233 + w221 + w231);

reduce_t m221 = (b001 - 2*b002) * (w222 + w221)
- 2*b002 * (w223 + w220)
- b101 * (w122 + w121 + w322 + w123)
- b101 * (w122 + w121 + w322 + w321)
- b011 * (w212 + w211 + w232 + w231);
reduce_t m223 = (b001 - 2*b002) * (w222 + w223)
- 2*b002 * (w224 + w221)
- b101 * (w322 + w323 + w122 + w321)
- b101 * (w322 + w323 + w122 + w123)
- b011 * (w232 + w233 + w212 + w213);

return (m122*get(ix1, fx1) + m322*get(ix3, fx3) +
Expand DownExpand Up@@ -1491,10 +1491,10 @@ struct Kernels<Config<three, _C, T...>>
reduce_t m321 = b101 * (w222 + w322 + w221 + w321);
reduce_t m323 = b101 * (w222 + w322 + w223 + w323);

reduce_t m211 = b011 * (w222 + w221 + w212 + w112);
reduce_t m213 = b011 * (w222 + w221 + w232 + w132);
reduce_t m231 = b011 * (w222 + w223 + w212 + w312);
reduce_t m233 = b011 * (w222 + w223 + w232 + w332);
reduce_t m211 = b011 * (w222 + w212 + w221 + w211);
reduce_t m213 = b011 * (w222 + w212 + w223 + w213);
reduce_t m231 = b011 * (w222 + w232 + w221 + w231);
reduce_t m233 = b011 * (w222 + w232 + w223 + w233);

return (m112*get(ix1+iy1, fx1*fy1) + m132*get(ix1+iy3, fx1*fy3) +
m312*get(ix3+iy1, fx3*fy1) + m332*get(ix3+iy3, fx3*fy3) +
Expand DownExpand Up@@ -1606,20 +1606,20 @@ struct Kernels<Config<three, _C, T...>>

reduce_t m212 = (b010 - 2*b020) * (w222 + w212)
- 2*b020 * (w232 + w202)
- b110 * (w122 + w112 + w322 + w132)
- b110 * (w122 + w112 + w322 + w312)
- b011 * (w221 + w211 + w223 + w213);
reduce_t m232 = (b010 - 2*b020) * (w222 + w232)
- 2*b020 * (w242 + w212)
- b110 * (w322 + w332 + w122 + w312)
- b110 * (w322 + w332 + w122 + w132)
- b011 * (w223 + w233 + w221 + w231);

reduce_t m221 = (b001 - 2*b002) * (w222 + w221)
- 2*b002 * (w223 + w220)
- b101 * (w122 + w121 + w322 + w123)
- b101 * (w122 + w121 + w322 + w321)
- b011 * (w212 + w211 + w232 + w231);
reduce_t m223 = (b001 - 2*b002) * (w222 + w223)
- 2*b002 * (w224 + w221)
- b101 * (w322 + w323 + w122 + w321)
- b101 * (w322 + w323 + w122 + w123)
- b011 * (w232 + w233 + w212 + w213);

reduce_t m022 = b200 * (2 * w122 + w022 + w222);
Expand All@@ -1639,10 +1639,10 @@ struct Kernels<Config<three, _C, T...>>
reduce_t m321 = b101 * (w222 + w322 + w221 + w321);
reduce_t m323 = b101 * (w222 + w322 + w223 + w323);

reduce_t m211 = b011 * (w222 + w221 + w212 + w112);
reduce_t m213 = b011 * (w222 + w221 + w232 + w132);
reduce_t m231 = b011 * (w222 + w223 + w212 + w312);
reduce_t m233 = b011 * (w222 + w223 + w232 + w332);
reduce_t m211 = b011 * (w222 + w212 + w221 + w211);
reduce_t m213 = b011 * (w222 + w212 + w223 + w213);
reduce_t m231 = b011 * (w222 + w232 + w221 + w231);
reduce_t m233 = b011 * (w222 + w232 + w223 + w233);

b000 -= (m122*fx1 + m322*fx3 +
m212*fy1 + m232*fy3 +
Expand Down
32 changes: 16 additions & 16 deletions regularisers/flow/3d.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1569,20 +1569,20 @@ struct RegFlow<three, scalar_t, reduce_t, offset_t, BX, BY, BZ> {

reduce_t m212 = (b010 - 2*b020) * (w222 + w212)
- 2*b020 * (w232 + w202)
- b110 * (w122 + w112 + w322 + w132)
- b110 * (w122 + w112 + w322 + w312)
- b011 * (w221 + w211 + w223 + w213);
reduce_t m232 = (b010 - 2*b020) * (w222 + w232)
- 2*b020 * (w242 + w212)
- b110 * (w322 + w332 + w122 + w312)
- b110 * (w322 + w332 + w122 + w132)
- b011 * (w223 + w233 + w221 + w231);

reduce_t m221 = (b001 - 2*b002) * (w222 + w221)
- 2*b002 * (w223 + w220)
- b101 * (w122 + w121 + w322 + w123)
- b101 * (w122 + w121 + w322 + w321)
- b011 * (w212 + w211 + w232 + w231);
reduce_t m223 = (b001 - 2*b002) * (w222 + w223)
- 2*b002 * (w224 + w221)
- b101 * (w322 + w323 + w122 + w321)
- b101 * (w322 + w323 + w122 + w123)
- b011 * (w232 + w233 + w212 + w213);

reduce_t m022 = b200 * (2 * w122 + w022 + w222);
Expand All@@ -1602,10 +1602,10 @@ struct RegFlow<three, scalar_t, reduce_t, offset_t, BX, BY, BZ> {
reduce_t m321 = b101 * (w222 + w322 + w221 + w321);
reduce_t m323 = b101 * (w222 + w322 + w223 + w323);

reduce_t m211 = b011 * (w222 + w221 + w212 + w112);
reduce_t m213 = b011 * (w222 + w221 + w232 + w132);
reduce_t m231 = b011 * (w222 + w223 + w212 + w312);
reduce_t m233 = b011 * (w222 + w223 + w232 + w332);
reduce_t m211 = b011 * (w222 + w212 + w221 + w211);
reduce_t m213 = b011 * (w222 + w212 + w223 + w213);
reduce_t m231 = b011 * (w222 + w232 + w221 + w231);
reduce_t m233 = b011 * (w222 + w232 + w223 + w233);

reduce_t center[] = {
static_cast<reduce_t>(inp[0]),
Expand DownExpand Up@@ -1756,20 +1756,20 @@ struct RegFlow<three, scalar_t, reduce_t, offset_t, BX, BY, BZ> {

reduce_t m212 = (b010 - 2*b020) * (w222 + w212)
- 2*b020 * (w232 + w202)
- b110 * (w122 + w112 + w322 + w132)
- b110 * (w122 + w112 + w322 + w312)
- b011 * (w221 + w211 + w223 + w213);
reduce_t m232 = (b010 - 2*b020) * (w222 + w232)
- 2*b020 * (w242 + w212)
- b110 * (w322 + w332 + w122 + w312)
- b110 * (w322 + w332 + w122 + w132)
- b011 * (w223 + w233 + w221 + w231);

reduce_t m221 = (b001 - 2*b002) * (w222 + w221)
- 2*b002 * (w223 + w220)
- b101 * (w122 + w121 + w322 + w123)
- b101 * (w122 + w121 + w322 + w321)
- b011 * (w212 + w211 + w232 + w231);
reduce_t m223 = (b001 - 2*b002) * (w222 + w223)
- 2*b002 * (w224 + w221)
- b101 * (w322 + w323 + w122 + w321)
- b101 * (w322 + w323 + w122 + w123)
- b011 * (w232 + w233 + w212 + w213);

reduce_t m022 = b200 * (2 * w122 + w022 + w222);
Expand All@@ -1789,10 +1789,10 @@ struct RegFlow<three, scalar_t, reduce_t, offset_t, BX, BY, BZ> {
reduce_t m321 = b101 * (w222 + w322 + w221 + w321);
reduce_t m323 = b101 * (w222 + w322 + w223 + w323);

reduce_t m211 = b011 * (w222 + w221 + w212 + w112);
reduce_t m213 = b011 * (w222 + w221 + w232 + w132);
reduce_t m231 = b011 * (w222 + w223 + w212 + w312);
reduce_t m233 = b011 * (w222 + w223 + w232 + w332);
reduce_t m211 = b011 * (w222 + w212 + w221 + w211);
reduce_t m213 = b011 * (w222 + w212 + w223 + w213);
reduce_t m231 = b011 * (w222 + w232 + w221 + w231);
reduce_t m233 = b011 * (w222 + w232 + w223 + w233);

b000 -= (m122*fx1 + m322*fx3 +
m212*fy1 + m232*fy3 +
Expand Down