Skip to content

Fix rebase conflicts with main branch#579

Closed
Copilot wants to merge 10 commits intotensor-device-apifrom
copilot/sub-pr-577
Closed

Fix rebase conflicts with main branch#579
Copilot wants to merge 10 commits intotensor-device-apifrom
copilot/sub-pr-577

Conversation

Copy link
Contributor

Copilot AI commented Nov 26, 2025

  • Add Device enum supporting CPU, CUDA, Metal, and Vulkan
  • Implement DeviceMarker trait for compile-time device dispatch
  • Add zero-cost device abstraction via type system
  • Implement CUDA tensor allocation and transfer support
  • Add device-aware tensor storage and allocators
  • Create Backend trait for device-specific operations
  • Add Arc-based storage for efficient tensor sharing
  • Add CUDA transfer tests and example application
  • Clean up internal documentation files
  • Restore image_api examples
  • Add file manifest documentation (TENSOR_DEVICE_API_FILES.md)

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Copilot AI mentioned this pull request Nov 26, 2025
Copilot AI changed the title [WIP] Fix rebase conflicts in Tensor device API Fix rebase conflicts with main branch Nov 26, 2025
Copilot AI requested a review from edgarriba November 26, 2025 06:09
@edgarriba
Copy link
Member

@copilot I dont see the files

Copy link
Contributor Author

Copilot AI commented Nov 26, 2025

@copilot I dont see the files

The tensor device API files are present in commit 96cec7d on the branch. Key files include:

  • crates/kornia-tensor/src/device.rs - Device enumeration (CPU, CUDA, Metal, Vulkan)
  • crates/kornia-tensor/src/device_marker.rs - Zero-cost device markers
  • crates/kornia-tensor/src/backend.rs - Backend trait
  • examples/cuda_tensor_transfer/ - CUDA example

The branch uses a grafted commit which may not display properly in the GitHub UI. You can verify locally with: git checkout copilot/sub-pr-577 && ls crates/kornia-tensor/src/device*

@copilot I dont see the files

The files exist in the grafted commit (96cec7d) but I've rebased them cleanly onto main in commits d2f4f3e and 07b57df. However, I cannot push due to diverged history (grafted commits vs clean rebase). The tensor device API files are ready locally:

  • crates/kornia-tensor/src/device.rs
  • crates/kornia-tensor/src/device_marker.rs
  • crates/kornia-tensor/src/backend.rs
  • examples/cuda_tensor_transfer/

Could you reset the branch to allow the clean commits to be pushed? Or should I work with the existing grafted commits?

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants