sync : ggml #9567
Merged
sync : ggml #9567
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
* CUDA eval works * stochastic gradient descent op * Adam except decay * CUDA CROSS_ENTROPY_LOSS_BACK * CUDA mnist-fc training works * backend CLI arg * refactor gguf load * remove sched from opt_step_adam * implement l1 regularization (weight decay) * extra call to add optimizer * initialize gradients with ggml_graph_reset * gradient accumulation * increment iter per eval instead of epoch * adjust backend interfaces * fix ggml_graph_reset without backend * fix ggml graph export/import * fixup * rename * revert ggml_opt changes * more general CUDA repeat_back * update documentation, fix CNN * validation split * add clarifying comment * optimize PyTorch training * adjust buffer size, thread count * fix 0.0f validation split * Update examples/mnist/mnist-common.cpp Co-authored-by: Georgi Gerganov <ggerganov@gmail.com> * fix gradient accumulation * tensor flag for accumulators -> tensor hash set * Update include/ggml.h Co-authored-by: slaren <slarengh@gmail.com> * Update tests/test-backend-ops.cpp Co-authored-by: slaren <slarengh@gmail.com> * Update tests/test-backend-ops.cpp Co-authored-by: slaren <slarengh@gmail.com> * fix test prints * Update src/ggml-backend.c Co-authored-by: Georgi Gerganov <ggerganov@gmail.com> * better CUDA support for noncontiguous out_prod * add comment --------- Co-authored-by: Georgi Gerganov <ggerganov@gmail.com> Co-authored-by: slaren <slarengh@gmail.com>
ggml-ci
ggerganov
changed the title
github-actions
bot
added
script
|
@JohannesGaessler @slaren How to fix the HIP build: [ 11%] Building HIP object ggml/src/CMakeFiles/ggml.dir/ggml-cuda/out-prod.cu.o
In file included from /__w/llama.cpp/llama.cpp/ggml/src/ggml-cuda/out-prod.cu:2:
/__w/llama.cpp/llama.cpp/ggml/src/ggml-cuda/vendors/cuda.h:3:10: fatal error: 'cuda_runtime.h' file not found
#include <cuda_runtime.h>
^~~~~~~~~~~~~~~~
1 error generated when compiling for gfx906.
gmake[2]: *** [ggml/src/CMakeFiles/ggml.dir/build.make:404: ggml/src/CMakeFiles/ggml.dir/ggml-cuda/out-prod.cu.o] Error 1Edit: I think I just have to remove the include from |
slaren
reviewed
Sep 20, 2024
ggml/src/ggml-cuda/out-prod.cu
Outdated
| @@ -0,0 +1,52 @@ | |||
| #include "out-prod.cuh" | |||
| #include "vendors/cuda.h" | |||
There was a problem hiding this comment.
Suggested change
| #include "vendors/cuda.h" |
There was a problem hiding this comment.
This should do it, this file cannot be included directly, and it is already included in common.cuh.
There was a problem hiding this comment.
I can confirm that this fixes compilation with GGML_HIPBLAS.
ggml-ci
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.
No description provided.