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

Jump to bottom

Fix/compilation issues #71

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Fix/compilation issues #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0196f14
fix compilation issues
pedro-devv Apr 5, 2024
3a47e7f
fix compilation issues 2
pedro-devv Apr 5, 2024
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
18 changes: 9 additions & 9 deletions crates/llama_cpp/src/model/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ use llama_cpp_sys::{
ggml_row_size, llama_context, llama_context_params, llama_decode, llama_free_model,
llama_get_embeddings_ith, llama_get_embeddings_seq, llama_kv_cache_clear,
llama_load_model_from_file, llama_model, llama_model_meta_val_str, llama_n_ctx_train,
llama_n_embd, llama_n_vocab, llama_new_context_with_model, llama_token_bos, llama_token_eos,
llama_token_eot, llama_token_get_text, llama_token_middle, llama_token_nl, llama_token_prefix,
llama_token_suffix, llama_token_to_piece, llama_tokenize,
llama_n_embd, llama_n_vocab, llama_new_context_with_model, llama_token, llama_token_bos,
llama_token_eos, llama_token_eot, llama_token_get_text, llama_token_middle, llama_token_nl,
llama_token_prefix, llama_token_suffix, llama_token_to_piece, llama_tokenize,
};
pub use params::*;

Expand Down Expand Up @@ -301,9 +301,9 @@ impl LlamaModel {
// `out_buf` is a `Vec<Token>`, and `Token` is `#[repr(transparent)]` over an `i32`.
llama_tokenize(
**model_lock,
content.as_ptr() as *const i8,
content.as_ptr() as *const c_char,
content.len() as i32,
out_buf.as_mut_ptr() as *mut i32,
out_buf.as_mut_ptr() as *mut llama_token,
out_buf.capacity() as i32,
add_bos,
special,
Expand Down Expand Up @@ -376,7 +376,7 @@ impl LlamaModel {
llama_token_to_piece(
**model_lock,
token.0,
buffer.as_mut_ptr() as *mut i8,
buffer.as_mut_ptr() as *mut c_char,
std::os::raw::c_int::from(initial_size),
)
};
Expand All @@ -390,7 +390,7 @@ impl LlamaModel {
llama_token_to_piece(
**model_lock,
token.0,
buffer.as_mut_ptr() as *mut i8,
buffer.as_mut_ptr() as *mut c_char,
std::os::raw::c_int::from(buffer.len() as i32),
)
};
Expand Down Expand Up @@ -431,10 +431,10 @@ impl LlamaModel {
// SAFETY: Casting `*mut u8` to `*mut i8` is safe because `u8` and
// `i8` have the same size and alignment. The length of token_buf is
// accurate for this reason.
llama_cpp_sys::llama_token_to_piece(
llama_token_to_piece(
**model_lock,
t.0,
token_buf.as_mut_ptr() as *mut i8,
token_buf.as_mut_ptr() as *mut c_char,
token_buf.len() as i32,
)
};
Expand Down
1 change: 1 addition & 0 deletions crates/llama_cpp_sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ fn compile_cuda(cx: &mut Build, cxx: &mut Build, featless_cxx: Build) -> &'stati

let mut nvcc = featless_cxx;
nvcc.cuda(true)
.std("c++17")
.flag("--forward-unknown-to-host-compiler")
.flag("-arch=all")
.define("K_QUANTS_PER_ITERATION", Some("2"))
Expand Down
Loading