Skip to content

Merge main branch into dlclive3 to resolve conflicts #146

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

Closed
Copilot wants to merge 15 commits into from
Closed

Merge main branch into dlclive3 to resolve conflicts #146

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
41ee58f
fix #112 - don't subset cpuinfo (#114)
sneakers-the-rat Jun 13, 2025
662e223
Introduce CI/CD for TensorFLow version (#122)
maximpavliv Jun 13, 2025
36557a8
master --> main
MMathisLab Jun 13, 2025
4004ef9
Update testing.yml
MMathisLab Jun 13, 2025
88038ac
Update README & benchmarking script (#126)
MMathisLab Jun 14, 2025
a74101f
Update pyproject.toml (#125)
MMathisLab Jun 15, 2025
44c960f
Update benchmark.py (#123)
MMathisLab Jun 16, 2025
b60f21b
Bump pillow from 11.2.1 to 11.3.0 (#129)
dependabot[bot] Jul 1, 2025
d1a9cab
Bump werkzeug from 3.1.3 to 3.1.5 (#142)
dependabot[bot] Jan 13, 2026
13f5ef6
Bump urllib3 from 2.4.0 to 2.6.3 (#141)
dependabot[bot] Jan 13, 2026
d52f33b
Initial plan
Copilot Jan 13, 2026
cf5e474
Merge main branch into dlclive3
Copilot Jan 13, 2026
5fe65ee
Clean merge of main into dlclive3
Copilot Jan 13, 2026
586f9a7
Verified clean merge - ready to push
Copilot Jan 13, 2026
169931e
Fix: Remove merge conflict markers from files
Copilot Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.