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

Make Scattering1D compatible with TF>=2.5 #882

Merged
merged 5 commits into from
Jun 15, 2022

Conversation

lostanlen
Copy link
Collaborator

as discussed in #775
done in duet with @MuawizChaudhary
ready for code review
i still need to update some docs
triaged for v0.3

once this PR passes code review, i'll work on 2D and 3D

@lostanlen
Copy link
Collaborator Author

not sure how i'm supposed to test that? create a new CI job?

Copy link
Collaborator

@MuawizChaudhary MuawizChaudhary left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am immediately merging based on the fact that it fixes #775 and #801 (as seen in this notebook.) @janden you are welcome to look over the diff and make comments on it yourself, but given the severity of this issue impacting an entire frontend, I'm immediately merging. We can fix anything in a future PR.

Great work @lostanlen !

Comment on lines 95 to +97
for psi_f in psi1_f:
plt.plot(np.arange(N)/N, psi_f[0], 'b')

plt.plot(np.arange(N)/N, psi_f['levels'][0], 'b')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can fix this later, but I dont see why this had to change lines.

kymatio/scattering1d/filter_bank.py Show resolved Hide resolved
tests/scattering1d/test_torch_scattering1d.py Show resolved Hide resolved
@lostanlen
Copy link
Collaborator Author

2D, you're next

lostanlen added a commit to danedane-haider/kymatio that referenced this pull request Jun 19, 2022
in light of kymatio#854 and kymatio#882
enable TeX rendering
lostanlen added a commit that referenced this pull request Jun 20, 2022
by Daniel Haider and Vincent Lostanlen
approved by Muawiz Chaudhary and Joakim Andén

* Update plot_filters.py

* Update plot_filters.py

* Update plot_filters.py

Edits as required:
- original formatting
- line width reduction
- psi <- psi_i

* Update plot_filters.py

* update examples/1d/plot_filters

in light of #854 and #882
enable TeX rendering

Co-authored-by: Vincent Lostanlen <vincent.lostanlen@ls2n.fr>
@lostanlen lostanlen deleted the fix-775 branch June 25, 2022 16:23
eickenberg pushed a commit that referenced this pull request Jul 5, 2022
* update plot_filters

* update core

* update filter_bank.py 1D

* update torch_frontend.py 1D

* simplify test_torch_scattering1d, circumvent a warning
eickenberg pushed a commit that referenced this pull request Jul 5, 2022
by Daniel Haider and Vincent Lostanlen
approved by Muawiz Chaudhary and Joakim Andén

* Update plot_filters.py

* Update plot_filters.py

* Update plot_filters.py

Edits as required:
- original formatting
- line width reduction
- psi <- psi_i

* Update plot_filters.py

* update examples/1d/plot_filters

in light of #854 and #882
enable TeX rendering

Co-authored-by: Vincent Lostanlen <vincent.lostanlen@ls2n.fr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants