Skip to content

Conversation

@am17an
Copy link
Collaborator

@am17an am17an commented Oct 21, 2025

Support #16655

@github-actions github-actions bot added documentation Improvements or additions to documentation testing Everything test related Nvidia GPU Issues specific to Nvidia GPUs Vulkan Issues specific to the Vulkan backend ggml changes relating to the ggml tensor library for machine learning SYCL https://en.wikipedia.org/wiki/SYCL - GPU programming language OpenCL Issues specific to the OpenCL backend labels Oct 21, 2025
@am17an am17an marked this pull request as draft October 21, 2025 15:38
@am17an
Copy link
Collaborator Author

am17an commented Oct 21, 2025

@CISC maybe need to rebase? Idk what happened

@ORippler
Copy link
Contributor

ORippler commented Oct 22, 2025

@CISC maybe need to rebase? Idk what happened

Stacked PRs + squash-merge require linear history to work well. So the "best" way to do this is to no longer do merges to include upstream changes into a branch, but only do sequential, (interactive) rebases + force pushes from the bottom to the top of the stacked PR chain.

If you:

Once again: Doing stacked PRs manually with git is possible but cumbersome, which is why there exists a plethora of tooling to manage stacked PRs in git

@CISC
Copy link
Collaborator

CISC commented Oct 22, 2025

It looks like this happened because you pulled in master, hopefully it is recoverable though, but if not just start a new one.

@am17an
Copy link
Collaborator Author

am17an commented Oct 22, 2025

It looks like this happened because you pulled in master, hopefully it is recoverable though, but if not just start a new one.

It is recoverable, but your branch needs to be updated. For now I can create this PR on master including your change, after you merge your PR we can merge this one

@am17an am17an changed the base branch from cisc/norm-topk-bias to master October 22, 2025 12:16
Copy link
Collaborator

@jeffbolznv jeffbolznv left a comment

Choose a reason for hiding this comment

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

You need to either check that the upper bound of the clamp is INFINITY, or just always do both sides of the clamp.

@am17an am17an removed documentation Improvements or additions to documentation Vulkan Issues specific to the Vulkan backend ggml changes relating to the ggml tensor library for machine learning SYCL https://en.wikipedia.org/wiki/SYCL - GPU programming language labels Oct 22, 2025
@am17an am17an removed the OpenCL Issues specific to the OpenCL backend label Oct 22, 2025
@am17an am17an marked this pull request as ready for review October 22, 2025 13:21
@github-actions github-actions bot added the ggml changes relating to the ggml tensor library for machine learning label Oct 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ggml changes relating to the ggml tensor library for machine learning Nvidia GPU Issues specific to Nvidia GPUs testing Everything test related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants