made the methods const

# Conflicts:
#	examples/convert-llama2c-to-ggml/convert-llama2c-to-ggml.cpp
This commit is contained in:
mendax0110 2023-08-28 12:17:46 +02:00
parent dd0dc366da
commit 2d323b5711
2 changed files with 22 additions and 7 deletions

View file

@ -483,7 +483,7 @@ struct llama_file {
return (size_t) ret; return (size_t) ret;
} }
void seek(size_t offset, int whence) { void seek(size_t offset, int whence) const {
#ifdef _WIN32 #ifdef _WIN32
int ret = _fseeki64(fp, (__int64) offset, whence); int ret = _fseeki64(fp, (__int64) offset, whence);
#else #else
@ -492,7 +492,7 @@ struct llama_file {
GGML_ASSERT(ret == 0); // same GGML_ASSERT(ret == 0); // same
} }
void read_raw(void * ptr, size_t size) { void read_raw(void * ptr, size_t size) const {
if (size == 0) { if (size == 0) {
return; return;
} }
@ -506,23 +506,38 @@ struct llama_file {
} }
} }
std::uint32_t read_u32() { std::uint32_t read_u32() const {
std::uint32_t ret; std::uint32_t ret;
read_raw(&ret, sizeof(ret)); read_raw(&ret, sizeof(ret));
return ret; return ret;
} }
std::float_t read_f32() { std::float_t read_f32() const {
std::float_t ret; std::float_t ret;
read_raw(&ret, sizeof(ret)); read_raw(&ret, sizeof(ret));
return ret; return ret;
} }
std::string read_string(std::uint32_t len) { std::string read_string(std::uint32_t len) const {
std::vector<char> chars(len); std::vector<char> chars(len);
read_raw(chars.data(), len); read_raw(chars.data(), len);
return std::string(chars.data(), len); return std::string(chars.data(), len);
} }
void write_raw(const void * ptr, size_t size) const {
if (size == 0) {
return;
}
errno = 0;
size_t ret = std::fwrite(ptr, size, 1, fp);
if (ret != 1) {
throw std::runtime_error(format("write error: %s", strerror(errno)));
}
}
void write_u32(std::uint32_t val) {
write_raw(&val, sizeof(val));
}
~llama_file() { ~llama_file() {
if (fp) { if (fp) {
std::fclose(fp); std::fclose(fp);
@ -633,7 +648,7 @@ void load_vocab(const char *filename, Config *config, struct llama_vocab *vocab)
} }
} }
void stuff_karpathy_weights_into_gg(struct ggml_tensor * gg_weights, float * karpathy_weights){ void stuff_karpathy_weights_into_gg(struct ggml_tensor * gg_weights, const float * karpathy_weights){
int ct; int ct;
switch (gg_weights->n_dims){ switch (gg_weights->n_dims){
case 1: case 1:

View file

@ -4389,7 +4389,7 @@ struct llama_logit_info {
} }
return min_heap; return min_heap;
} }
float probability_from_logit(float logit) { float probability_from_logit(float logit) const {
return normalizer * std::exp(logit - max_l); return normalizer * std::exp(logit - max_l);
} }
}; };