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 build with CUDA under linux #179

Merged
merged 2 commits into from
Aug 7, 2024
Merged

Fix build with CUDA under linux #179

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
f22da41
Fix build with CUDA under linux
MollySophia Aug 6, 2024
15ce960
Workaround for a case when ggml sched incorrectly assigns buffer type
MollySophia Aug 7, 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
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ elseif()
set(GGML_STANDALONE ON)
endif()

set(BUILD_SHARED_LIBS OFF)
if (NOT TARGET ggml)
add_subdirectory(ggml)
# ... otherwise assume ggml is added by a parent CMakeLists.txt
Expand Down
6 changes: 3 additions & 3 deletions rwkv_graph.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ static struct ggml_tensor * rwkv_att_v6(
ggml_reshape_1d(ctx, layer.att_time_decay, n_embed)
);

w = rwkv_exp(ctx, ggml_neg_inplace(ctx, rwkv_exp(ctx, w)));
w = rwkv_exp(ctx, ggml_neg(ctx, rwkv_exp(ctx, w)));
w = ggml_reshape_4d(ctx, w, 1, head_size, head_count, sequence_length);

// dup is not strictly required; doing it just in case.
Expand Down Expand Up @@ -576,9 +576,9 @@ static struct ggml_tensor * rwkv_att_v6(
x = rwkv_group_norm_eps_64e_minus5(ctx, x, head_count);
// Convert back to a regular vector.
x = ggml_reshape_2d(ctx, x, n_embed, sequence_length);
x = ggml_add_inplace(
x = ggml_add(
ctx,
ggml_mul_inplace(
ggml_mul(
ctx,
x,
layer.att_ln_x_weight
Expand Down
2 changes: 1 addition & 1 deletion rwkv_operators.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static void rwkv_groupnorm_impl(

// Element-wise exp(x)
struct ggml_tensor * rwkv_exp(struct ggml_context * ctx, struct ggml_tensor * x) {
return ggml_map_custom1_inplace(ctx, x, rwkv_exp_impl, 1, NULL);
return ggml_map_custom1(ctx, x, rwkv_exp_impl, 1, NULL);
}

// Element-wise 1 - x
Expand Down
Loading