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

avoid multiple redefinition #1817

Merged
merged 13 commits into from
Dec 14, 2023
Merged

avoid multiple redefinition #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ec25547
test
MitchellX Nov 21, 2023
abd06c5
Merge remote-tracking branch 'upstream/main'
MitchellX Nov 21, 2023
0a81064
Merge remote-tracking branch 'upstream/main'
MitchellX Nov 21, 2023
8359950
Merge branch 'main' of https://github.com/MitchellX/vllm
MitchellX Nov 21, 2023
86e8a71
Merge remote-tracking branch 'upstream/main'
MitchellX Nov 27, 2023
1b26823
end_test
MitchellX Nov 27, 2023
82eb03c
Merge remote-tracking branch 'upstream/main'
MitchellX Nov 28, 2023
a74d372
avoid multiple redefinition
MitchellX Nov 28, 2023
f14f82e
backup
MitchellX Dec 4, 2023
8062bdd
add some notes
MitchellX Dec 11, 2023
9128dd8
Merge branch 'main' into MitchellX/main
WoosukKwon Dec 14, 2023
b8a727f
Remove unnecessary change
WoosukKwon Dec 14, 2023
5f9ca44
pragma once
WoosukKwon Dec 14, 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
2 changes: 2 additions & 0 deletions csrc/cache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma once

#include <torch/extension.h>

#include <map>
Expand Down
2 changes: 2 additions & 0 deletions csrc/cuda_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma once

#include <torch/extension.h>

int get_device_attribute(
Expand Down
2 changes: 2 additions & 0 deletions csrc/dispatch_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* Adapted from
* https://github.com/pytorch/pytorch/blob/v2.0.1/aten/src/ATen/Dispatch.h
*/
#pragma once

#include <torch/extension.h>

#define VLLM_DISPATCH_CASE_FLOATING_TYPES(...) \
Expand Down
2 changes: 2 additions & 0 deletions csrc/ops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma once

#include <torch/extension.h>

void paged_attention_v1(
Expand Down