Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jerrrrry
infinicore
Commits
d15aaa3b
Commit
d15aaa3b
authored
Jul 11, 2025
by
PanZezhong
Committed by
YdrMaster
Jul 11, 2025
Browse files
issue/291/style: 一系列 maca 改为 metax 并格式化
Signed-off-by:
PanZezhong
<
panzezhong@qiyuanlab.com
>
parent
05247bb7
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
35 additions
and
35 deletions
+35
-35
src/infiniop/ops/add/nvidia/add_nvidia.cu
src/infiniop/ops/add/nvidia/add_nvidia.cu
+2
-2
src/infiniop/ops/gemm/metax/gemm_metax.cc
src/infiniop/ops/gemm/metax/gemm_metax.cc
+3
-3
src/infiniop/ops/gemm/metax/gemm_metax.h
src/infiniop/ops/gemm/metax/gemm_metax.h
+1
-1
src/infiniop/ops/gemm/operator.cc
src/infiniop/ops/gemm/operator.cc
+5
-5
src/infiniop/ops/mul/nvidia/mul_nvidia.cu
src/infiniop/ops/mul/nvidia/mul_nvidia.cu
+1
-1
src/infiniop/ops/random_sample/metax/random_sample_kernel.h
src/infiniop/ops/random_sample/metax/random_sample_kernel.h
+2
-2
src/infiniop/ops/random_sample/metax/random_sample_metax.h
src/infiniop/ops/random_sample/metax/random_sample_metax.h
+1
-1
src/infiniop/ops/random_sample/metax/random_sample_metax.maca
...infiniop/ops/random_sample/metax/random_sample_metax.maca
+2
-2
src/infiniop/ops/random_sample/operator.cc
src/infiniop/ops/random_sample/operator.cc
+5
-5
src/infiniop/ops/rearrange/metax/rearrange_kernel.h
src/infiniop/ops/rearrange/metax/rearrange_kernel.h
+0
-0
src/infiniop/ops/rearrange/metax/rearrange_metax.h
src/infiniop/ops/rearrange/metax/rearrange_metax.h
+1
-1
src/infiniop/ops/rearrange/metax/rearrange_metax.maca
src/infiniop/ops/rearrange/metax/rearrange_metax.maca
+3
-3
src/infiniop/ops/rearrange/operator.cc
src/infiniop/ops/rearrange/operator.cc
+4
-4
src/infiniop/ops/sub/nvidia/sub_nvidia.cu
src/infiniop/ops/sub/nvidia/sub_nvidia.cu
+2
-2
src/infiniop/ops/swiglu/nvidia/swiglu_nvidia.cu
src/infiniop/ops/swiglu/nvidia/swiglu_nvidia.cu
+1
-1
xmake/metax.lua
xmake/metax.lua
+2
-2
No files found.
src/infiniop/ops/add/nvidia/add_nvidia.cu
View file @
d15aaa3b
#include "add_nvidia.cuh"
#include "../cuda/kernel.cuh"
#include "add_nvidia.cuh"
namespace
op
::
add
::
nvidia
{
...
...
@@ -56,4 +56,4 @@ infiniStatus_t Descriptor::calculate(
return
INFINI_STATUS_SUCCESS
;
}
}
// namespace op::add::
cud
a
}
// namespace op::add::
nvidi
a
src/infiniop/ops/gemm/m
aca
/gemm_m
aca
.cc
→
src/infiniop/ops/gemm/m
etax
/gemm_m
etax
.cc
View file @
d15aaa3b
#include "gemm_m
aca
.h"
#include "gemm_m
etax
.h"
#include "../../../devices/maca/common_maca.h"
#include "../../../devices/maca/maca_handle.h"
namespace
op
::
gemm
::
m
aca
{
namespace
op
::
gemm
::
m
etax
{
struct
Descriptor
::
Opaque
{
std
::
shared_ptr
<
device
::
maca
::
Handle
::
Internal
>
internal
;
...
...
@@ -104,4 +104,4 @@ infiniStatus_t Descriptor::calculate(
return
INFINI_STATUS_SUCCESS
;
}
}
// namespace op::gemm::m
aca
}
// namespace op::gemm::m
etax
src/infiniop/ops/gemm/m
aca
/gemm_m
aca
.h
→
src/infiniop/ops/gemm/m
etax
/gemm_m
etax
.h
View file @
d15aaa3b
...
...
@@ -3,6 +3,6 @@
#include "../gemm.h"
DESCRIPTOR
(
m
aca
)
DESCRIPTOR
(
m
etax
)
#endif // __GEMM_MACA_H__
src/infiniop/ops/gemm/operator.cc
View file @
d15aaa3b
...
...
@@ -15,7 +15,7 @@
#include "ascend/gemm_ascend.h"
#endif
#ifdef ENABLE_METAX_API
#include "m
aca
/gemm_m
aca
.h"
#include "m
etax
/gemm_m
etax
.h"
#endif
#ifdef ENABLE_MOORE_API
#include "musa/gemm_musa.h"
...
...
@@ -55,7 +55,7 @@ __C infiniStatus_t infiniopCreateGemmDescriptor(
CREATE
(
INFINI_DEVICE_ASCEND
,
ascend
);
#endif
#ifdef ENABLE_METAX_API
CREATE
(
INFINI_DEVICE_METAX
,
m
aca
);
CREATE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_MOORE_API
CREATE
(
INFINI_DEVICE_MOORE
,
musa
);
...
...
@@ -97,7 +97,7 @@ infiniopGetGemmWorkspaceSize(
GET
(
INFINI_DEVICE_ASCEND
,
ascend
);
#endif
#ifdef ENABLE_METAX_API
GET
(
INFINI_DEVICE_METAX
,
m
aca
);
GET
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_MOORE_API
GET
(
INFINI_DEVICE_MOORE
,
musa
);
...
...
@@ -146,7 +146,7 @@ __C infiniStatus_t infiniopGemm(
CALCULATE
(
INFINI_DEVICE_ASCEND
,
ascend
);
#endif
#ifdef ENABLE_METAX_API
CALCULATE
(
INFINI_DEVICE_METAX
,
m
aca
);
CALCULATE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_MOORE_API
CALCULATE
(
INFINI_DEVICE_MOORE
,
musa
);
...
...
@@ -185,7 +185,7 @@ infiniopDestroyGemmDescriptor(infiniopGemmDescriptor_t desc) {
DELETE
(
INFINI_DEVICE_ASCEND
,
ascend
);
#endif
#ifdef ENABLE_METAX_API
DELETE
(
INFINI_DEVICE_METAX
,
m
aca
);
DELETE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_MOORE_API
DELETE
(
INFINI_DEVICE_MOORE
,
musa
);
...
...
src/infiniop/ops/mul/nvidia/mul_nvidia.cu
View file @
d15aaa3b
#include "mul_nvidia.cuh"
#include "../cuda/kernel.cuh"
#include "mul_nvidia.cuh"
namespace
op
::
mul
::
nvidia
{
...
...
src/infiniop/ops/random_sample/m
aca
/random_sample_kernel.h
→
src/infiniop/ops/random_sample/m
etax
/random_sample_kernel.h
View file @
d15aaa3b
...
...
@@ -4,7 +4,7 @@
#include <hccub/device/device_reduce.cuh>
#include <hccub/device/device_scan.cuh>
namespace
op
::
random_sample
::
m
aca
{
namespace
op
::
random_sample
::
m
etax
{
// ↓↓↓ 重新封装 cub api,减少模板参数,方便调用
...
...
@@ -256,4 +256,4 @@ struct Algo {
}
};
}
// namespace op::random_sample::m
aca
}
// namespace op::random_sample::m
etax
src/infiniop/ops/random_sample/m
aca
/random_sample_m
aca
.h
→
src/infiniop/ops/random_sample/m
etax
/random_sample_m
etax
.h
View file @
d15aaa3b
...
...
@@ -3,6 +3,6 @@
#include "../random_sample.h"
DESCRIPTOR
(
m
aca
)
DESCRIPTOR
(
m
etax
)
#endif // __RANDOM_SAMPLE_MACA_H__
src/infiniop/ops/random_sample/m
aca
/random_sample_m
aca
.maca
→
src/infiniop/ops/random_sample/m
etax
/random_sample_m
etax
.maca
View file @
d15aaa3b
...
...
@@ -2,9 +2,9 @@
#include "../../../devices/maca/maca_handle.h"
#include "../info.h"
#include "random_sample_kernel.h"
#include "random_sample_m
aca
.h"
#include "random_sample_m
etax
.h"
namespace op::random_sample::m
aca
{
namespace op::random_sample::m
etax
{
struct Descriptor::Opaque {
std::shared_ptr<device::maca::Handle::Internal> internal;
...
...
src/infiniop/ops/random_sample/operator.cc
View file @
d15aaa3b
...
...
@@ -9,7 +9,7 @@
#include "cuda/random_sample_cuda.cuh"
#endif
#ifdef ENABLE_METAX_API
#include "m
aca
/random_sample_m
aca
.h"
#include "m
etax
/random_sample_m
etax
.h"
#endif
#ifdef ENABLE_ASCEND_API
#include "ascend/random_sample_aclnn.h"
...
...
@@ -39,7 +39,7 @@ infiniopCreateRandomSampleDescriptor(
CREATE
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
CREATE
(
INFINI_DEVICE_METAX
,
m
aca
);
CREATE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_ASCEND_API
CREATE
(
INFINI_DEVICE_ASCEND
,
ascend
);
...
...
@@ -72,7 +72,7 @@ __C infiniStatus_t infiniopGetRandomSampleWorkspaceSize(
GET
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
GET
(
INFINI_DEVICE_METAX
,
m
aca
);
GET
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_ASCEND_API
GET
(
INFINI_DEVICE_ASCEND
,
ascend
);
...
...
@@ -115,7 +115,7 @@ __C infiniStatus_t infiniopRandomSample(
CALCULATE
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
CALCULATE
(
INFINI_DEVICE_METAX
,
m
aca
);
CALCULATE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_ASCEND_API
CALCULATE
(
INFINI_DEVICE_ASCEND
,
ascend
);
...
...
@@ -145,7 +145,7 @@ __C infiniStatus_t infiniopDestroyRandomSampleDescriptor(
DELETE
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
DELETE
(
INFINI_DEVICE_METAX
,
m
aca
);
DELETE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
#ifdef ENABLE_ASCEND_API
DELETE
(
INFINI_DEVICE_ASCEND
,
ascend
);
...
...
src/infiniop/ops/rearrange/m
aca
/rearrange_kernel.h
→
src/infiniop/ops/rearrange/m
etax
/rearrange_kernel.h
View file @
d15aaa3b
File moved
src/infiniop/ops/rearrange/m
aca
/rearrange_m
aca
.h
→
src/infiniop/ops/rearrange/m
etax
/rearrange_m
etax
.h
View file @
d15aaa3b
...
...
@@ -3,6 +3,6 @@
#include "../rearrange.h"
DESCRIPTOR
(
m
aca
)
DESCRIPTOR
(
m
etax
)
#endif // __REARRANGE_MACA_H__
src/infiniop/ops/rearrange/m
aca
/rearrange_m
aca
.maca
→
src/infiniop/ops/rearrange/m
etax
/rearrange_m
etax
.maca
View file @
d15aaa3b
#include "../../../tensor.h"
#include "rearrange_kernel.h"
#include "rearrange_m
aca
.h"
#include "rearrange_m
etax
.h"
#include <algorithm>
#include <cmath>
#include <memory>
#include <stdint.h>
#include <vector>
namespace op::rearrange::m
aca
{
namespace op::rearrange::m
etax
{
struct Descriptor::Opaque {
std::shared_ptr<device::maca::Handle::Internal> internal;
...
...
@@ -480,4 +480,4 @@ infiniStatus_t Descriptor::calculate(
return status;
}
} // namespace op::rearrange::m
aca
} // namespace op::rearrange::m
etax
src/infiniop/ops/rearrange/operator.cc
View file @
d15aaa3b
...
...
@@ -13,7 +13,7 @@
#include "cuda/rearrange_cuda.cuh"
#endif
#ifdef ENABLE_METAX_API
#include "m
aca
/rearrange_m
aca
.h"
#include "m
etax
/rearrange_m
etax
.h"
#endif
__C
infiniStatus_t
infiniopCreateRearrangeDescriptor
(
...
...
@@ -43,7 +43,7 @@ __C infiniStatus_t infiniopCreateRearrangeDescriptor(
CREATE
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
CREATE
(
INFINI_DEVICE_METAX
,
m
aca
);
CREATE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
default:
return
INFINI_STATUS_DEVICE_TYPE_NOT_SUPPORTED
;
...
...
@@ -76,7 +76,7 @@ __C infiniStatus_t infiniopRearrange(
CALCULATE
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
CALCULATE
(
INFINI_DEVICE_METAX
,
m
aca
);
CALCULATE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
default:
...
...
@@ -107,7 +107,7 @@ __C infiniStatus_t infiniopDestroyRearrangeDescriptor(
DELETE
(
INFINI_DEVICE_NVIDIA
,
cuda
);
#endif
#ifdef ENABLE_METAX_API
DELETE
(
INFINI_DEVICE_METAX
,
m
aca
);
DELETE
(
INFINI_DEVICE_METAX
,
m
etax
);
#endif
default:
...
...
src/infiniop/ops/sub/nvidia/sub_nvidia.cu
View file @
d15aaa3b
#include "sub_nvidia.cuh"
#include "../cuda/kernel.cuh"
#include "sub_nvidia.cuh"
namespace
op
::
sub
::
nvidia
{
...
...
@@ -56,4 +56,4 @@ infiniStatus_t Descriptor::calculate(
return
INFINI_STATUS_SUCCESS
;
}
}
// namespace op::sub::
cud
a
}
// namespace op::sub::
nvidi
a
src/infiniop/ops/swiglu/nvidia/swiglu_nvidia.cu
View file @
d15aaa3b
...
...
@@ -58,4 +58,4 @@ infiniStatus_t Descriptor::calculate(
return
INFINI_STATUS_SUCCESS
;
}
}
// namespace op::swiglu::
cud
a
}
// namespace op::swiglu::
nvidi
a
xmake/metax.lua
View file @
d15aaa3b
...
...
@@ -34,8 +34,8 @@ target("infiniop-metax")
set_languages
(
"cxx17"
)
set_warnings
(
"all"
,
"error"
)
add_cxflags
(
"-lstdc++"
,
"-fPIC"
,
"-Wno-defaulted-function-deleted"
,
"-Wno-strict-aliasing"
)
add_files
(
"../src/infiniop/devices/maca/*.cc"
,
"../src/infiniop/ops/*/m
aca
/*.cc"
)
add_files
(
"../src/infiniop/ops/*/maca/*.maca"
,
"../src/infiniop/ops/*/metax/*.maca"
,
{
rule
=
"maca"
})
add_files
(
"../src/infiniop/devices/maca/*.cc"
,
"../src/infiniop/ops/*/m
etax
/*.cc"
)
add_files
(
"../src/infiniop/ops/*/metax/*.maca"
,
{
rule
=
"maca"
})
target_end
()
target
(
"infinirt-metax"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment