Improved Canonicalization for Model Agnostic Equivariance