From 412f3013236e668235eadae4e3c6762036544757 Mon Sep 17 00:00:00 2001 From: wanghailu Date: Mon, 23 Oct 2023 10:48:35 +0800 Subject: [PATCH] fix format --- include/ascend/ascend_runtime.h | 63 ++++++++++++++-------------- src/kernels/ascend/unary.cc | 73 ++++++++++++++++++--------------- 2 files changed, 73 insertions(+), 63 deletions(-) diff --git a/include/ascend/ascend_runtime.h b/include/ascend/ascend_runtime.h index cd421894..6b73b80b 100644 --- a/include/ascend/ascend_runtime.h +++ b/include/ascend/ascend_runtime.h @@ -1,19 +1,18 @@ #pragma once -#include "core/runtime.h" #include "ascend/ascend_common.h" +#include "core/runtime.h" +#define CHECK_RET(cond, return_expr) \ + do { \ + if (!(cond)) { \ + return_expr; \ + } \ + } while (0) -#define CHECK_RET(cond, return_expr) \ - do { \ - if (!(cond)) { \ - return_expr; \ - } \ - } while (0) - -#define LOG_PRINT(message, ...) \ - do { \ - printf(message, ##__VA_ARGS__); \ - } while (0) +#define LOG_PRINT(message, ...) \ + do { \ + printf(message, ##__VA_ARGS__); \ + } while (0) namespace infini { @@ -25,18 +24,22 @@ class ASCENDRuntimeObj : public RuntimeObj { size_t workspaceSize; public: - ASCENDRuntimeObj(int deviceId = 0) - : RuntimeObj(Device::ASCEND, deviceId) { - auto ret = aclrtSetDevice(deviceId); - CHECK_RET(ret == ACL_SUCCESS, LOG_PRINT("aclrtSetDevice failed. ERROR: %d\n", ret)); + ASCENDRuntimeObj(int deviceId = 0) : RuntimeObj(Device::ASCEND, deviceId) { + auto ret = aclrtSetDevice(deviceId); + CHECK_RET(ret == ACL_SUCCESS, + LOG_PRINT("aclrtSetDevice failed. ERROR: %d\n", ret)); ret = aclrtCreateContext(&aclnn, deviceId); - CHECK_RET(ret == ACL_SUCCESS, LOG_PRINT("aclrtCreateContext failed. ERROR: %d\n", ret)); - ret = aclrtSetCurrentContext(aclnn); - CHECK_RET(ret == ACL_SUCCESS, LOG_PRINT("aclrtSetCurrentContext failed. ERROR: %d\n", ret)); + CHECK_RET(ret == ACL_SUCCESS, + LOG_PRINT("aclrtCreateContext failed. ERROR: %d\n", ret)); + ret = aclrtSetCurrentContext(aclnn); + CHECK_RET(ret == ACL_SUCCESS, + LOG_PRINT("aclrtSetCurrentContext failed. ERROR: %d\n", ret)); ret = aclrtCreateStream(&stream); - CHECK_RET(ret == ACL_SUCCESS, LOG_PRINT("aclrtCreateStream failed. ERROR: %d\n", ret)); - ret = aclInit(nullptr); - CHECK_RET(ret == ACL_SUCCESS, LOG_PRINT("aclInit failed. ERROR: %d\n", ret)); + CHECK_RET(ret == ACL_SUCCESS, + LOG_PRINT("aclrtCreateStream failed. ERROR: %d\n", ret)); + ret = aclInit(nullptr); + CHECK_RET(ret == ACL_SUCCESS, + LOG_PRINT("aclInit failed. ERROR: %d\n", ret)); // 10GB for Longformer // size_t longformerNum = 3lu * (1 << 30); workspaceSize = 3ll << 30; // 3 GB @@ -48,8 +51,8 @@ class ASCENDRuntimeObj : public RuntimeObj { dealloc(workspace); aclrtDestroyStream(stream); aclrtDestroyContext(aclnn); - aclrtResetDevice(deviceId); - aclFinalize(); + aclrtResetDevice(deviceId); + aclFinalize(); } string toString() const override; @@ -73,20 +76,20 @@ class ASCENDRuntimeObj : public RuntimeObj { void copyBlobFromCPU(void *dst, const void *src, size_t bytes) const override { - aclrtMemcpy(dst, 1024*1024*1024, const_cast(src), bytes, - ACL_MEMCPY_HOST_TO_DEVICE); + aclrtMemcpy(dst, 1024 * 1024 * 1024, const_cast(src), bytes, + ACL_MEMCPY_HOST_TO_DEVICE); } void copyBlobToCPU(void *dst, const void *src, size_t bytes) const override { - aclrtMemcpy(dst, 1024*1024*1024, const_cast(src), bytes, - ACL_MEMCPY_DEVICE_TO_HOST); + aclrtMemcpy(dst, 1024 * 1024 * 1024, const_cast(src), bytes, + ACL_MEMCPY_DEVICE_TO_HOST); } void copyBlobInsideRuntime(void *dst, const void *src, size_t bytes) const override { - aclrtMemcpy(dst, 1024*1024*1024, const_cast(src), bytes, - ACL_MEMCPY_DEVICE_TO_DEVICE); + aclrtMemcpy(dst, 1024 * 1024 * 1024, const_cast(src), bytes, + ACL_MEMCPY_DEVICE_TO_DEVICE); } void initComm(const string &, int, int) override { IT_TODO_HALT(); } diff --git a/src/kernels/ascend/unary.cc b/src/kernels/ascend/unary.cc index e8002327..977ea8d6 100644 --- a/src/kernels/ascend/unary.cc +++ b/src/kernels/ascend/unary.cc @@ -1,7 +1,7 @@ #include "operators/unary.h" +#include "aclnnop/level2/aclnn_relu.h" #include "ascend/ascend_kernel_without_config.h" #include "ascend/ascend_runtime.h" -#include "aclnnop/level2/aclnn_relu.h" namespace infini { class ReluAclnn : public ASCENDKernelWithoutConfig { @@ -13,42 +13,49 @@ class ReluAclnn : public ASCENDKernelWithoutConfig { void *const aData = (op->getInputs(0)->getRawDataPtr()); void *const cData = (op->getOutput()->getRawDataPtr()); - auto a = op->getInputs(0)->getDims(); - std::vector aDim(a.size(), 1); - for(size_t i = 0; i < a.size(); ++i) { - aDim[i] = int64_t(a[i]); - } - auto aS = op->getInputs(0)->getStride(); - std::vector aStride(aS.size(), 1); - for(size_t i = 0; i < aS.size(); ++i) { - aStride[i] = int64_t(aS[i]); - } - auto c = op->getInputs(0)->getDims(); - std::vector cDim(c.size(), 1); - for(size_t i = 0; i < c.size(); ++i) { - cDim[i] = int64_t(c[i]); - } - auto cS = op->getInputs(0)->getStride(); - std::vector cStride(cS.size(), 1); - for(size_t i = 0; i < cS.size(); ++i) { - cStride[i] = int64_t(cS[i]); - } + auto a = op->getInputs(0)->getDims(); + std::vector aDim(a.size(), 1); + for (size_t i = 0; i < a.size(); ++i) { + aDim[i] = int64_t(a[i]); + } + auto aS = op->getInputs(0)->getStride(); + std::vector aStride(aS.size(), 1); + for (size_t i = 0; i < aS.size(); ++i) { + aStride[i] = int64_t(aS[i]); + } + auto c = op->getInputs(0)->getDims(); + std::vector cDim(c.size(), 1); + for (size_t i = 0; i < c.size(); ++i) { + cDim[i] = int64_t(c[i]); + } + auto cS = op->getInputs(0)->getStride(); + std::vector cStride(cS.size(), 1); + for (size_t i = 0; i < cS.size(); ++i) { + cStride[i] = int64_t(cS[i]); + } - auto input = aclCreateTensor(aDim.data(), aDim.size(), ACL_FLOAT, aStride.data(), 0, aclFormat::ACL_FORMAT_ND, aDim.data(), aDim.size(), aData); - auto output = aclCreateTensor(cDim.data(), cDim.size(), ACL_FLOAT, cStride.data(), 0, aclFormat::ACL_FORMAT_ND, cDim.data(), cDim.size(), cData); + auto input = aclCreateTensor( + aDim.data(), aDim.size(), ACL_FLOAT, aStride.data(), 0, + aclFormat::ACL_FORMAT_ND, aDim.data(), aDim.size(), aData); + auto output = aclCreateTensor( + cDim.data(), cDim.size(), ACL_FLOAT, cStride.data(), 0, + aclFormat::ACL_FORMAT_ND, cDim.data(), cDim.size(), cData); - uint64_t workspaceSize = 0; - aclOpExecutor* executor; + uint64_t workspaceSize = 0; + aclOpExecutor *executor; - auto ret = aclnnReluGetWorkspaceSize(input, output, &workspaceSize, &executor); - void* workspaceAddr = nullptr; - if (workspaceSize > 0) { - ret = aclrtMalloc(&workspaceAddr, workspaceSize, ACL_MEM_MALLOC_HUGE_FIRST); - } + auto ret = + aclnnReluGetWorkspaceSize(input, output, &workspaceSize, &executor); + void *workspaceAddr = nullptr; + if (workspaceSize > 0) { + ret = aclrtMalloc(&workspaceAddr, workspaceSize, + ACL_MEM_MALLOC_HUGE_FIRST); + } assert(ret == ACL_SUCCESS); - ret = aclnnRelu(workspaceAddr, workspaceSize, executor, context->ASCENDHandle()); + ret = aclnnRelu(workspaceAddr, workspaceSize, executor, + context->ASCENDHandle()); assert(ret == ACL_SUCCESS); - ret = aclrtSynchronizeStream(context->ASCENDHandle()); + ret = aclrtSynchronizeStream(context->ASCENDHandle()); assert(ret == ACL_SUCCESS); return; @@ -57,4 +64,4 @@ class ReluAclnn : public ASCENDKernelWithoutConfig { REGISTER_KERNEL(Device::ASCEND, OpType::Relu, DataType::Float32, ReluAclnn, "relu_ASCEND_float"); -}; +}; // namespace infini