Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some warnings from gcc and clang-tidy #3038

Merged
merged 14 commits into from
Sep 7, 2023
Merged

fix some warnings from gcc and clang-tidy #3038

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ceee3a6
build : silence misleading -Warray-bounds warning
cebtenzzre Sep 5, 2023
1dd3fd9
llama : fix some -Wunused warnings
cebtenzzre Sep 5, 2023
688aae4
.clang-tidy : update checks
cebtenzzre Sep 5, 2023
aae2be0
fix some unidiomatic conditions (clang-tidy)
cebtenzzre Sep 5, 2023
0b0fe66
prefer const reference parameters (clang-tidy)
cebtenzzre Sep 5, 2023
49a700c
server : make token_with_probs non-const (clang-tidy)
cebtenzzre Sep 5, 2023
f758656
ggml-alloc : remove useless assignment (clang-tidy)
cebtenzzre Sep 5, 2023
87b90f5
train : remove inaccurate my_llama_hparams::operator== (clang-tidy)
cebtenzzre Sep 5, 2023
22ff140
do not throw unhandled exceptions (clang-tidy)
cebtenzzre Sep 5, 2023
b3d79bd
grammar-parser : reserve space in vector (clang-tidy)
cebtenzzre Sep 5, 2023
6a9d1bd
quantize : do not use 'else' after 'return' (clang-tidy)
cebtenzzre Sep 5, 2023
4c70323
save-load-state : remove a redundant c_str() call (clang-tidy)
cebtenzzre Sep 5, 2023
3d0d55f
train : use std::lround instead of add + cast (clang-tidy)
cebtenzzre Sep 5, 2023
c472ab4
fix error message in ggml_allocr_alloc to display actual max_avail
xaedes Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
llama : fix some -Wunused warnings
  • Loading branch information
@cebtenzzre
cebtenzzre committed Sep 5, 2023
commit 1dd3fd9323cfa6add2e1d246bfd580c5d1f9b400
25 changes: 2 additions & 23 deletions llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3052,33 +3052,10 @@ static bool llama_is_control_token(const llama_vocab & vocab, llama_token id) {
return vocab.id_to_token[id].type == LLAMA_TOKEN_TYPE_CONTROL;
}

static bool llama_is_user_defined_token(const llama_vocab & vocab, llama_token id) {
return vocab.id_to_token[id].type == LLAMA_TOKEN_TYPE_USER_DEFINED;
}

static bool llama_is_unused_token(const llama_vocab & vocab, llama_token id) {
return vocab.id_to_token[id].type == LLAMA_TOKEN_TYPE_UNUSED;
}

static bool llama_is_byte_token(const llama_vocab & vocab, llama_token id) {
return vocab.id_to_token[id].type == LLAMA_TOKEN_TYPE_BYTE;
}

static bool llama_is_bos_token(const llama_vocab & vocab, llama_token id) {
GGML_ASSERT(llama_is_control_token(vocab, id));
return id == vocab.special_bos_id;
}

static bool llama_is_eos_token(const llama_vocab & vocab, llama_token id ) {
GGML_ASSERT(llama_is_control_token(vocab, id));
return id == vocab.special_eos_id;
}

static bool llama_is_pad_token(const llama_vocab & vocab, llama_token id ) {
GGML_ASSERT(id < 0 || llama_is_control_token(vocab, id));
return id == vocab.special_pad_id;
}

static uint8_t llama_token_to_byte(const llama_vocab & vocab, llama_token id) {
GGML_ASSERT(llama_is_byte_token(vocab, id));
const auto& token_data = vocab.id_to_token.at(id);
Expand Down Expand Up @@ -4800,9 +4777,11 @@ static void llama_model_quantize_internal(const std::string & fname_inp, const s
std::vector<std::thread> workers;
std::mutex mutex;

#ifdef GGML_USE_K_QUANTS
auto use_more_bits = [] (int i_layer, int num_layers) -> bool {
return i_layer < num_layers/8 || i_layer >= 7*num_layers/8 || (i_layer - num_layers/8)%3 == 2;
};
#endif

int idx = 0;

Expand Down