完成InfiniCore的Opencl版本算子，并且调通InfiniLM推理

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         xmake-version: latest
 
     - name: Build & Install
-      run: python scripts/install.py --omp=y
+      run: python scripts/install.py --omp=y -y
 
     - name: install python packages
       run: |

MANIFEST.in

@@ -0,0 +1 @@
+global-include *

include/infiniccl.h

@@ -15,15 +15,15 @@ struct InfinicclComm;
 
 typedef struct InfinicclComm *infinicclComm_t;
 
-__C __export infiniStatus_t infinicclCommInitAll(
+INFINI_EXTERN_C __export infiniStatus_t infinicclCommInitAll(
     infiniDevice_t device_type,
     infinicclComm_t *comms,
     int ndevice,
     const int *device_ids);
 
-__C __export infiniStatus_t infinicclCommDestroy(infinicclComm_t comm);
+INFINI_EXTERN_C __export infiniStatus_t infinicclCommDestroy(infinicclComm_t comm);
 
-__C __export infiniStatus_t infinicclAllReduce(
+INFINI_EXTERN_C __export infiniStatus_t infinicclAllReduce(
     void *sendbuf,
     void *recvbuf,
     size_t count,

include/infinicore.h

@@ -10,7 +10,8 @@
 #endif
 
 #ifdef __cplusplus
-#define __C extern "C"
+// #define __C extern "C"  与emmintrin.h产生冲突，建议弃用用该宏
+#define INFINI_EXTERN_C extern "C"
 #include <cstddef>
 #else
 #define __C

include/infinicore.hpp

@@ -0,0 +1,6 @@
+#ifndef __INFINICORE_API_HPP__
+#define __INFINICORE_API_HPP__
+
+#include "infinicore/tensor.hpp"
+
+#endif

include/infinicore/device.hpp

@@ -0,0 +1,37 @@
+#ifndef __INFINICORE_DEVICE_API_HPP__
+#define __INFINICORE_DEVICE_API_HPP__
+
+#include <cstdint>
+#include <string>
+
+namespace infinicore {
+
+class Device {
+public:
+    using Index = std::size_t;
+
+    enum class Type {
+        cpu,
+        cuda,
+        meta,
+    };
+
+    Device(const Type &type, const Index &index = 0);
+
+    const Type &get_type() const;
+
+    const Index &get_index() const;
+
+    std::string to_string() const;
+
+    static std::string to_string(const Type &type);
+
+private:
+    Type type_;
+
+    Index index_;
+};
+
+} // namespace infinicore
+
+#endif

include/infinicore/dtype.hpp

@@ -0,0 +1,22 @@
+#ifndef __INFINICORE_DTYPE_API_HPP__
+#define __INFINICORE_DTYPE_API_HPP__
+
+#include <infinicore.h>
+
+namespace infinicore {
+
+enum class DataType {
+    bfloat16 = INFINI_DTYPE_BF16,
+    float16 = INFINI_DTYPE_F16,
+    float32 = INFINI_DTYPE_F32,
+    float64 = INFINI_DTYPE_F64,
+    int32 = INFINI_DTYPE_I32,
+    int64 = INFINI_DTYPE_I64,
+    uint8 = INFINI_DTYPE_U8,
+};
+
+std::string to_string(const DataType &dtype);
+
+} // namespace infinicore
+
+#endif

include/infinicore/tensor.hpp

@@ -0,0 +1,39 @@
+#ifndef __INFINICORE_TENSOR_API_HPP__
+#define __INFINICORE_TENSOR_API_HPP__
+
+#include <vector>
+
+#include "device.hpp"
+#include "dtype.hpp"
+
+namespace infinicore {
+
+class Tensor {
+public:
+    using Size = std::size_t;
+
+    using Stride = std::ptrdiff_t;
+
+    using Shape = std::vector<Size>;
+
+    using Strides = std::vector<Stride>;
+
+    Tensor(const Shape &shape, const DataType &dtype, const Device &device);
+
+    const Shape &get_shape() const;
+
+    const DataType &get_dtype() const;
+
+    const Device &get_device() const;
+
+private:
+    Shape shape_;
+
+    DataType dtype_;
+
+    Device device_;
+};
+
+} // namespace infinicore
+
+#endif

include/infiniop.h

@@ -7,15 +7,14 @@
 #include "infiniop/ops/causal_softmax.h"
 #include "infiniop/ops/clip.h"
 #include "infiniop/ops/conv.h"
-#include "infiniop/ops/dequantize.h"
+#include "infiniop/ops/dequantize_awq.h"
 #include "infiniop/ops/gemm.h"
 #include "infiniop/ops/mul.h"
 #include "infiniop/ops/random_sample.h"
 #include "infiniop/ops/rearrange.h"
 #include "infiniop/ops/relu.h"
 #include "infiniop/ops/rms_norm.h"
 #include "infiniop/ops/rope.h"
-#include "infiniop/ops/rope_v2.h"
 #include "infiniop/ops/softplus.h"
 #include "infiniop/ops/sub.h"
 #include "infiniop/ops/swiglu.h"

include/infiniop/handle.h

@@ -7,8 +7,8 @@ struct InfiniopHandle;
 
 typedef struct InfiniopHandle *infiniopHandle_t;
 
-__C __export infiniStatus_t infiniopCreateHandle(infiniopHandle_t *handle_ptr);
+INFINI_EXTERN_C __export infiniStatus_t infiniopCreateHandle(infiniopHandle_t *handle_ptr);
 
-__C __export infiniStatus_t infiniopDestroyHandle(infiniopHandle_t handle);
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyHandle(infiniopHandle_t handle);
 
 #endif

include/infiniop/operator_descriptor.h

@@ -7,7 +7,7 @@
 // Base descriptor for all operators
 struct InfiniopDescriptor;
 
-__C __export infiniStatus_t infiniopGetDescriptorDeviceType(const struct InfiniopDescriptor *desc_ptr, infiniDevice_t *device_type);
-__C __export infiniStatus_t infiniopGetDescriptorDeviceId(const struct InfiniopDescriptor *desc_ptr, int *device_id);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetDescriptorDeviceType(const struct InfiniopDescriptor *desc_ptr, infiniDevice_t *device_type);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetDescriptorDeviceId(const struct InfiniopDescriptor *desc_ptr, int *device_id);
 
 #endif //__INFINIOP_OPERATOR_DESCRIPTOR_API_H__

include/infiniop/ops/add.h

@@ -5,22 +5,22 @@
 
 typedef struct InfiniopDescriptor *infiniopAddDescriptor_t;
 
-__C __export infiniStatus_t infiniopCreateAddDescriptor(infiniopHandle_t handle,
+INFINI_EXTERN_C __export infiniStatus_t infiniopCreateAddDescriptor(infiniopHandle_t handle,
                                                         infiniopAddDescriptor_t *desc_ptr,
                                                         infiniopTensorDescriptor_t c,
                                                         infiniopTensorDescriptor_t a,
                                                         infiniopTensorDescriptor_t b);
 
-__C __export infiniStatus_t infiniopGetAddWorkspaceSize(infiniopAddDescriptor_t desc, size_t *size);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetAddWorkspaceSize(infiniopAddDescriptor_t desc, size_t *size);
 
-__C __export infiniStatus_t infiniopAdd(infiniopAddDescriptor_t desc,
+INFINI_EXTERN_C __export infiniStatus_t infiniopAdd(infiniopAddDescriptor_t desc,
                                         void *workspace,
                                         size_t workspace_size,
                                         void *c,
                                         const void *a,
                                         const void *b,
                                         void *stream);
 
-__C __export infiniStatus_t infiniopDestroyAddDescriptor(infiniopAddDescriptor_t desc);
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyAddDescriptor(infiniopAddDescriptor_t desc);
 
 #endif

include/infiniop/ops/attention.h

@@ -7,7 +7,7 @@
 
 typedef struct InfiniopDescriptor *infiniopAttentionDescriptor_t;
 
-__C __export infiniStatus_t infiniopCreateAttentionDescriptor(infiniopHandle_t handle,
+INFINI_EXTERN_C __export infiniStatus_t infiniopCreateAttentionDescriptor(infiniopHandle_t handle,
                                                               infiniopAttentionDescriptor_t *desc_ptr,
                                                               infiniopTensorDescriptor_t out_desc,
                                                               infiniopTensorDescriptor_t q_desc,
@@ -17,9 +17,9 @@ __C __export infiniStatus_t infiniopCreateAttentionDescriptor(infiniopHandle_t h
                                                               infiniopTensorDescriptor_t v_cache_desc,
                                                               size_t pos);
 
-__C __export infiniStatus_t infiniopGetAttentionWorkspaceSize(infiniopAttentionDescriptor_t desc, size_t *size);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetAttentionWorkspaceSize(infiniopAttentionDescriptor_t desc, size_t *size);
 
-__C __export infiniStatus_t infiniopAttention(infiniopAttentionDescriptor_t desc,
+INFINI_EXTERN_C __export infiniStatus_t infiniopAttention(infiniopAttentionDescriptor_t desc,
                                               void *workspace,
                                               size_t workspace_size,
                                               void *out,
@@ -30,5 +30,5 @@ __C __export infiniStatus_t infiniopAttention(infiniopAttentionDescriptor_t desc
                                               void *v_cache,
                                               void *stream);
 
-__C __export infiniStatus_t infiniopDestroyAttentionDescriptor(infiniopAttentionDescriptor_t desc);
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyAttentionDescriptor(infiniopAttentionDescriptor_t desc);
 #endif

include/infiniop/ops/causal_softmax.h

@@ -5,22 +5,22 @@
 
 typedef struct InfiniopDescriptor *infiniopCausalSoftmaxDescriptor_t;
 
-__C __export infiniStatus_t infiniopCreateCausalSoftmaxDescriptor(
+INFINI_EXTERN_C  __export infiniStatus_t infiniopCreateCausalSoftmaxDescriptor(
     infiniopHandle_t handle,
     infiniopCausalSoftmaxDescriptor_t *desc_ptr,
     infiniopTensorDescriptor_t y_desc,
     infiniopTensorDescriptor_t x_desc);
 
-__C __export infiniStatus_t infiniopGetCausalSoftmaxWorkspaceSize(infiniopCausalSoftmaxDescriptor_t desc, size_t *size);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetCausalSoftmaxWorkspaceSize(infiniopCausalSoftmaxDescriptor_t desc, size_t *size);
 
-__C __export infiniStatus_t infiniopCausalSoftmax(
+INFINI_EXTERN_C __export infiniStatus_t infiniopCausalSoftmax(
     infiniopCausalSoftmaxDescriptor_t desc,
     void *workspace,
     size_t workspace_size,
     void *y,
     const void *x,
     void *stream);
 
-__C __export infiniStatus_t infiniopDestroyCausalSoftmaxDescriptor(infiniopCausalSoftmaxDescriptor_t desc);
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyCausalSoftmaxDescriptor(infiniopCausalSoftmaxDescriptor_t desc);
 
 #endif

include/infiniop/ops/clip.h

@@ -5,16 +5,16 @@
 
 typedef struct InfiniopDescriptor *infiniopClipDescriptor_t;
 
-__C __export infiniStatus_t infiniopCreateClipDescriptor(infiniopHandle_t handle,
+INFINI_EXTERN_C  __export infiniStatus_t infiniopCreateClipDescriptor(infiniopHandle_t handle,
                                                          infiniopClipDescriptor_t *desc_ptr,
                                                          infiniopTensorDescriptor_t y,
                                                          infiniopTensorDescriptor_t x,
                                                          infiniopTensorDescriptor_t min_val,
                                                          infiniopTensorDescriptor_t max_val);
 
-__C __export infiniStatus_t infiniopGetClipWorkspaceSize(infiniopClipDescriptor_t desc, size_t *size);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetClipWorkspaceSize(infiniopClipDescriptor_t desc, size_t *size);
 
-__C __export infiniStatus_t infiniopClip(infiniopClipDescriptor_t desc,
+INFINI_EXTERN_C __export infiniStatus_t infiniopClip(infiniopClipDescriptor_t desc,
                                          void *workspace,
                                          size_t workspace_size,
                                          void *y,
@@ -23,6 +23,6 @@ __C __export infiniStatus_t infiniopClip(infiniopClipDescriptor_t desc,
                                          const void *max_val,
                                          void *stream);
 
-__C __export infiniStatus_t infiniopDestroyClipDescriptor(infiniopClipDescriptor_t desc);
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyClipDescriptor(infiniopClipDescriptor_t desc);
 
 #endif

include/infiniop/ops/conv.h

@@ -5,7 +5,7 @@
 
 typedef struct InfiniopDescriptor *infiniopConvDescriptor_t;
 
-__C __export infiniStatus_t infiniopCreateConvDescriptor(infiniopHandle_t handle,
+INFINI_EXTERN_C __export infiniStatus_t infiniopCreateConvDescriptor(infiniopHandle_t handle,
                                                          infiniopConvDescriptor_t *desc_ptr,
                                                          infiniopTensorDescriptor_t y_desc,
                                                          infiniopTensorDescriptor_t x_desc,
@@ -16,10 +16,10 @@ __C __export infiniStatus_t infiniopCreateConvDescriptor(infiniopHandle_t handle
                                                          void *dilations,
                                                          size_t n);
 
-__C __export infiniStatus_t infiniopGetConvWorkspaceSize(infiniopConvDescriptor_t desc, size_t *size);
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetConvWorkspaceSize(infiniopConvDescriptor_t desc, size_t *size);
 
-__C __export infiniStatus_t infiniopConv(infiniopConvDescriptor_t desc, void *workspace, size_t workspace_size, void *y, const void *x, const void *w, const void *bias, void *stream);
+INFINI_EXTERN_C __export infiniStatus_t infiniopConv(infiniopConvDescriptor_t desc, void *workspace, size_t workspace_size, void *y, const void *x, const void *w, const void *bias, void *stream);
 
-__C __export infiniStatus_t infiniopDestroyConvDescriptor(infiniopConvDescriptor_t desc);
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyConvDescriptor(infiniopConvDescriptor_t desc);
 
 #endif

include/infiniop/ops/dequantize_awq.h

@@ -0,0 +1,28 @@
+#ifndef __INFINIOP_DEQUANTIZE_AWQ_API_H__
+#define __INFINIOP_DEQUANTIZE_AWQ_API_H__
+
+#include "../operator_descriptor.h"
+
+typedef struct InfiniopDescriptor *infiniopDequantizeAWQDescriptor_t;
+
+INFINI_EXTERN_C __export infiniStatus_t infiniopCreateDequantizeAWQDescriptor(infiniopHandle_t handle,
+                                                                  infiniopDequantizeAWQDescriptor_t *desc_ptr,
+                                                                  infiniopTensorDescriptor_t out_desc,
+                                                                  infiniopTensorDescriptor_t qweight_desc,
+                                                                  infiniopTensorDescriptor_t scales_desc,
+                                                                  infiniopTensorDescriptor_t zeros_desc);
+
+INFINI_EXTERN_C __export infiniStatus_t infiniopGetDequantizeAWQWorkspaceSize(infiniopDequantizeAWQDescriptor_t desc, size_t *size);
+
+INFINI_EXTERN_C __export infiniStatus_t infiniopDequantizeAWQ(infiniopDequantizeAWQDescriptor_t desc,
+                                                  void *workspace,
+                                                  size_t workspace_size,
+                                                  void *out,
+                                                  const void *qweight,
+                                                  const void *scales,
+                                                  const void *zeros,
+                                                  void *stream);
+
+INFINI_EXTERN_C __export infiniStatus_t infiniopDestroyDequantizeAWQDescriptor(infiniopDequantizeAWQDescriptor_t desc);
+
+#endif