Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Equivariant powerspectrum by pair #378

Merged
merged 36 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
67754f3
Explicit reshaping (required if n_s==0)
ppegolo Jan 30, 2025
dca005e
Add equivariant power spectrum by pair
ppegolo Jan 30, 2025
ceb9c67
Add equivariant power spectrum by pair in init
ppegolo Jan 30, 2025
e95fdba
Lint
ppegolo Jan 30, 2025
ab91b17
Permute and rename dimensions to comply with the conventions of the c…
ppegolo Jan 30, 2025
750769a
Add tests for equivariant_power_spectrum_by_pair
ppegolo Jan 30, 2025
6b407a4
Fix docs
ppegolo Jan 31, 2025
c99f175
Merge branch 'main' into equivariant_powerspectrum_by_pair
ppegolo Jan 31, 2025
79d2d66
Add samples_selection argument
ppegolo Jan 31, 2025
4dd23fb
Add tests for sample_selection
ppegolo Jan 31, 2025
0af50ea
Update python/featomic/tests/clebsch_gordan/equivariant_power_spectru…
ppegolo Jan 31, 2025
28096a2
Update python/featomic/tests/clebsch_gordan/equivariant_power_spectru…
ppegolo Jan 31, 2025
05333ea
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
bbd9b92
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
c07fa8e
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
ec0f902
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
2790e8d
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
f67a95d
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
7f0b410
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
150d911
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Jan 31, 2025
a17abc2
Linting
ppegolo Jan 31, 2025
3fa60d1
Add torch tests
ppegolo Jan 31, 2025
0cbc4bc
Update docs
ppegolo Jan 31, 2025
6832f34
Update changelog
ppegolo Jan 31, 2025
29d4f03
Merge branch 'main' into equivariant_powerspectrum_by_pair
ppegolo Jan 31, 2025
3c25439
Fix bug in _compute_labels_full_cartesian_product
ppegolo Feb 3, 2025
7f4db79
Allow for more flexibility in _match_samples_of_blocks
ppegolo Feb 3, 2025
18f10dd
Add test for `neighbors_to_properties` in `EquivariantPowerSpectrumBy…
ppegolo Feb 3, 2025
4e279cb
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
ppegolo Feb 3, 2025
c456fff
Lint
ppegolo Feb 3, 2025
e55d455
Change hypers to avoid empty blocks in tests for equivariant power sp…
ppegolo Feb 6, 2025
a4c8ccb
Fix TorchScript error
ppegolo Feb 10, 2025
8a7accd
Merge branch 'main' into equivariant_powerspectrum_by_pair
ppegolo Feb 10, 2025
4121634
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
jwa7 Feb 10, 2025
0545c01
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
jwa7 Feb 10, 2025
26df6aa
Update python/featomic/featomic/clebsch_gordan/_equivariant_power_spe…
jwa7 Feb 10, 2025
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
3 changes: 3 additions & 0 deletions python/featomic/featomic/clebsch_gordan/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
from ._coefficients import calculate_cg_coefficients # noqa: F401
from ._density_correlations import DensityCorrelations # noqa: F401
from ._equivariant_power_spectrum import EquivariantPowerSpectrum # noqa: F401
from ._equivariant_power_spectrum_by_pair import ( # noqa: F401
EquivariantPowerSpectrumByPair, # noqa: F401
) # noqa: F401
from ._power_spectrum import PowerSpectrum # noqa: F401
2 changes: 1 addition & 1 deletion python/featomic/featomic/clebsch_gordan/_coefficients.py
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ def _cg_tensor_product_dense(
# output shape is [(samples q p), lambda]
output = _cg_couple_dense(tensor_product, o3_lambda, cg_coefficients)
# => [samples, (q p), lambda]
output = output.reshape(n_s, (n_p * n_q), -1)
output = output.reshape(n_s, (n_p * n_q), 2 * o3_lambda + 1)
# => [samples, lambda, (q p)]
output = _dispatch.swapaxes(output, 1, 2)
result.append(output)
Expand Down
Loading
Loading