fix: prevent division by zero in soft_max vulkan shader #2633
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change prevents a division by zero error when p.KY is 0.
slaren
approved these changes
Dec 16, 2024
bygreencn
added a commit
to bygreencn/whisper.cpp
that referenced
this pull request
Dec 18, 2024
# By Georgi Gerganov (4) and others # Via GitHub * ggerganov/master: stream : improve consistency in README (ggerganov#2642) whisper : support no_speech_thold (ggerganov#2625) whisper : add single-timestamp logic (ggerganov#2629) readme : fix typo (ggerganov#2637) cmake : fix "amd64" processor string (ggerganov#2638) vulkan : fix soft_max.comp division by zero (ggerganov#2633) common : add cstdio header stream : update build instructions android : fix build and ci (ggerganov#2624) models : fix typo in download-ggml-model.sh (ggerganov#2623) ruby : Sync whisper.cpp and model download feature (ggerganov#2617) scripts : update to new build system # Conflicts: # src/whisper.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix division by zero error in soft_max vulkan shader
This PR fixes #2596 by adding a check for p.KY being zero in the soft_max compute shader.
Changes:
const uint rowy = rowx % p.KY;toconst uint rowy = (p.KY > 0) ? (rowx % p.KY) : 0;The original code would cause a division by zero error when p.KY is 0. This fix ensures that rowy is set to 0 in such cases, preventing the crash while maintaining the expected behavior in normal scenarios.
Testing:
Note:
This PR is a focused version of #2604, containing only the Vulkan shader fix. The original PR has been closed in favor of this more targeted change to address the specific issue at hand.