Skip to content

GitLab

Commit d790f7b4 authored by wooway777's avatar wooway777
Browse files

issue/1033 - fix format

parent b1ee0a8a
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 67 deletions
src/infiniop/ops/attention/operator.cc
View file @ d790f7b4
...@@ -32,14 +32,14 @@ struct InfiniopAttentionDescriptor { ...@@ -32,14 +32,14 @@ struct InfiniopAttentionDescriptor {
}; };
__INFINI_C __export infiniStatus_t infiniopCreateAttentionDescriptor(infiniopHandle_t handle, __INFINI_C __export infiniStatus_t infiniopCreateAttentionDescriptor(infiniopHandle_t handle,
infiniopAttentionDescriptor_t *desc_ptr, infiniopAttentionDescriptor_t *desc_ptr,
infiniopTensorDescriptor_t out_desc, infiniopTensorDescriptor_t out_desc,
infiniopTensorDescriptor_t q_desc, infiniopTensorDescriptor_t q_desc,
infiniopTensorDescriptor_t k_desc, infiniopTensorDescriptor_t k_desc,
infiniopTensorDescriptor_t v_desc, infiniopTensorDescriptor_t v_desc,
infiniopTensorDescriptor_t k_cache_desc, infiniopTensorDescriptor_t k_cache_desc,
infiniopTensorDescriptor_t v_cache_desc, infiniopTensorDescriptor_t v_cache_desc,
size_t pos) { size_t pos) {
if (out_desc->ndim() != 3 || q_desc->ndim() != 3 || k_desc->ndim() != 3 || v_desc->ndim() != 3 || k_cache_desc->ndim() != 3 || v_cache_desc->ndim() != 3) { if (out_desc->ndim() != 3 || q_desc->ndim() != 3 || k_desc->ndim() != 3 || v_desc->ndim() != 3 || k_cache_desc->ndim() != 3 || v_cache_desc->ndim() != 3) {
return INFINI_STATUS_BAD_TENSOR_SHAPE; return INFINI_STATUS_BAD_TENSOR_SHAPE;
} }
...@@ -224,15 +224,15 @@ __INFINI_C __export infiniStatus_t infiniopGetAttentionWorkspaceSize(infiniopAtt ...@@ -224,15 +224,15 @@ __INFINI_C __export infiniStatus_t infiniopGetAttentionWorkspaceSize(infiniopAtt
} }
__INFINI_C __export infiniStatus_t infiniopAttention(infiniopAttentionDescriptor_t desc_, __INFINI_C __export infiniStatus_t infiniopAttention(infiniopAttentionDescriptor_t desc_,
void *workspace_, void *workspace_,
size_t workspace_size_, size_t workspace_size_,
void *out, void *out,
void const *q, void const *q,
void const *k, void const *k,
void const *v, void const *v,
void *k_cache, void *k_cache,
void *v_cache, void *v_cache,
void *stream) { void *stream) {
auto desc = (InfiniopAttentionDescriptor *)desc_; auto desc = (InfiniopAttentionDescriptor *)desc_;
if (workspace_size_ < desc->workspace_size) { if (workspace_size_ < desc->workspace_size) {
return INFINI_STATUS_INSUFFICIENT_WORKSPACE; // STATUS_MEMORY_NOT_ALLOCATED return INFINI_STATUS_INSUFFICIENT_WORKSPACE; // STATUS_MEMORY_NOT_ALLOCATED
......
src/infiniop/ops/conv/operator.cc
View file @ d790f7b4
...@@ -10,15 +10,15 @@ ...@@ -10,15 +10,15 @@
#endif #endif
__INFINI_C __export infiniStatus_t infiniopCreateConvDescriptor(infiniopHandle_t handle, __INFINI_C __export infiniStatus_t infiniopCreateConvDescriptor(infiniopHandle_t handle,
infiniopConvDescriptor_t *desc_ptr, infiniopConvDescriptor_t *desc_ptr,
infiniopTensorDescriptor_t y_desc, infiniopTensorDescriptor_t y_desc,
infiniopTensorDescriptor_t x_desc, infiniopTensorDescriptor_t x_desc,
infiniopTensorDescriptor_t w_desc, infiniopTensorDescriptor_t w_desc,
infiniopTensorDescriptor_t b_desc, infiniopTensorDescriptor_t b_desc,
void *pads, void *pads,
void *strides, void *strides,
void *dilations, void *dilations,
size_t n) { size_t n) {
#define CREATE(CASE, NAMESPACE) \ #define CREATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return op::conv::NAMESPACE::Descriptor::create( \ return op::conv::NAMESPACE::Descriptor::create( \
......
src/infiniop/ops/dequantize_awq/operator.cc
View file @ d790f7b4
...@@ -55,7 +55,7 @@ __INFINI_C infiniStatus_t infiniopCreateDequantizeAWQDescriptor( ...@@ -55,7 +55,7 @@ __INFINI_C infiniStatus_t infiniopCreateDequantizeAWQDescriptor(
} }
__INFINI_C infiniStatus_t infiniopGetDequantizeAWQWorkspaceSize(infiniopDequantizeAWQDescriptor_t desc, __INFINI_C infiniStatus_t infiniopGetDequantizeAWQWorkspaceSize(infiniopDequantizeAWQDescriptor_t desc,
size_t *size) { size_t *size) {
#define GET(CASE, NAMESPACE) \ #define GET(CASE, NAMESPACE) \
case CASE: \ case CASE: \
*size = reinterpret_cast<const op::dequantize_awq::NAMESPACE::Descriptor *>(desc)->workspaceSize(); \ *size = reinterpret_cast<const op::dequantize_awq::NAMESPACE::Descriptor *>(desc)->workspaceSize(); \
......
src/infiniop/ops/quant/per_channel_quant_int8/operator.cc
View file @ d790f7b4
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#endif #endif
__INFINI_C infiniStatus_t infiniopCreatePerChannelQuantI8Descriptor(infiniopHandle_t handle, __INFINI_C infiniStatus_t infiniopCreatePerChannelQuantI8Descriptor(infiniopHandle_t handle,
infiniopPerChannelQuantI8Descriptor_t *desc_ptr, infiniopPerChannelQuantI8Descriptor_t *desc_ptr,
infiniopTensorDescriptor_t x_packed_desc, infiniopTensorDescriptor_t x_packed_desc,
infiniopTensorDescriptor_t x_scale_desc, infiniopTensorDescriptor_t x_scale_desc,
infiniopTensorDescriptor_t x_zero_desc, infiniopTensorDescriptor_t x_zero_desc,
infiniopTensorDescriptor_t x_desc) { infiniopTensorDescriptor_t x_desc) {
#define CREATE(CASE, NAMESPACE) \ #define CREATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return op::per_channel_quant_int8::NAMESPACE::Descriptor::create( \ return op::per_channel_quant_int8::NAMESPACE::Descriptor::create( \
...@@ -62,13 +62,13 @@ __INFINI_C infiniStatus_t infiniopGetPerChannelQuantI8WorkspaceSize(infiniopPerC ...@@ -62,13 +62,13 @@ __INFINI_C infiniStatus_t infiniopGetPerChannelQuantI8WorkspaceSize(infiniopPerC
} }
__INFINI_C infiniStatus_t infiniopPerChannelQuantI8(infiniopPerChannelQuantI8Descriptor_t desc, __INFINI_C infiniStatus_t infiniopPerChannelQuantI8(infiniopPerChannelQuantI8Descriptor_t desc,
void *workspace, void *workspace,
size_t workspace_size, size_t workspace_size,
void *x_packed, void *x_packed,
void *x_scale, void *x_scale,
void *x_zero, void *x_zero,
const void *x, const void *x,
void *stream) { void *stream) {
#define QUANT(CASE, NAMESPACE) \ #define QUANT(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return reinterpret_cast<op::per_channel_quant_int8::NAMESPACE::Descriptor *>(desc)->calculate( \ return reinterpret_cast<op::per_channel_quant_int8::NAMESPACE::Descriptor *>(desc)->calculate( \
......
src/infiniop/ops/random_sample/nvidia/random_sample_kernel.cuh
View file @ d790f7b4
...@@ -18,8 +18,8 @@ static cudaError argMax_( ...@@ -18,8 +18,8 @@ static cudaError argMax_(
cudaStream_t stream) { cudaStream_t stream) {
#if CUDART_VERSION >= 11000 #if CUDART_VERSION >= 11000
// New interface: separate value and index outputs // New interface: separate value and index outputs
T* max_value = &kv_pair->value; T *max_value = &kv_pair->value;
int* max_index = &kv_pair->key; int *max_index = &kv_pair->key;
return cub::DeviceReduce::ArgMax( return cub::DeviceReduce::ArgMax(
workspace_ptr, workspace_len, workspace_ptr, workspace_len,
logits, max_value, max_index, n, logits, max_value, max_index, n,
......
src/infiniop/ops/rms_norm/operator.cc
View file @ d790f7b4
...@@ -132,7 +132,7 @@ __INFINI_C infiniStatus_t infiniopGetRMSNormWorkspaceSize(infiniopRMSNormDescrip ...@@ -132,7 +132,7 @@ __INFINI_C infiniStatus_t infiniopGetRMSNormWorkspaceSize(infiniopRMSNormDescrip
} }
__INFINI_C infiniStatus_t infiniopRMSNorm(infiniopRMSNormDescriptor_t desc, void *workspace, size_t workspace_size, __INFINI_C infiniStatus_t infiniopRMSNorm(infiniopRMSNormDescriptor_t desc, void *workspace, size_t workspace_size,
void *y, const void *x, const void *w, void *stream) { void *y, const void *x, const void *w, void *stream) {
#define CALCULATE(CASE, NAMESPACE) \ #define CALCULATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
......
src/infiniop/ops/rope/operator.cc
View file @ d790f7b4
...@@ -88,7 +88,7 @@ __INFINI_C infiniStatus_t infiniopCreateRoPEDescriptor( ...@@ -88,7 +88,7 @@ __INFINI_C infiniStatus_t infiniopCreateRoPEDescriptor(
} }
__INFINI_C infiniStatus_t infiniopGetRoPEWorkspaceSize(infiniopRoPEDescriptor_t desc, __INFINI_C infiniStatus_t infiniopGetRoPEWorkspaceSize(infiniopRoPEDescriptor_t desc,
size_t *size) { size_t *size) {
#define GET(CASE, NAMESPACE) \ #define GET(CASE, NAMESPACE) \
case CASE: \ case CASE: \
*size = reinterpret_cast<const op::rope::NAMESPACE::Descriptor *>(desc)->workspaceSize(); \ *size = reinterpret_cast<const op::rope::NAMESPACE::Descriptor *>(desc)->workspaceSize(); \
......
src/infiniop/ops/scaled_mm/operator.cc
View file @ d790f7b4
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
#endif #endif
__INFINI_C infiniStatus_t infiniopCreateI8GemmDescriptor(infiniopHandle_t handle, __INFINI_C infiniStatus_t infiniopCreateI8GemmDescriptor(infiniopHandle_t handle,
infiniopI8GemmDescriptor_t *desc_ptr, infiniopI8GemmDescriptor_t *desc_ptr,
infiniopTensorDescriptor_t out_desc, infiniopTensorDescriptor_t out_desc,
infiniopTensorDescriptor_t bias_desc, infiniopTensorDescriptor_t bias_desc,
infiniopTensorDescriptor_t a_desc, infiniopTensorDescriptor_t a_desc,
infiniopTensorDescriptor_t a_scale_desc, infiniopTensorDescriptor_t a_scale_desc,
infiniopTensorDescriptor_t b_desc, infiniopTensorDescriptor_t b_desc,
infiniopTensorDescriptor_t b_scale_desc) { infiniopTensorDescriptor_t b_scale_desc) {
#define CREATE(CASE, NAMESPACE) \ #define CREATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return op::i8gemm::NAMESPACE::Descriptor::create( \ return op::i8gemm::NAMESPACE::Descriptor::create( \
...@@ -67,15 +67,15 @@ __INFINI_C infiniStatus_t infiniopGetI8GemmWorkspaceSize(infiniopI8GemmDescripto ...@@ -67,15 +67,15 @@ __INFINI_C infiniStatus_t infiniopGetI8GemmWorkspaceSize(infiniopI8GemmDescripto
} }
__INFINI_C infiniStatus_t infiniopI8Gemm(infiniopI8GemmDescriptor_t desc, __INFINI_C infiniStatus_t infiniopI8Gemm(infiniopI8GemmDescriptor_t desc,
void *workspace, void *workspace,
size_t workspace_size, size_t workspace_size,
void *out, void *out,
const void *bias, const void *bias,
const void *a, const void *a,
const void *a_scale, const void *a_scale,
const void *b, const void *b,
const void *b_scale, const void *b_scale,
void *stream) { void *stream) {
#define CACULATE(CASE, NAMESPACE) \ #define CACULATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return reinterpret_cast<op::i8gemm::NAMESPACE::Descriptor *>(desc)->calculate( \ return reinterpret_cast<op::i8gemm::NAMESPACE::Descriptor *>(desc)->calculate( \
......
src/infiniop/ops/topkrouter/operator.cc
View file @ d790f7b4
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#endif #endif
__INFINI_C infiniStatus_t infiniopCreateTopkrouterDescriptor(infiniopHandle_t handle, infiniopTopkrouterDescriptor_t *desc_ptr, __INFINI_C infiniStatus_t infiniopCreateTopkrouterDescriptor(infiniopHandle_t handle, infiniopTopkrouterDescriptor_t *desc_ptr,
infiniopTensorDescriptor_t x_desc, infiniopTensorDescriptor_t x_desc,
infiniopTensorDescriptor_t correction_bias_desc) { infiniopTensorDescriptor_t correction_bias_desc) {
#define CREATE(CASE, NAMESPACE) \ #define CREATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return op::topkrouter::NAMESPACE::Descriptor::create( \ return op::topkrouter::NAMESPACE::Descriptor::create( \
...@@ -82,8 +82,8 @@ __INFINI_C infiniStatus_t infiniopGetTopkrouterWorkspaceSize(infiniopTopkrouterD ...@@ -82,8 +82,8 @@ __INFINI_C infiniStatus_t infiniopGetTopkrouterWorkspaceSize(infiniopTopkrouterD
} }
__INFINI_C infiniStatus_t infiniopTopkrouter(infiniopTopkrouterDescriptor_t desc, void *workspace, size_t workspace_size, __INFINI_C infiniStatus_t infiniopTopkrouter(infiniopTopkrouterDescriptor_t desc, void *workspace, size_t workspace_size,
void *values, void *indices, const void *x, const void *correction_bias, void *values, void *indices, const void *x, const void *correction_bias,
const float routed_scaling_factor, const size_t topk, void *stream) { const float routed_scaling_factor, const size_t topk, void *stream) {
#define CALCULATE(CASE, NAMESPACE) \ #define CALCULATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
return reinterpret_cast<op::topkrouter::NAMESPACE::Descriptor *>(desc)->calculate( \ return reinterpret_cast<op::topkrouter::NAMESPACE::Descriptor *>(desc)->calculate( \
......
src/infiniop/ops/topksoftmax/operator.cc
View file @ d790f7b4
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#endif #endif
__INFINI_C infiniStatus_t infiniopCreateTopksoftmaxDescriptor(infiniopHandle_t handle, __INFINI_C infiniStatus_t infiniopCreateTopksoftmaxDescriptor(infiniopHandle_t handle,
infiniopTopksoftmaxDescriptor_t *desc_ptr, infiniopTopksoftmaxDescriptor_t *desc_ptr,
infiniopTensorDescriptor_t x_desc) { infiniopTensorDescriptor_t x_desc) {
#define CREATE(CASE, NAMESPACE) \ #define CREATE(CASE, NAMESPACE) \
case CASE: \ case CASE: \
...@@ -81,8 +81,8 @@ __INFINI_C infiniStatus_t infiniopGetTopksoftmaxWorkspaceSize(infiniopTopksoftma ...@@ -81,8 +81,8 @@ __INFINI_C infiniStatus_t infiniopGetTopksoftmaxWorkspaceSize(infiniopTopksoftma
} }
__INFINI_C infiniStatus_t infiniopTopksoftmax(infiniopTopksoftmaxDescriptor_t desc, void *workspace, size_t workspace_size, __INFINI_C infiniStatus_t infiniopTopksoftmax(infiniopTopksoftmaxDescriptor_t desc, void *workspace, size_t workspace_size,
void *values, void *indices, const void *x, const size_t topk, const int norm, void *values, void *indices, const void *x, const size_t topk, const int norm,
void *stream) { void *stream) {
if (topk > 32) { if (topk > 32) {
return INFINI_STATUS_BAD_PARAM; return INFINI_STATUS_BAD_PARAM;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment