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.

Sign up for GitHub

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

Jump to bottom

Bone meal merge attempt #2

Open
wants to merge 79 commits into
base: Bone-Meal-Merge
Choose a base branch
from
Open

Bone meal merge attempt #2

wants to merge 79 commits into from

Commits on Jan 29, 2023

  1. Add hrt relevant files for builder

    @Engut
    Engut committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    9ddedde View commit details
    Browse the repository at this point in the history

  2. builder in running state

    @Engut
    Engut committed Jan 29, 2023
    Configuration menu
    Copy the full SHA
    e9e6bb5 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. fixed issue with import statement in fit.py

    @CWDE615
    CWDE615 committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    c85fb48 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

  1. Remove unused folder

    @Engut
    Engut committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    e3a1ae4 View commit details
    Browse the repository at this point in the history

  2. deleted scripts/models/backbones/hrt/modules

    @CWDE615
    CWDE615 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    4c28069 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'builder' of https://github.com/BRIO-lab/Bone-Meal into … 

    …builder
    @CWDE615
    CWDE615 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    bb6f6a1 View commit details
    Browse the repository at this point in the history

  4. Moved models and utils into lib directory

    @CWDE615
    CWDE615 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    75784ef View commit details
    Browse the repository at this point in the history

  5. added self.net dict to config.py

    @CWDE615
    CWDE615 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    81548ec View commit details
    Browse the repository at this point in the history

  6. added loss functions in loss.py and also fixed some file paths

    @eychen2
    eychen2 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    0756b3e View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/builder' into builder

    @eychen2
    eychen2 committed Feb 1, 2023
    Configuration menu
    Copy the full SHA
    115353d View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2023

  1. Add loss_manager.py from HRFormer repo.

    @CWDE615
    CWDE615 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    ff1e74a View commit details
    Browse the repository at this point in the history

  2. Annotate config.py and loss_manager.py

    @CWDE615
    CWDE615 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    4607938 View commit details
    Browse the repository at this point in the history

  3. Added example dict for loss params

    @CWDE615
    CWDE615 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    71fce1c View commit details
    Browse the repository at this point in the history

  4. Delete redundant directory lib/models/modules.

    @CWDE615
    CWDE615 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    09e92c4 View commit details
    Browse the repository at this point in the history

  5. Add hrnet backbone directory with files copied from scripts. Original… 

    …s kept in place to prevent code from breaking while we negotiate.
    @CWDE615
    CWDE615 committed Feb 2, 2023
    Configuration menu
    Copy the full SHA
    e10ba75 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2023

  1. add import from new pose_hrnet_module to backbone_selector.py. Update… 

    … config.py
    @CWDE615
    CWDE615 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    81fee50 View commit details
    Browse the repository at this point in the history

  2. Shifted a dict definition in config.py

    @CWDE615
    CWDE615 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    bd7c33a View commit details
    Browse the repository at this point in the history

  3. commit and push updates to config.py

    @CWDE615
    CWDE615 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    982fb79 View commit details
    Browse the repository at this point in the history

  4. Preliminary changes to integrate hrnet into backbone selection scheme

    @CWDE615
    CWDE615 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    df26d84 View commit details
    Browse the repository at this point in the history

  5. Add TODO annotation to pose_hrnet_module

    @CWDE615
    CWDE615 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    74313bd View commit details
    Browse the repository at this point in the history

  6. Committing relocation of lib for Module visibility in scripts

    @CWDE615
    CWDE615 committed Feb 3, 2023
    Configuration menu
    Copy the full SHA
    a41e8f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2023

  1. Added format annotations to config.py. Committing changes to builder.… 

    …py that I thought were in the previous commits.
    @CWDE615
    CWDE615 committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    c99af31 View commit details
    Browse the repository at this point in the history

  2. Update modules in self.net

    @CWDE615
    CWDE615 committed Feb 5, 2023
    Configuration menu
    Copy the full SHA
    9e4fbbe View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2023

  1. Alter config.py and loss_selector.py in preparation for final hrnet i… 

    …ntegration. Delete loss_manager.py following discussion in meeting this morning.
    @CWDE615
    CWDE615 committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    6388280 View commit details
    Browse the repository at this point in the history

  2. Add unit test main to loss_selector.py remove errored imports.

    @CWDE615
    CWDE615 committed Feb 6, 2023
    Configuration menu
    Copy the full SHA
    d020b38 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2023

  1. Add call to LossSelector's get_loss method to the constructor of the … 

    …SegmentationNetModule class. Adds support for selection of loss functions through config.py
    @CWDE615
    CWDE615 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    2b8e057 View commit details
    Browse the repository at this point in the history

  2. remove cache files that were staged by accident

    @CWDE615
    CWDE615 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    a172b88 View commit details
    Browse the repository at this point in the history

  3. Delete deprecated files

    @CWDE615
    CWDE615 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    9abced9 View commit details
    Browse the repository at this point in the history

  4. created skeleton code/framework for architecture builder

    @eychen2
    eychen2 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    6589907 View commit details
    Browse the repository at this point in the history

  5. added comment about why there is no forward function unlike sasank's … 

    …example
    @eychen2
    eychen2 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    81a66ae View commit details
    Browse the repository at this point in the history

  6. Pull Eric's work on architecture_builder. Do a little updating.

    @CWDE615
    CWDE615 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    3099f94 View commit details
    Browse the repository at this point in the history

  7. Refactor the builder. Add annotation to compile_model method.

    @CWDE615
    CWDE615 committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    0012a96 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2023

  1. Update README.md 

    Add description to project, WandB, and use of project. Importantly, update setup description.
    @Engut
    Engut authored Feb 13, 2023
    Configuration menu
    Copy the full SHA
    2543080 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Add data_modules directory under scripts/lib/models:

    @CWDE615
    CWDE615 committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    879dab2 View commit details
    Browse the repository at this point in the history

  2. Refactored fit.py to include the datamodule selector. Moved datamodul… 

    …es file into datamodules directory.
    @CWDE615
    CWDE615 committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    9ec37a1 View commit details
    Browse the repository at this point in the history

  3. DataModuleSelector up and running.

    @CWDE615
    CWDE615 committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    5643273 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Added support for loading datamodules from config to test.py. Fixed a… 

    …pparent bug with load_from_checkpoint call and altered error handling in the case that no checkpoint is given.
    @CWDE615
    CWDE615 committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    db043e3 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Working on integrating HRT. Removed Architecture Builder

    @CWDE615
    CWDE615 committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    5b7e80e View commit details
    Browse the repository at this point in the history

  2. Added yml of present builder environment for safe keeping.

    @CWDE615
    CWDE615 committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    c48cb89 View commit details
    Browse the repository at this point in the history

  3. Moving to new branch

    @CWDE615
    CWDE615 committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    2aa2f13 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2023

  1. Got rid of the previous error. Adding new environment for the merger … 

    …to merger_env.yml
    @CWDE615
    CWDE615 committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    bb6a2d9 View commit details
    Browse the repository at this point in the history

  2. Remove feb_environment.yml due to errors with HRT

    @CWDE615
    CWDE615 committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    2efdb5c View commit details
    Browse the repository at this point in the history

  3. Sharing with rest of builder team

    @CWDE615
    CWDE615 committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    e453651 View commit details
    Browse the repository at this point in the history

  4. HRT appears to run with builder

    @CWDE615
    CWDE615 committed Feb 26, 2023
    Configuration menu
    Copy the full SHA
    8310756 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Pushing after meeting.

    @CWDE615
    CWDE615 committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    e61a57c View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Replaced calls to SyncBatchNorm in changed files to BatchNorm2d. HRT … 

    …appears to start training but requires more dedicated GPU memory than I have.
    @CWDE615
    CWDE615 committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    e226fe1 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. Updating merger_env.yml to remove build information.

    @CWDE615
    CWDE615 committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    40745c9 View commit details
    Browse the repository at this point in the history

  2. adding from history flag to merger_env export command

    @CWDE615
    CWDE615 committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    bd5d51a View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Commit another merger_env.yml that apparently works.

    @CWDE615
    CWDE615 committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    8aae8c2 View commit details
    Browse the repository at this point in the history

  2. Updated SegmentationNetModule training and HighResolutionTransformer … 

    …class
    @curranzach
    curranzach committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    55f7bba View commit details
    Browse the repository at this point in the history

  3. Merge branch 'builder_transformer_merger' of https://github.com/BRIO-… 

    …lab/Bone-Meal into builder_transformer_merger
    @curranzach
    curranzach committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    042de7b View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Alter builder taskflow to accommodate the backbones in hrt.py

    @CWDE615
    CWDE615 committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    b1f9f48 View commit details
    Browse the repository at this point in the history

  2. Fixed errors with previous build.

    @CWDE615
    CWDE615 committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    c97bf27 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Merge pull request #2 from BRIO-lab/Engut-README-patch 

    Update README.md
LGTM!
    @sasank-desaraju
    sasank-desaraju authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    d18585b View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Up to date working HPG code

    @curranzach
    curranzach committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    f25dcb7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from BRIO-lab/builder_transformer_merger 

    Builder transformer merger
    @sasank-desaraju
    sasank-desaraju authored Mar 27, 2023
    Configuration menu
    Copy the full SHA
    b6007d7 View commit details
    Browse the repository at this point in the history

  3. added dataset changes and csv changes

    @sasank-desaraju
    sasank-desaraju committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    e72c4ae View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Experiencing bug while trying to run with albumentations

    Christopher Driggers-Ellis committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    0b78579 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2023

  1. Commiting pycache files

    @CWDE615
    CWDE615 committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    8c917e8 View commit details
    Browse the repository at this point in the history

  2. finish merge with remote

    @CWDE615
    CWDE615 committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    a10acac View commit details
    Browse the repository at this point in the history

  3. Fixed issues with training using albumentations and the assertion sta… 

    …tement in JTMLDataset's setup method.
    @CWDE615
    CWDE615 committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    9eae4f6 View commit details
    Browse the repository at this point in the history

  4. Removed erroneous comment in HPG

    Christopher Driggers-Ellis committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    406a9c8 View commit details
    Browse the repository at this point in the history

  5. Added a testing notebook for getting this Dataset bug.

    @sasank-desaraju
    sasank-desaraju committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    a9e3f10 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. committing debug.py file

    Christopher Driggers-Ellis committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    f4726d1 View commit details
    Browse the repository at this point in the history

  2. committing debug.py file

    Christopher Driggers-Ellis committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    2d6c7f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Added early stopping

    @curranzach
    curranzach committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    5c35cb4 View commit details
    Browse the repository at this point in the history

  2. Commiting config.py before merge

    Christopher Driggers-Ellis committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    c5e82e4 View commit details
    Browse the repository at this point in the history

  3. resolve conflicts in config.py

    Christopher Driggers-Ellis committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    a86ba2d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. Pushing my earlier work with Zach's stopping criteria

    Christopher Driggers-Ellis committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    6209b52 View commit details
    Browse the repository at this point in the history

  2. Committing changes to the config prior to checking out bpr

    Christopher Driggers-Ellis committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    ccc7e42 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Commit work on comments in config

    Christopher Driggers-Ellis committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    6e83fe2 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Add ModelCheckpoint. Refactor pl callbacks in general. Add comments i… 

    …n various architecture building files
    @CWDE615
    CWDE615 committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    4247871 View commit details
    Browse the repository at this point in the history

  2. Committing config before pull

    Christopher Driggers-Ellis committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    a626fd8 View commit details
    Browse the repository at this point in the history

  3. finishing pull via conflict resolution

    Christopher Driggers-Ellis committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    c2a719b View commit details
    Browse the repository at this point in the history

  4. Debugged issues with the ModelCheckpoint callback. Best and Final ver… 

    …sions of the model are now saved during each fit.
    Christopher Driggers-Ellis committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    c244e33 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. Removed JTMLCallback validation_step logging with hpg to prevent over… 

    …use of space.
    Christopher Driggers-Ellis committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    35576aa View commit details
    Browse the repository at this point in the history

  2. Removed Early Stopping altogether. Added more comments and removed co… 

    …mmented out code in places.
    Christopher Driggers-Ellis committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    1b4db15 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Fixed logging issue with HRNet test results

    Christopher Driggers-Ellis committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    5d6746c View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Merge pull request #5 from BRIO-lab/fix_dataset_and_csvs 

    Fix dataset and csvs. Implement ModelCheckpoint to save best model from whole fit session.
    @sasank-desaraju
    sasank-desaraju authored Apr 17, 2023
    Configuration menu
    Copy the full SHA
    579c145 View commit details
    Browse the repository at this point in the history