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

Unify test_run_transformers* and test_eval_model* scripts #98

Merged
merged 9 commits into from
Jan 19, 2024

Conversation

OliviaLynn
Copy link

@OliviaLynn OliviaLynn commented Jan 19, 2024

  1. Unifies:
  • all combinations of test_run_transfomers.py (_DC2.py, _DC2_redshift.py, etc) into any_test_run_transformers.py
  • all combinations of test_eval_model.py into any_test_eval_model.py
  1. Combinations can be accessed via new --use-dc2 and --use-redshift flags.

  2. $bash run_all.sh runs all combinations (including swin/mvitv2) and outputs to run_all.log

Other:

  • Removing old, non-solo scripts as well.
  • Skipping train_* scripts, as these do not run as-is at the moment.
  • Planning to follow this with a PR to pull some of the config values out into the config files.
  • For Code re-org: unify the train scripts #17

Copy link

codecov bot commented Jan 19, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (7839339) 10.76% compared to head (95146b3) 10.85%.

Files Patch % Lines
src/deepdisc/astrodet/astrodet.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main      #98      +/-   ##
==========================================
+ Coverage   10.76%   10.85%   +0.08%     
==========================================
  Files          25       25              
  Lines        3872     3877       +5     
==========================================
+ Hits          417      421       +4     
- Misses       3455     3456       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -99,6 +99,7 @@
from tabulate import tabulate
from torch.nn.parallel import DistributedDataParallel

from deepdisc.astrodet import detectron as detectron_addons
Copy link
Collaborator

Choose a reason for hiding this comment

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

Not a blocker - I'm not immediately seeing why this line was added.

Copy link
Author

@OliviaLynn OliviaLynn Jan 19, 2024

Choose a reason for hiding this comment

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

Wasn't sure if I should explicitly mention it (nice eye there)!

It should have been added in the process of combining various versions of train_mapper_cls and moving it into astrodet. The previous versions had all lived in places that had this import, and I had overlooked that in the astrodet PR.

It comes up way below on L1675 and onwards as, say, augs = detectron_addons.KRandomAugmentationList(

Copy link
Collaborator

@drewoldag drewoldag left a comment

Choose a reason for hiding this comment

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

This all looks pretty reasonable to me. Thanks for putting it together!

Copy link
Owner

@grantmerz grantmerz left a comment

Choose a reason for hiding this comment

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

I think rather than using conditional statements in the script it would be better to place these conditional variables in a solo config. Mostly to better keep track of changes and minimize the clutter of the actual train script (I now see you've planned this in a follow-up PR)

@OliviaLynn OliviaLynn merged commit ce3146f into main Jan 19, 2024
5 checks passed
@OliviaLynn OliviaLynn deleted the issue/17/unify_train branch January 19, 2024 19:05
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