• maxiao1's avatar
    Merge branch 'v0.5.4_dev' into 'v0.5.4_dev_liucong' · 9aea97cc
    maxiao1 authored
    解决分支合并冲突:
    # Conflicts:
    #   python/sglang/srt/mem_cache/allocator.py
    #   sgl-kernel/csrc/common_extension_rocm.cc
    #   sgl-kernel/csrc/kvcacheio/transfer.cu
    #   sgl-kernel/include/sgl_kernel_ops.h
    #   sgl-kernel/python/sgl_kernel/kvcacheio.py
    9aea97cc
common_extension_rocm.cc 8.32 KB