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

Description:

Browse source 
[bugfix] building error with Windows+ROCm5.7+Cmake

Bug Description:
    function LOG defined in common/log.h  used in ngram-cache.cpp possibly cause the building error on Windows Platform
        Building CXX object common/CMakeFiles/common.dir/ngram-cache.cpp.obj
        FAILED: common/CMakeFiles/common.dir/ngram-cache.cpp.obj
        llama/llama.cpp/common/./log.h:469:5: error: expected ')'

    function fprintf used in common/ngram-cache.cpp may cause the same error

Solve Method:
    remove the including of log.h in ngram-cache.cpp
    remove the function call LOG in ngram-cache.cpp
    remove the function call fprintf in ngram-cache.cpp

Changes to be committed:
    modified:   common/ngram-cache.cpp
This commit is contained in:
xfwu 2024-03-23 20:08:12 +08:00
parent 1b26aebe4d
commit 62c99fd8d7
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/ngram-cache.cpp
View file

@ -1,5 +1,4 @@
#include "ngram-cache.h" #include "ngram-cache.h"
#include "log.h"
#include <fstream> #include <fstream>
@ -39,7 +38,6 @@ void llama_ngram_cache_update(llama_ngram_cache & ngram_cache, int ngram_min, in
const int64_t eta_min = eta_ms / (60*1000); const int64_t eta_min = eta_ms / (60*1000);
const int64_t eta_s = (eta_ms - 60*1000*eta_min) / 1000; const int64_t eta_s = (eta_ms - 60*1000*eta_min) / 1000;
fprintf(stderr, "%s: %" PRId64 "/%" PRId64 " done, ETA: %02" PRId64 ":%02" PRId64 "\n", __func__, n_done, n_todo, eta_min, eta_s);
} }
} }
} }
@ -186,7 +184,7 @@ void llama_ngram_cache_draft(
break; break;
} }
LOG(" - draft candidate: token=%d\n", drafted_token); // LOG(" - draft candidate: token=%d\n", drafted_token);
draft.push_back(drafted_token); draft.push_back(drafted_token);
} }
} }