Skip to content

Resolve merge-conflicts in dlclive3 with main #148

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
Merged
deruyter92 merged 20 commits into from
Jan 13, 2026
Merged

Resolve merge-conflicts in dlclive3 with main #148

deruyter92 merged 20 commits into from
Jan 13, 2026

Conversation

@deruyter92
Copy link
Collaborator

@deruyter92 deruyter92 commented Jan 13, 2026

Summary of resolved conflicts

  1. dlclive/version.py 1.1.0 (from main)
  2. pyproject.toml: copied version 1.1.0 accordingly
  3. dlclive/dlclive.py: improved implementation (from dlclive3) of get_pose method with type-hints etc.
  4. dlclive/benchmark.py: entire implementation from dlclive3 branch, which includes:
    • Updated benchmark_videos() function with PyTorch support
    • New benchmark() function with enhanced features
    • Updated get_system_info() using PyTorch instead of TensorFlow
    • Helper functions for video processing
    • Fixed imports to include all necessary modules
  5. poetry.lock: Removed the file (it can be regenerated locally, but should not be on git)

sneakers-the-rat and others added 20 commits June 13, 2025 16:18
@sneakers-the-rat
fix DeepLabCut#112 - don't subset cpuinfo (DeepLabCut#114)
41ee58f
@maximpavliv @MMathisLab
Introduce CI/CD for TensorFLow version (DeepLabCut#122)
662e223 
* Update .gitignore

* CI/CD update python version

* CI/CD update actions versions

* CI/CD update trigger events

* CI/CD update MacOS version

* dlclibrary set version to >=0.0.6

* Poetry lock

* Poetry lock

* Pyproject.toml update tensorflow installation

* Poetry lock

* Install specific tensorflow-io-gcs-filesystem for windows

* Poetry lock

* Update deprecated section name

* Poetry lock

* CI/CD test on python 3.11, 3.12, 3.13 as well

* Update testing.yml

- rename to main
- add tables installation

---------

Co-authored-by: Mackenzie Mathis <mathis@rowland.harvard.edu>
@MMathisLab
master --> main
36557a8
@MMathisLab
Update testing.yml
4004ef9
@MMathisLab
Update README & benchmarking script (DeepLabCut#126)
88038ac 
* Update README.md

fix test instructions

* Update check_install.py

* Update check_install.py

* Update check_install.py
@MMathisLab
Update pyproject.toml (DeepLabCut#125)
a74101f 
* Update pyproject.toml

- adding support for python 3.11, 3.12, 3.13

* Update testing.yml

* Update testing.yml

* Update pyproject.toml

* Update testing.yml

* Update pyproject.toml

* Update poetry.lock

* Update poetry.lock

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update testing.yml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update testing.yml

* Update pyproject.toml

* Update pyproject.toml

* Update poetry.lock

* Update testing.yml

* Update testing.yml

* Update testing.yml

- remove poetry (for now)

* Update testing.yml

* Update testing.yml

* Update testing.yml

* Update testing.yml

* Update testing.yml

* updated poetry.lock

* updated

* Update testing.yml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update testing.yml

testing 3.11

* Update testing.yml

* Update pyproject.toml

* Update pyproject.toml

* Update pyproject.toml

* Update testing.yml

* updated test for win32

* Update testing.yml

* Update testing.yml

* Update testing.yml

* Update testing.yml
@MMathisLab
Update benchmark.py (DeepLabCut#123)
44c960f
@dependabot
Bump pillow from 11.2.1 to 11.3.0 (DeepLabCut#129)
b60f21b 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 11.2.1 to 11.3.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](python-pillow/Pillow@11.2.1...11.3.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-version: 11.3.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump werkzeug from 3.1.3 to 3.1.5 (DeepLabCut#142)
d1a9cab 
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 3.1.3 to 3.1.5.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@3.1.3...3.1.5)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-version: 3.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @MMathisLab
Bump urllib3 from 2.4.0 to 2.6.3 (DeepLabCut#141)
13f5ef6 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.4.0 to 2.6.3.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.4.0...2.6.3)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.6.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mackenzie Mathis <mathis@rowland.harvard.edu>
Initial plan
d52f33b
Merge main branch into dlclive3
cf5e474 
Resolved merge conflicts by keeping PyTorch integration changes from dlclive3 branch:
- Kept PyTorch-specific workflow configuration in testing.yml
- Kept PyTorch model references in README
- Kept PyTorch implementation in benchmark.py
- Kept PyTorch support in check_install.py and test_benchmark_script.py
- Removed poetry.lock as it was deleted in our branch
@MMathisLab
version 1.1.0 (DeepLabCut#147)
5422e6a 
* Initial plan

* Update version to 1.1.0 across all files

Co-authored-by: MMathisLab <28102185+MMathisLab@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: MMathisLab <28102185+MMathisLab@users.noreply.github.com>
Clean merge of main into dlclive3
5fe65ee
Verified clean merge - ready to push
586f9a7
Fix: Remove merge conflict markers from files
169931e 
Removed all remaining conflict markers from:
- dlclive/benchmark.py
- README.md
- tests/test_benchmark_script.py

All files now compile successfully without syntax errors.
@sneakers-the-rat @MMathisLab
type hints for benchmark (and also some missing ones in dlclive) (Dee…
f3c8fba 
…pLabCut#117)

Co-authored-by: Mackenzie Mathis <mathis@rowland.harvard.edu>
@dependabot @MMathisLab
Bump torch from 2.7.1 to 2.8.0 (DeepLabCut#145)
091dd3d 
Bumps [torch](https://github.com/pytorch/pytorch) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/pytorch/pytorch/releases)
- [Changelog](https://github.com/pytorch/pytorch/blob/main/RELEASE.md)
- [Commits](pytorch/pytorch@v2.7.1...v2.8.0)

---
updated-dependencies:
- dependency-name: torch
  dependency-version: 2.8.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mackenzie Mathis <mathis@rowland.harvard.edu>
@deruyter92
Merge main into dlclive3 - resolved conflicts
4782f2c
@deruyter92
update the package version to match the new version in main branch
7e9691a
@deruyter92 deruyter92 marked this pull request as ready for review January 13, 2026 13:22
@deruyter92 deruyter92 changed the title Resolve merge-conflicts with main Resolve merge-conflicts in dlclive3 with main Jan 13, 2026
@deruyter92 deruyter92 requested a review from Copilot January 13, 2026 13:23
Copilot AI reviewed Jan 13, 2026
View reviewed changes
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR resolves merge conflicts between the dlclive3 branch and main by synchronizing version numbers and integrating enhanced benchmark functionality with PyTorch support while maintaining the version 1.1.0 from main.

Changes:

  • Updated version numbers across all configuration files to 1.1.0
  • Enhanced benchmark.py with PyTorch support, type hints, and additional parameters
  • Removed poetry.lock from version control

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.

File Description
pyproject.toml Version updated from 3.0.0a0 to 1.1.0 to align with main branch
dlclive/version.py Version constant updated to 1.1.0
dlclive/benchmark.py Added type hints, PyTorch device parameter, and enhanced benchmark functionality
CITATION.cff Version metadata updated to 1.1.0

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@deruyter92 deruyter92 merged commit 13e9666 into DeepLabCut:dlclive3 Jan 13, 2026
2 of 3 checks passed
@sneakers-the-rat
Copy link
Collaborator

sneakers-the-rat commented Jan 13, 2026

Finding it hard to keep track of all these changes, i dont see this actually happening in this PR, but this part isnt the case:

poetry.lock: Removed the file (it can be regenerated locally, but should not be on git)

The purpose of lockfiles is sort of lost if one doesnt commit them. I left poetry behind awhile ago, but pylock.toml is a thing now, and python will be catching up with other languages here shortly. I would imagine lockfiles would be especially useful in a package with tricky deps like this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@deruyter92 @sneakers-the-rat @maximpavliv @MMathisLab