Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DeepLabCut/DeepLabCut
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.3.7
Choose a base ref
...
head repository: DeepLabCut/DeepLabCut
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.3.8
Choose a head ref
  • 11 commits
  • 42 files changed
  • 9 contributors

Commits on Oct 13, 2023

  1. "deeplabcut.filterpredictions" and "deeplabcut.analyze_skeleton" retu…

    …rn mappings (#1908)
    
    * REF: Denest filterpredictions for loop
    
    there were two try/excepts, one within the other.
    this commit simplifies the code by pulling the inner try/except out.
    
    the code now tries to look for filtered data. if filtered data is found
    for the video, we continue to the next item in the loop.
    
    if not found, we catch and ignore the error. we then try to load the
    data and filter it
    
    	modified:   deeplabcut/post_processing/filtering.py
    
    * REF: Reduce the code within the try block
    
    the second try block in filterpredictions looked for the analyzed file
    and performed operations to filter it - and if the file is not found,
    continue to the next item in the for loop.
    
    this commit reduces the try block to only load the analyzed file and
    immediately catch the error and continue if the file doesnt exist.
    
    the rest of the filtering on the analyzed data is performed outside the
    try/except block.
    
    	modified:   deeplabcut/post_processing/filtering.py
    
    * FEAT: Return video filename to filtered dataframe mapping
    
    the filterpredictions now returns a mapping instead of returning None.
    
    	modified:   deeplabcut/post_processing/filtering.py
    
    * REF: Reduce scope of try/except
    
    instead of finding and analyzing the skeleton in the try block, this
    commit reduces the scope of the try block to only finding the file and
    moves the skeleton calculations to outside the try/except.
    
    	modified:   deeplabcut/post_processing/analyze_skeleton.py
    
    * FIX: Actually return the mapping
    
    	modified:   deeplabcut/post_processing/filtering.py
    
    * FEAT: Return mapping from video filename to skeleton dataframe
    
    the analyze_skeleton function now returns a mapping instead of None
    
    	modified:   deeplabcut/post_processing/analyze_skeleton.py
    
    * Add return_data flag
    
    ---------
    
    Co-authored-by: Jessy Lauer <[email protected]>
    Poruri Sai Rahul and jeylau authored Oct 13, 2023
    Configuration menu
    Copy the full SHA
    9ea18e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Configuration menu
    Copy the full SHA
    3615f75 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Configuration menu
    Copy the full SHA
    284b2ce View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Configuration menu
    Copy the full SHA
    7fa496c View commit details
    Browse the repository at this point in the history
  2. Automatically check for napari-deeplabcut updates (in addition to DLC) (

    #2422)
    
    * Also check for napari-deeplabcut updates
    
    * Increase min napari-deeplabcut required version
    jeylau authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    f0cf278 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4de1236 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Fix fliplr augmentation for multi animal 2 (#2043)

    * Fix fliplr augmentation for multi animal 2
    
    The current implementation of fliplr breaks when keypoints are hidden since only labels for visible points are forwarded to the pipeline. This is the second attempt at fixing this as an earlier attempt failed due to the error fixed in PR #2037.
    
    * added missing batch_joints append from DLC PR 1946
    
    * made same changes to get_batch_from_video as get_batch. style fixes.
    
    * Fix indices when training with identity
    
    * Fix and expand unit tests
    
    ---------
    
    Co-authored-by: Niels Poulsen <[email protected]>
    Co-authored-by: Jessy Lauer <[email protected]>
    3 people authored Oct 27, 2023
    Configuration menu
    Copy the full SHA
    25f8c50 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Shaokai/sa transfer learning (#2389)

    * Added SA finetune and corresponding project
    
    ---------
    
    Co-authored-by: Jessy Lauer <[email protected]>
    Co-authored-by: Timokleia <[email protected]>
    Co-authored-by: Mackenzie Mathis <[email protected]>
    4 people authored Nov 6, 2023
    Configuration menu
    Copy the full SHA
    11f12d8 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Improvements to the model zoo's GUI tab (#2431)

    * Add more control widgets
    jeylau authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    780a1db View commit details
    Browse the repository at this point in the history
  2. Fix video adaptation (#2436)

    * Fix TypeError by removing trim_ends argument
    jeylau authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    5086d23 View commit details
    Browse the repository at this point in the history
  3. release updates (#2434)

    AlexEMG authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3ba648f View commit details
    Browse the repository at this point in the history
Loading