Commit cf5e474
committed
Merge main branch into dlclive3
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 branch3 files changed
Lines changed: 465 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| 80 | + | |
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
| |||
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
88 | 98 | | |
89 | 99 | | |
90 | 100 | | |
| |||
0 commit comments