mirror of
https://github.com/kvcache-ai/ktransformers.git
synced 2025-09-10 15:29:39 +00:00
Merge 206e51f77e
into ee2ede0412
This commit is contained in:
commit
4f4d7d3696
2 changed files with 8 additions and 4 deletions
|
@ -9,6 +9,7 @@
|
||||||
**/
|
**/
|
||||||
#include "shared_mem_buffer.h"
|
#include "shared_mem_buffer.h"
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
#include <new>
|
||||||
|
|
||||||
SharedMemBuffer::SharedMemBuffer() {
|
SharedMemBuffer::SharedMemBuffer() {
|
||||||
buffer_ = nullptr;
|
buffer_ = nullptr;
|
||||||
|
@ -17,7 +18,7 @@ SharedMemBuffer::SharedMemBuffer() {
|
||||||
|
|
||||||
SharedMemBuffer::~SharedMemBuffer() {
|
SharedMemBuffer::~SharedMemBuffer() {
|
||||||
if (buffer_) {
|
if (buffer_) {
|
||||||
free(buffer_);
|
::operator delete(buffer_, std::align_val_t(64));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,9 +29,9 @@ void SharedMemBuffer::alloc(void* object, std::vector<std::pair<void**, uint64_t
|
||||||
}
|
}
|
||||||
if (size > size_) {
|
if (size > size_) {
|
||||||
if (buffer_) {
|
if (buffer_) {
|
||||||
free(buffer_);
|
::operator delete(buffer_, std::align_val_t(64));
|
||||||
}
|
}
|
||||||
buffer_ = std::aligned_alloc(64, size);
|
buffer_ = ::operator new(size, std::align_val_t(64));
|
||||||
|
|
||||||
size_ = size;
|
size_ = size;
|
||||||
for (auto& obj_requests : hist_requests_) {
|
for (auto& obj_requests : hist_requests_) {
|
||||||
|
|
5
setup.py
5
setup.py
|
@ -48,7 +48,10 @@ if dev_backend == "xpu":
|
||||||
"pytorch-triton-xpu==3.3.0"
|
"pytorch-triton-xpu==3.3.0"
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
triton_dep = ["triton>=3.2"]
|
triton_dep = [
|
||||||
|
"triton >= 3.2; sys_platform != 'win32' and sys_platform != 'Windows'",
|
||||||
|
"triton-windows >= 3.2; sys_platform == 'win32' or sys_platform == 'Windows'"
|
||||||
|
]
|
||||||
|
|
||||||
with_balance = os.environ.get("USE_BALANCE_SERVE", "0") == "1"
|
with_balance = os.environ.get("USE_BALANCE_SERVE", "0") == "1"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue