Skip to content

Commit f9e6f1f

Browse files
PanZezhong1725PanZezhong1725
committed
issue/1031 fix T1-1-50
1 parent 4a87f36 commit f9e6f1f

71 files changed

Lines changed: 1206 additions & 1258 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/infinicore/ops/logcumsumexp.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ namespace infinicore::op {
88
class LogCumSumExp {
99
public:
1010
using schema = void (*)(Tensor, Tensor, int, bool, bool);
11-
11+
1212
static void execute(Tensor y, Tensor x, int axis, bool exclusive, bool reverse);
13-
13+
1414
static common::OpDispatcher<schema> &dispatcher();
1515
};
1616

1717
Tensor logcumsumexp(Tensor x, int axis, bool exclusive = false, bool reverse = false);
1818

1919
void logcumsumexp_(Tensor y, Tensor x, int axis, bool exclusive = false, bool reverse = false);
2020

21-
} // namespace infinicore::op
21+
} // namespace infinicore::op

‎include/infinicore/ops/logical_and.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ class LogicalAnd {
1717
Tensor logical_and(Tensor input1, Tensor input2);
1818
void logical_and_(Tensor output, Tensor input1, Tensor input2);
1919

20-
} // namespace infinicore::op
20+
} // namespace infinicore::op

‎include/infinicore/ops/logical_not.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ Tensor logical_not(Tensor input);
2020
// 将结果写入指定的 output Tensor
2121
void logical_not_(Tensor output, Tensor input);
2222

23-
} // namespace infinicore::op
23+
} // namespace infinicore::op

‎include/infinicore/ops/unfold.hpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
#pragma once
22

3-
#include <vector>
43
#include "../device.hpp"
54
#include "common/op.hpp"
5+
#include <vector>
66

77
namespace infinicore::op {
88

99
class Unfold {
1010
public:
1111
// schema: output, input, kernel_sizes, dilations, paddings, strides
12-
using schema = void (*)(Tensor, Tensor, const std::vector<int64_t>&, const std::vector<int64_t>&, const std::vector<int64_t>&, const std::vector<int64_t>&);
12+
using schema = void (*)(Tensor, Tensor, const std::vector<int64_t> &, const std::vector<int64_t> &, const std::vector<int64_t> &, const std::vector<int64_t> &);
1313

14-
static void execute(Tensor output, Tensor input,
15-
const std::vector<int64_t>& kernel_sizes,
16-
const std::vector<int64_t>& dilations,
17-
const std::vector<int64_t>& paddings,
18-
const std::vector<int64_t>& strides);
14+
static void execute(Tensor output, Tensor input,
15+
const std::vector<int64_t> &kernel_sizes,
16+
const std::vector<int64_t> &dilations,
17+
const std::vector<int64_t> &paddings,
18+
const std::vector<int64_t> &strides);
1919
static common::OpDispatcher<schema> &dispatcher();
2020
};
2121

2222
// Functional API
23-
Tensor unfold(Tensor input,
24-
std::vector<int64_t> kernel_sizes,
25-
std::vector<int64_t> dilations,
26-
std::vector<int64_t> paddings,
23+
Tensor unfold(Tensor input,
24+
std::vector<int64_t> kernel_sizes,
25+
std::vector<int64_t> dilations,
26+
std::vector<int64_t> paddings,
2727
std::vector<int64_t> strides);
2828

29-
void unfold_(Tensor output, Tensor input,
30-
std::vector<int64_t> kernel_sizes,
31-
std::vector<int64_t> dilations,
32-
std::vector<int64_t> paddings,
29+
void unfold_(Tensor output, Tensor input,
30+
std::vector<int64_t> kernel_sizes,
31+
std::vector<int64_t> dilations,
32+
std::vector<int64_t> paddings,
3333
std::vector<int64_t> strides);
3434

35-
} // namespace infinicore::op
35+
} // namespace infinicore::op

‎include/infinicore/ops/vander.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ class Vander {
1818
Tensor vander(Tensor input, int64_t N = 0, bool increasing = false);
1919
void vander_(Tensor output, Tensor input, int64_t N, bool increasing);
2020

21-
} // namespace infinicore::op
21+
} // namespace infinicore::op

‎include/infiniop.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include "infiniop/ops/log_softmax.h"
5656
#include "infiniop/ops/logaddexp.h"
5757
#include "infiniop/ops/logaddexp2.h"
58+
#include "infiniop/ops/logcumsumexp.h"
5859
#include "infiniop/ops/lp_norm.h"
5960
#include "infiniop/ops/masked_select.h"
6061
#include "infiniop/ops/mul.h"
@@ -91,13 +92,12 @@
9192
#include "infiniop/ops/topksoftmax.h"
9293
#include "infiniop/ops/triplet_margin_loss.h"
9394
#include "infiniop/ops/triplet_margin_with_distance_loss.h"
95+
#include "infiniop/ops/unfold.h"
9496
#include "infiniop/ops/upsample_bilinear.h"
9597
#include "infiniop/ops/upsample_nearest.h"
98+
#include "infiniop/ops/vander.h"
9699
#include "infiniop/ops/var.h"
97100
#include "infiniop/ops/var_mean.h"
98101
#include "infiniop/ops/zeros.h"
99-
#include "infiniop/ops/unfold.h"
100-
#include "infiniop/ops/vander.h"
101-
#include "infiniop/ops/logcumsumexp.h"
102102
#include "infiniop/tensor_descriptor.h"
103103
#endif // __INFINIOP_API_H__

‎include/infiniop/ops/logcumsumexp.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55

66
typedef struct InfiniopDescriptor *infiniopLogCumSumExpDescriptor_t;
77

8-
__C __export infiniStatus_t infiniopCreateLogCumSumExpDescriptor(infiniopHandle_t handle,
9-
infiniopLogCumSumExpDescriptor_t *desc_ptr,
10-
infiniopTensorDescriptor_t y,
11-
infiniopTensorDescriptor_t x,
12-
int axis,
13-
int exclusive,
14-
int reverse);
8+
__INFINI_C __export infiniStatus_t infiniopCreateLogCumSumExpDescriptor(infiniopHandle_t handle,
9+
infiniopLogCumSumExpDescriptor_t *desc_ptr,
10+
infiniopTensorDescriptor_t y,
11+
infiniopTensorDescriptor_t x,
12+
int axis,
13+
int exclusive,
14+
int reverse);
1515

1616
/* 获取执行 LogCumSumExp 所需的临时空间大小 */
17-
__C __export infiniStatus_t infiniopGetLogCumSumExpWorkspaceSize(infiniopLogCumSumExpDescriptor_t desc,
18-
size_t *size);
17+
__INFINI_C __export infiniStatus_t infiniopGetLogCumSumExpWorkspaceSize(infiniopLogCumSumExpDescriptor_t desc,
18+
size_t *size);
1919

20-
__C __export infiniStatus_t infiniopLogCumSumExp(infiniopLogCumSumExpDescriptor_t desc,
21-
void *workspace,
22-
size_t workspace_size,
23-
void *y,
24-
const void *x,
25-
void *stream);
20+
__INFINI_C __export infiniStatus_t infiniopLogCumSumExp(infiniopLogCumSumExpDescriptor_t desc,
21+
void *workspace,
22+
size_t workspace_size,
23+
void *y,
24+
const void *x,
25+
void *stream);
2626

2727
/* 销毁描述符 */
28-
__C __export infiniStatus_t infiniopDestroyLogCumSumExpDescriptor(infiniopLogCumSumExpDescriptor_t desc);
28+
__INFINI_C __export infiniStatus_t infiniopDestroyLogCumSumExpDescriptor(infiniopLogCumSumExpDescriptor_t desc);
2929

30-
#endif
30+
#endif

‎include/infiniop/ops/unfold.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55

66
typedef struct InfiniopDescriptor *infiniopUnfoldDescriptor_t;
77

8-
__C __export infiniStatus_t infiniopCreateUnfoldDescriptor(infiniopHandle_t handle,
9-
infiniopUnfoldDescriptor_t *desc_ptr,
10-
infiniopTensorDescriptor_t output,
11-
infiniopTensorDescriptor_t input,
12-
const int *kernel_sizes,
13-
const int *strides,
14-
const int *paddings,
15-
const int *dilations);
8+
__INFINI_C __export infiniStatus_t infiniopCreateUnfoldDescriptor(infiniopHandle_t handle,
9+
infiniopUnfoldDescriptor_t *desc_ptr,
10+
infiniopTensorDescriptor_t output,
11+
infiniopTensorDescriptor_t input,
12+
const int *kernel_sizes,
13+
const int *strides,
14+
const int *paddings,
15+
const int *dilations);
1616

1717
// 获取 Unfold 工作区大小
18-
__C __export infiniStatus_t infiniopGetUnfoldWorkspaceSize(infiniopUnfoldDescriptor_t desc, size_t *size);
18+
__INFINI_C __export infiniStatus_t infiniopGetUnfoldWorkspaceSize(infiniopUnfoldDescriptor_t desc, size_t *size);
1919

20-
__C __export infiniStatus_t infiniopUnfold(infiniopUnfoldDescriptor_t desc,
21-
void *workspace,
22-
size_t workspace_size,
23-
void *output,
24-
const void *input,
25-
void *stream);
26-
__C __export infiniStatus_t infiniopDestroyUnfoldDescriptor(infiniopUnfoldDescriptor_t desc);
20+
__INFINI_C __export infiniStatus_t infiniopUnfold(infiniopUnfoldDescriptor_t desc,
21+
void *workspace,
22+
size_t workspace_size,
23+
void *output,
24+
const void *input,
25+
void *stream);
26+
__INFINI_C __export infiniStatus_t infiniopDestroyUnfoldDescriptor(infiniopUnfoldDescriptor_t desc);
2727

28-
#endif // __INFINIOP_UNFOLD_API_H__
28+
#endif // __INFINIOP_UNFOLD_API_H__

‎include/infiniop/ops/vander.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#include "../operator_descriptor.h"
55

66
typedef struct InfiniopDescriptor *infiniopVanderDescriptor_t;
7-
__C __export infiniStatus_t infiniopCreateVanderDescriptor(infiniopHandle_t handle,
8-
infiniopVanderDescriptor_t *desc_ptr,
9-
infiniopTensorDescriptor_t output,
10-
infiniopTensorDescriptor_t input,
11-
int N,
12-
int increasing);
7+
__INFINI_C __export infiniStatus_t infiniopCreateVanderDescriptor(infiniopHandle_t handle,
8+
infiniopVanderDescriptor_t *desc_ptr,
9+
infiniopTensorDescriptor_t output,
10+
infiniopTensorDescriptor_t input,
11+
int N,
12+
int increasing);
1313

14-
__C __export infiniStatus_t infiniopGetVanderWorkspaceSize(infiniopVanderDescriptor_t desc, size_t *size);
14+
__INFINI_C __export infiniStatus_t infiniopGetVanderWorkspaceSize(infiniopVanderDescriptor_t desc, size_t *size);
1515

16-
__C __export infiniStatus_t infiniopVander(infiniopVanderDescriptor_t desc,
17-
void *workspace,
18-
size_t workspace_size,
19-
void *output,
20-
const void *input,
21-
void *stream);
16+
__INFINI_C __export infiniStatus_t infiniopVander(infiniopVanderDescriptor_t desc,
17+
void *workspace,
18+
size_t workspace_size,
19+
void *output,
20+
const void *input,
21+
void *stream);
2222

23-
__C __export infiniStatus_t infiniopDestroyVanderDescriptor(infiniopVanderDescriptor_t desc);
23+
__INFINI_C __export infiniStatus_t infiniopDestroyVanderDescriptor(infiniopVanderDescriptor_t desc);
2424

25-
#endif // __INFINIOP_VANDER_API_H__
25+
#endif // __INFINIOP_VANDER_API_H__

‎python/infinicore/__init__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
from infinicore.ops.lerp import lerp
8686
from infinicore.ops.logaddexp import logaddexp
8787
from infinicore.ops.logaddexp2 import logaddexp2
88+
from infinicore.ops.logcumsumexp import logcumsumexp
89+
from infinicore.ops.logical_and import logical_and
90+
from infinicore.ops.logical_not import logical_not
8891
from infinicore.ops.masked_select import masked_select
8992
from infinicore.ops.matmul import matmul
9093
from infinicore.ops.mha_kvcache import mha_kvcache
@@ -103,12 +106,9 @@
103106
from infinicore.ops.tan import tan
104107
from infinicore.ops.topk import topk
105108
from infinicore.ops.unsqueeze import unsqueeze
109+
from infinicore.ops.vander import vander
106110
from infinicore.ops.var import var
107111
from infinicore.ops.var_mean import var_mean
108-
from infinicore.ops.logcumsumexp import logcumsumexp
109-
from infinicore.ops.logical_and import logical_and
110-
from infinicore.ops.logical_not import logical_not
111-
from infinicore.ops.vander import vander
112112
from infinicore.tensor import (
113113
Tensor,
114114
empty,

0 commit comments

Comments
 (0)