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

Making FCU-Net compatible with 14.9 #588

Merged
merged 20 commits into from
Jan 4, 2024
Merged

Conversation

alex-rakowski
Copy link
Collaborator

This PR enables FCU-Net to be run with 14.9 and loosens the requirements on the required dependencies.

It also updates gdrive_download so that if filename is passed to a collection name it will use that name instead of the one defined in sample_ids.

setup.py Show resolved Hide resolved
py4DSTEM/braggvectors/diskdetection_aiml.py Show resolved Hide resolved
@bsavitzky
Copy link
Member

bsavitzky commented Dec 19, 2023 via email

@alex-rakowski
Copy link
Collaborator Author

It looks like tempfile.TemporaryDirectory only added the ability to not delete the directory in 3.12. Switching to this usage would mean redownloading the weights every call.

@bsavitzky
Copy link
Member

bsavitzky commented Dec 19, 2023 via email

@alex-rakowski
Copy link
Collaborator Author

I'd say they are temporary but not ephemeral, so while they can be deleted at any time without causing any damage and ultimately should be deleted, it doesn't necessarily make sense to do so right away.

That said, I'm not attached to the way this is done, tempfiles with a global config file, global state, os Env vars or a sensible default location etc. all sound great. It's just beyond the scope of what this PR was intended to do. This is just a fix to restore functionality back to original behaviour.

@bsavitzky
Copy link
Member

bsavitzky commented Dec 19, 2023 via email

@sezelt
Copy link
Member

sezelt commented Dec 19, 2023

I'm fine with this as-is for restoring functionality. At first glance I thought it was only downloading a metadata file in the temp directory, but if it's holding the full weights then we can defer the issue.

@alex-rakowski
Copy link
Collaborator Author

@bsavitzky Created an issue #594.

Is this PR good to go?

@sezelt sezelt merged commit 3dd902e into py4dstem:dev Jan 4, 2024
7 checks passed
bsavitzky pushed a commit to bsavitzky/py4DSTEM that referenced this pull request Mar 12, 2024
Making FCU-Net compatible with 14.9

Former-commit-id: 3dd902e
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.

3 participants