Skip to content

GitLab

"git@developer.sourcefind.cn:jerrrrry/infinicore.git" did not exist on "650bc97588277dbb675f26915e8fa0e8a7d95ab4"
Commit d15aaa3b authored by PanZezhong's avatar PanZezhong Committed by YdrMaster
Browse files

issue/291/style: 一系列 maca 改为 metax 并格式化 


Signed-off-by: default avatarPanZezhong <panzezhong@qiyuanlab.com>
parent 05247bb7
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
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::cuda
} // namespace op::add::nvidia
src/infiniop/ops/gemm/maca/gemm_maca.cc → src/infiniop/ops/gemm/metax/gemm_metax.cc
View file @ d15aaa3b
#include "gemm_maca.h"
#include "gemm_metax.h"
#include "../../../devices/maca/common_maca.h"
#include "../../../devices/maca/maca_handle.h"
namespace op::gemm::maca {
namespace op::gemm::metax {
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::maca
} // namespace op::gemm::metax
src/infiniop/ops/gemm/maca/gemm_maca.h → src/infiniop/ops/gemm/metax/gemm_metax.h
View file @ d15aaa3b
......@@ -3,6 +3,6 @@
#include "../gemm.h"
DESCRIPTOR(maca)
DESCRIPTOR(metax)
#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 "maca/gemm_maca.h"
#include "metax/gemm_metax.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, maca);
CREATE(INFINI_DEVICE_METAX, metax);
#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, maca);
GET(INFINI_DEVICE_METAX, metax);
#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, maca);
CALCULATE(INFINI_DEVICE_METAX, metax);
#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, maca);
DELETE(INFINI_DEVICE_METAX, metax);
#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/maca/random_sample_kernel.h → src/infiniop/ops/random_sample/metax/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::maca {
namespace op::random_sample::metax {
// ↓↓↓ 重新封装 cub api，减少模板参数，方便调用
......@@ -256,4 +256,4 @@ struct Algo {
}
};
} // namespace op::random_sample::maca
} // namespace op::random_sample::metax
src/infiniop/ops/random_sample/maca/random_sample_maca.h → src/infiniop/ops/random_sample/metax/random_sample_metax.h
View file @ d15aaa3b
......@@ -3,6 +3,6 @@
#include "../random_sample.h"
DESCRIPTOR(maca)
DESCRIPTOR(metax)
#endif // __RANDOM_SAMPLE_MACA_H__
src/infiniop/ops/random_sample/maca/random_sample_maca.maca → src/infiniop/ops/random_sample/metax/random_sample_metax.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_maca.h"
#include "random_sample_metax.h"
namespace op::random_sample::maca {
namespace op::random_sample::metax {
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 "maca/random_sample_maca.h"
#include "metax/random_sample_metax.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, maca);
CREATE(INFINI_DEVICE_METAX, metax);
#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, maca);
GET(INFINI_DEVICE_METAX, metax);
#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, maca);
CALCULATE(INFINI_DEVICE_METAX, metax);
#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, maca);
DELETE(INFINI_DEVICE_METAX, metax);
#endif
#ifdef ENABLE_ASCEND_API
DELETE(INFINI_DEVICE_ASCEND, ascend);
......
src/infiniop/ops/rearrange/maca/rearrange_maca.h → src/infiniop/ops/rearrange/metax/rearrange_metax.h
View file @ d15aaa3b
......@@ -3,6 +3,6 @@
#include "../rearrange.h"
DESCRIPTOR(maca)
DESCRIPTOR(metax)
#endif // __REARRANGE_MACA_H__
src/infiniop/ops/rearrange/maca/rearrange_maca.maca → src/infiniop/ops/rearrange/metax/rearrange_metax.maca
View file @ d15aaa3b
#include "../../../tensor.h"
#include "rearrange_kernel.h"
#include "rearrange_maca.h"
#include "rearrange_metax.h"
#include <algorithm>
#include <cmath>
#include <memory>
#include <stdint.h>
#include <vector>
namespace op::rearrange::maca {
namespace op::rearrange::metax {
struct Descriptor::Opaque {
std::shared_ptr<device::maca::Handle::Internal> internal;
......@@ -480,4 +480,4 @@ infiniStatus_t Descriptor::calculate(
return status;
}
} // namespace op::rearrange::maca
} // namespace op::rearrange::metax
src/infiniop/ops/rearrange/operator.cc
View file @ d15aaa3b
......@@ -13,7 +13,7 @@
#include "cuda/rearrange_cuda.cuh"
#endif
#ifdef ENABLE_METAX_API
#include "maca/rearrange_maca.h"
#include "metax/rearrange_metax.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, maca);
CREATE(INFINI_DEVICE_METAX, metax);
#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, maca);
CALCULATE(INFINI_DEVICE_METAX, metax);
#endif
default:
......@@ -107,7 +107,7 @@ __C infiniStatus_t infiniopDestroyRearrangeDescriptor(
DELETE(INFINI_DEVICE_NVIDIA, cuda);
#endif
#ifdef ENABLE_METAX_API
DELETE(INFINI_DEVICE_METAX, maca);
DELETE(INFINI_DEVICE_METAX, metax);
#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::cuda
} // namespace op::sub::nvidia
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::cuda
} // namespace op::swiglu::nvidia
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/*/maca/*.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/*/metax/*.cc")
add_files("../src/infiniop/ops/*/metax/*.maca", {rule = "maca"})
target_end()
target("infinirt-metax")
......
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