vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address code review feedback

Browse source
This commit is contained in:
Nikita Sarychev 2025-01-27 21:16:54 -08:00
parent bb37819954
commit 61d341f818
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ggml/src/ggml-cuda/ggml-cuda.cu
View file

@ -42,6 +42,7 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <atomic> #include <atomic>
#include <charconv>
#include <cinttypes> #include <cinttypes>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@ -124,10 +125,20 @@ static ggml_cuda_device_info ggml_cuda_init() {
// Workaround for a rocBLAS bug when using multiple graphics cards: // Workaround for a rocBLAS bug when using multiple graphics cards:
// https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1346 // https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1346
{ {
char version_string[64]; int major_version = 0;
version_string[0] = '\0'; size_t version_length = 0;
const rocblas_status status = rocblas_get_version_string(version_string, sizeof(version_string)); if (rocblas_get_version_string_size(&version_length) == rocblas_status_success) {
if (status != rocblas_status_success || version_string[0] < '4') { std::string version(version_length, '\0');
if (rocblas_get_version_string(version.data(), version.size()) == rocblas_status_success) {
version.resize(::strlen(version.c_str()));
int parsed_value = 0;
if (std::from_chars(version.c_str(), version.c_str() + version.length(), parsed_value).ec == std::errc()) {
major_version = parsed_value;
}
}
}
if (major_version < 4) {
GGML_LOG_DEBUG(GGML_CUDA_NAME " calling rocblas_initialize as a workaround for a rocBLAS bug\n");
rocblas_initialize(); rocblas_initialize();
CUDA_CHECK(cudaDeviceSynchronize()); CUDA_CHECK(cudaDeviceSynchronize());
} }