From a33ee0fd21fdf9c293f56ed9f61bc98840e8ed46 Mon Sep 17 00:00:00 2001 From: POI-WX Date: Mon, 27 May 2024 18:18:15 +0800 Subject: [PATCH 01/10] fix --- impl/ascend_npu/ascend_config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/impl/ascend_npu/ascend_config.yaml b/impl/ascend_npu/ascend_config.yaml index 729882e92..e8774c6d7 100755 --- a/impl/ascend_npu/ascend_config.yaml +++ b/impl/ascend_npu/ascend_config.yaml @@ -16,10 +16,6 @@ ascend: - diopiArgmax - diopiAtan - diopiAtanInp -- diopiAttention -- diopiAttentionBackward -- diopiAttentionVarLen -- diopiAttentionVarLenBackward - diopiBaddbmm - diopiBaddbmmInp - diopiBitwiseNot @@ -214,6 +210,10 @@ ascend_npu: - diopiAdamW - diopiAdaptiveAvgPool2d - diopiAdaptiveAvgPool2dBackward +- diopiAttention +- diopiAttentionBackward +- diopiAttentionVarLen +- diopiAttentionVarLenBackward - diopiBatchNorm - diopiBatchNormBackward - diopiNonzero From 0d10cffb5b3bb12e0d5fe5f6a87c0c45a6983d28 Mon Sep 17 00:00:00 2001 From: POI-WX Date: Mon, 27 May 2024 20:44:59 +0800 Subject: [PATCH 02/10] reimpl diopiIndexPutInp[skip ci] --- impl/ascend/functions/index_put.cpp | 40 +++++++++++++++++++++++++++++ impl/ascend_npu/CMakeLists.txt | 1 + impl/ascend_npu/ascend_config.yaml | 2 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 impl/ascend/functions/index_put.cpp diff --git a/impl/ascend/functions/index_put.cpp b/impl/ascend/functions/index_put.cpp new file mode 100644 index 000000000..3be5c2db8 --- /dev/null +++ b/impl/ascend/functions/index_put.cpp @@ -0,0 +1,40 @@ +/** + * @file + * @author DeepLink + * @copyright (c) 2024, DeepLink. + */ + +#include "../aclnn/adaptor.hpp" + +namespace impl { +namespace ascend { + +diopiError_t diopiIndexPutInp(diopiContextHandle_t ctx, diopiTensorHandle_t input, diopiConstTensorHandle_t values, diopiConstTensorHandle_t* indices, + int64_t indicesCounts, bool accumulate) { + AscendTensor inputTensor(input); + AscendTensor valuesTensor(values); + if (inputTensor.numel() == 0 || valuesTensor.numel() == 0) { + return diopiSuccess; + } + + std::vector indicesVec; + indicesVec.reserve(indicesCounts); + + for (int i = 0; i < indicesCounts; i++) { + if (indices[i] != nullptr) { + indicesVec[i] = indices[i]; + } else { + int64_t array[1] = {0}; + diopiSize_t size = {array, 1}; + diopiTensorHandle_t emptyTensor = nullptr; + diopiRequireTensor(ctx, &emptyTensor, &size, nullptr, inputTensor.dtype(), diopi_device); + indicesVec[i] = emptyTensor; + } + } + + DIOPI_ASCEND_CALL_ACLNN(aclnnIndexPutImpl, ctx, input, indicesVec, values, accumulate, false); + return diopiSuccess; +} + +} // namespace ascend +} // namespace impl diff --git a/impl/ascend_npu/CMakeLists.txt b/impl/ascend_npu/CMakeLists.txt index 732099fb5..88b2aa254 100755 --- a/impl/ascend_npu/CMakeLists.txt +++ b/impl/ascend_npu/CMakeLists.txt @@ -175,6 +175,7 @@ set(OLD_IMPL_SRC ${OLD_IMPL_DIR}/functions/arange.cpp ${OLD_IMPL_DIR}/functions/gather.cpp ${OLD_IMPL_DIR}/functions/layer_norm.cpp + ${OLD_IMPL_DIR}/functions/index_put.cpp ${OLD_IMPL_DIR}/functions/index_select.cpp ${OLD_IMPL_DIR}/functions/repeat.cpp ${OLD_IMPL_DIR}/functions/group_norm.cpp diff --git a/impl/ascend_npu/ascend_config.yaml b/impl/ascend_npu/ascend_config.yaml index e8774c6d7..efcedd819 100755 --- a/impl/ascend_npu/ascend_config.yaml +++ b/impl/ascend_npu/ascend_config.yaml @@ -92,6 +92,7 @@ ascend: - diopiHardtanh - diopiHardtanhBackward - diopiHardtanhInp +- diopiIndexPutInp - diopiIsNan - diopiLayerNorm - diopiLayerNormBackward @@ -230,7 +231,6 @@ ascend_npu: - diopiMaxPool2dWithIndices - diopiRotaryEmbedding - diopiIndexPut -- diopiIndexPutInp - diopiIndexSelect - diopiIndexSelectBackward - diopiIndex From bd1093b143b4ed89405d8045d0e1e403fdd148f4 Mon Sep 17 00:00:00 2001 From: POI-WX Date: Tue, 28 May 2024 11:07:46 +0800 Subject: [PATCH 03/10] update --- impl/ascend/functions/index_put.cpp | 28 ++++++++++++++++++++++++++++ impl/ascend_npu/ascend_config.yaml | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/impl/ascend/functions/index_put.cpp b/impl/ascend/functions/index_put.cpp index 3be5c2db8..4dda08d89 100644 --- a/impl/ascend/functions/index_put.cpp +++ b/impl/ascend/functions/index_put.cpp @@ -9,6 +9,34 @@ namespace impl { namespace ascend { +diopiError_t diopiIndexPut(diopiContextHandle_t ctx, diopiTensorHandle_t out, diopiConstTensorHandle_t input, diopiConstTensorHandle_t values, + diopiConstTensorHandle_t* indices, int64_t indicesCounts, bool accumulate) { + AscendTensor inputTensor(input); + AscendTensor valuesTensor(values); + if (inputTensor.numel() == 0 || valuesTensor.numel() == 0) { + return diopiSuccess; + } + + std::vector indicesVec; + indicesVec.reserve(indicesCounts); + + for (int i = 0; i < indicesCounts; i++) { + if (indices[i] != nullptr) { + indicesVec[i] = indices[i]; + } else { + int64_t array[1] = {0}; + diopiSize_t size = {array, 1}; + diopiTensorHandle_t emptyTensor = nullptr; + diopiRequireTensor(ctx, &emptyTensor, &size, nullptr, inputTensor.dtype(), diopi_device); + indicesVec[i] = emptyTensor; + } + } + + DIOPI_ASCEND_CALL_ACLNN(aclnnInplaceCopy, ctx, out, input); + DIOPI_ASCEND_CALL_ACLNN(aclnnIndexPutImpl, ctx, out, indicesVec, values, accumulate, false); + return diopiSuccess; +} + diopiError_t diopiIndexPutInp(diopiContextHandle_t ctx, diopiTensorHandle_t input, diopiConstTensorHandle_t values, diopiConstTensorHandle_t* indices, int64_t indicesCounts, bool accumulate) { AscendTensor inputTensor(input); diff --git a/impl/ascend_npu/ascend_config.yaml b/impl/ascend_npu/ascend_config.yaml index efcedd819..0294f9d0c 100755 --- a/impl/ascend_npu/ascend_config.yaml +++ b/impl/ascend_npu/ascend_config.yaml @@ -92,6 +92,7 @@ ascend: - diopiHardtanh - diopiHardtanhBackward - diopiHardtanhInp +- diopiIndexPut - diopiIndexPutInp - diopiIsNan - diopiLayerNorm @@ -230,7 +231,6 @@ ascend_npu: - diopiMultinomial - diopiMaxPool2dWithIndices - diopiRotaryEmbedding -- diopiIndexPut - diopiIndexSelect - diopiIndexSelectBackward - diopiIndex From af24ae40dfca6a674ef7382404881c5e3c3f9726 Mon Sep 17 00:00:00 2001 From: POI-WX Date: Tue, 28 May 2024 14:24:50 +0800 Subject: [PATCH 04/10] fix bug --- impl/ascend/functions/index_put.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/impl/ascend/functions/index_put.cpp b/impl/ascend/functions/index_put.cpp index 4dda08d89..378dd73c5 100644 --- a/impl/ascend/functions/index_put.cpp +++ b/impl/ascend/functions/index_put.cpp @@ -22,13 +22,13 @@ diopiError_t diopiIndexPut(diopiContextHandle_t ctx, diopiTensorHandle_t out, di for (int i = 0; i < indicesCounts; i++) { if (indices[i] != nullptr) { - indicesVec[i] = indices[i]; + indicesVec.emplace_back(indices[i]); } else { int64_t array[1] = {0}; diopiSize_t size = {array, 1}; diopiTensorHandle_t emptyTensor = nullptr; diopiRequireTensor(ctx, &emptyTensor, &size, nullptr, inputTensor.dtype(), diopi_device); - indicesVec[i] = emptyTensor; + indicesVec.emplace_back(emptyTensor); } } @@ -50,13 +50,13 @@ diopiError_t diopiIndexPutInp(diopiContextHandle_t ctx, diopiTensorHandle_t inpu for (int i = 0; i < indicesCounts; i++) { if (indices[i] != nullptr) { - indicesVec[i] = indices[i]; + indicesVec.emplace_back(indices[i]); } else { int64_t array[1] = {0}; diopiSize_t size = {array, 1}; diopiTensorHandle_t emptyTensor = nullptr; diopiRequireTensor(ctx, &emptyTensor, &size, nullptr, inputTensor.dtype(), diopi_device); - indicesVec[i] = emptyTensor; + indicesVec.emplace_back(emptyTensor); } } From ff4af2d07beba10fdb3f27e1918e9ee82a4f039f Mon Sep 17 00:00:00 2001 From: POI-WX Date: Tue, 28 May 2024 16:02:43 +0800 Subject: [PATCH 05/10] reimpl diopiIndexBackward op --- impl/ascend/functions/index.cpp | 41 ++++++++++++++++++++++++++++++ impl/ascend_npu/CMakeLists.txt | 1 + impl/ascend_npu/ascend_config.yaml | 2 +- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 impl/ascend/functions/index.cpp diff --git a/impl/ascend/functions/index.cpp b/impl/ascend/functions/index.cpp new file mode 100644 index 000000000..a28b90c18 --- /dev/null +++ b/impl/ascend/functions/index.cpp @@ -0,0 +1,41 @@ +/** + * @file + * @author DeepLink + * @copyright (c) 2024, DeepLink. + */ + +#include "../aclnn/adaptor.hpp" + +namespace impl { +namespace ascend { + +diopiError_t diopiIndexBackward(diopiContextHandle_t ctx, diopiTensorHandle_t gradInput, diopiTensorHandle_t zerosLikeInput, diopiConstTensorHandle_t* indices, + int64_t nums, diopiConstTensorHandle_t gradOutput) { + AscendTensor gradInputTensor(gradInput); + AscendTensor gradOutputTensor(gradOutput); + if (gradInputTensor.numel() == 0 || gradOutputTensor.numel() == 0) { + return diopiSuccess; + } + + std::vector indicesVec; + indicesVec.reserve(nums); + + for (int i = 0; i < nums; i++) { + if (indices[i] != nullptr) { + indicesVec.emplace_back(indices[i]); + } else { + int64_t array[1] = {0}; + diopiSize_t size = {array, 1}; + diopiTensorHandle_t emptyTensor = nullptr; + diopiRequireTensor(ctx, &emptyTensor, &size, nullptr, gradOutputTensor.dtype(), diopi_device); + indicesVec.emplace_back(emptyTensor); + } + } + + DIOPI_ASCEND_CALL_ACLNN(aclnnInplaceCopy, ctx, gradInput, zerosLikeInput); + DIOPI_ASCEND_CALL_ACLNN(aclnnIndexPutImpl, ctx, gradInput, indicesVec, gradOutput, true, false); + return diopiSuccess; +} + +} // namespace ascend +} // namespace impl diff --git a/impl/ascend_npu/CMakeLists.txt b/impl/ascend_npu/CMakeLists.txt index 88b2aa254..df1a12f77 100755 --- a/impl/ascend_npu/CMakeLists.txt +++ b/impl/ascend_npu/CMakeLists.txt @@ -175,6 +175,7 @@ set(OLD_IMPL_SRC ${OLD_IMPL_DIR}/functions/arange.cpp ${OLD_IMPL_DIR}/functions/gather.cpp ${OLD_IMPL_DIR}/functions/layer_norm.cpp + ${OLD_IMPL_DIR}/functions/index.cpp ${OLD_IMPL_DIR}/functions/index_put.cpp ${OLD_IMPL_DIR}/functions/index_select.cpp ${OLD_IMPL_DIR}/functions/repeat.cpp diff --git a/impl/ascend_npu/ascend_config.yaml b/impl/ascend_npu/ascend_config.yaml index 0294f9d0c..4d40cd9ca 100755 --- a/impl/ascend_npu/ascend_config.yaml +++ b/impl/ascend_npu/ascend_config.yaml @@ -92,6 +92,7 @@ ascend: - diopiHardtanh - diopiHardtanhBackward - diopiHardtanhInp +- diopiIndexBackward - diopiIndexPut - diopiIndexPutInp - diopiIsNan @@ -234,7 +235,6 @@ ascend_npu: - diopiIndexSelect - diopiIndexSelectBackward - diopiIndex -- diopiIndexBackward - diopiDestIndexCopyKV - diopiTokenAttentionInference - diopiTokenSoftmaxReduceVInference From 2b368c6d1c5eecc7d1d90cd09374986e0abc94c3 Mon Sep 17 00:00:00 2001 From: POI-WX Date: Wed, 12 Jun 2024 19:24:06 +0800 Subject: [PATCH 06/10] fix --- impl/ascend_npu/ascend_config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/impl/ascend_npu/ascend_config.yaml b/impl/ascend_npu/ascend_config.yaml index 602b560fa..7cab65baf 100755 --- a/impl/ascend_npu/ascend_config.yaml +++ b/impl/ascend_npu/ascend_config.yaml @@ -238,8 +238,6 @@ ascend_npu: - diopiCopyInp - diopiMultinomial - diopiRotaryEmbedding -- diopiIndexSelect -- diopiIndexSelectBackward - diopiIndex - diopiDestIndexCopyKV - diopiTokenAttentionInference From 587995de4b9a49a5e8b576c376e69cd38d14138e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 14 Jun 2024 11:17:56 +0000 Subject: [PATCH 07/10] add computeWorkspaceSize --- impl/ascend/aclnn/adaptor.hpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/impl/ascend/aclnn/adaptor.hpp b/impl/ascend/aclnn/adaptor.hpp index 484c10527..225b25ae2 100644 --- a/impl/ascend/aclnn/adaptor.hpp +++ b/impl/ascend/aclnn/adaptor.hpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -287,6 +288,25 @@ class AclWorkspace final { void* workspaceAddr_ = nullptr; }; +template +struct IsAclnnType { + using value = + typename std::disjunction, std::is_same, std::is_same, std::is_same, + std::is_same, std::is_same, std::is_same>::value; +}; + +template ...>, void> = 0> +static std::pair computeWorkspaceSize(Args&&... args){ + static const auto workspaceSizeFuncAddr = getOpApiFuncAddr(workspaceApi); + using WorkspaceSizeFunc = int (*)(Args..., uint64_t*, aclOpExecutor**); + WorkspaceSizeFunc workspaceSizeFunc = reinterpret_cast(workspaceSizeFuncAddr); + uint64_t workspaceSize = 0; + aclOpExecutor* executor = nullptr; + auto workspaceStatus = std::invoke(workspaceSizeFunc, std::forward(args)..., &workspaceSize, &executor); + ASCEND_CHECK_THROW(workspaceStatus == ACL_SUCCESS, "[%s]'s return value is not equal to ACL_SUCCESS. aclnnStatus is %d.", workspaceApi, workspaceStatus); + return {workspaceSize, executor}; +} + template auto callAclnnImpl(diopiContextHandle_t ctx, const Args&... args) { if (isDebugAclOpRunnerOn()) { From 6bc2af8c72d8fd2573030e7c284deef457a5e0cd Mon Sep 17 00:00:00 2001 From: liwenjian-sensetime <109193776+liwenjian-sensetime@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:20:53 +0800 Subject: [PATCH 08/10] [ci]fix Ascend CI (#1275) --- .github/workflows/_runs-on-nv-step1.yml | 4 ---- .github/workflows/data-cron.yml | 12 +++++++++++- .github/workflows/main.yml | 17 +++-------------- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.github/workflows/_runs-on-nv-step1.yml b/.github/workflows/_runs-on-nv-step1.yml index 845288aa4..79b7ebc84 100644 --- a/.github/workflows/_runs-on-nv-step1.yml +++ b/.github/workflows/_runs-on-nv-step1.yml @@ -77,8 +77,6 @@ jobs: && source ${ENV_PATH}/pt2.0_diopi \ && python main.py --mode gen_data" \ || ( cd ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1} && git clean -xdf ${GEN_DATA} && exit 1 ) - source ~/Aoss_env.sh - ads-cli cp ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ elif [[ "${GETRUNNER}" == *diopi* ]];then ssh SH1424 """ set -e @@ -86,8 +84,6 @@ jobs: cd ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER} && cd ${BUILD_TEST1} && cd diopi_test/python && srun --job-name=${GITHUB_JOB} --partition=${SLURM_PAR_V100} --time=20 --gres=gpu:1 bash -c 'python main.py --mode gen_data' \ || ( cd ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1} && git clean -xdf ${GEN_DATA} && exit 1 ) - source ~/Aoss_env.sh - ads-cli cp ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ """ else ln -s ${GEN_DATA_PATH}/${GEN_DATA}/diopi ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ diff --git a/.github/workflows/data-cron.yml b/.github/workflows/data-cron.yml index 61b173e40..f86b695b6 100644 --- a/.github/workflows/data-cron.yml +++ b/.github/workflows/data-cron.yml @@ -93,6 +93,7 @@ jobs: mkdir -p ${DATA_DIR}/source/${GEN_DATA} rsync -a --delete ${CLUSTER_V100}:${DATA_DIR}/source/${GEN_DATA}/diopi/ ${DATA_DIR}/source/${GEN_DATA}/diopi/ """ +<<<<<<< HEAD # ssh ${CLUSTER_ASCEND_910B} """ # mkdir -p ${DATA_DIR}/source/${GEN_DATA} # rsync -a --delete ${CLUSTER_V100}:${DATA_DIR}/source/${GEN_DATA}/diopi/ ${DATA_DIR}/source/${GEN_DATA}/diopi/ @@ -114,4 +115,13 @@ jobs: run: | set -e source ~/Aoss_env.sh - ads-cli cp s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss-internal.cn-sh-01c.sensecoreapi-oss.cn${DATA_DIR}/source/${GEN_DATA}/diopi/ ${DATA_DIR}/source/${GEN_DATA}/diopi/ \ No newline at end of file + ads-cli cp s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss-internal.cn-sh-01c.sensecoreapi-oss.cn${DATA_DIR}/source/${GEN_DATA}/diopi/ ${DATA_DIR}/source/${GEN_DATA}/diopi/ +======= + ssh ${CLUSTER_ASCEND_910B} """ + mkdir -p ${DATA_DIR}/source/${GEN_DATA} + rsync -a --delete ${CLUSTER_V100}:${DATA_DIR}/source/${GEN_DATA}/diopi/ ${DATA_DIR}/source/${GEN_DATA}/diopi/ + """ + # ssh ${CLUSTER_SUPA} """ + # rsync -a ${CLUSTER_V100}:${DATA_DIR}/source/${GEN_DATA}/diopi/ ${DATA_DIR}/source/${GEN_DATA}/diopi/ + # """ +>>>>>>> 2b566db5 ([ci]fix Ascend CI (#1275)) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index beb3d2345..038a5a990 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,10 +96,8 @@ jobs: && rsync -a --delete ${GITHUB_WORKSPACE}/source/ ${CLUSTER_SUPA}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ || echo "failure to connect to supa" ssh ${CLUSTER_1424} "mkdir -p ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source" \ && rsync -a --delete ${GITHUB_WORKSPACE}/source/ ${CLUSTER_1424}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ || echo "failure to connect to sh1424" - # ssh ${CLUSTER_ASCEND_910B} "mkdir -p ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source" \ - # && rsync -a --delete ${GITHUB_WORKSPACE}/source/ ${CLUSTER_ASCEND_910B}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ || echo "failure to connect to ascend 910b" - source ~/Aoss_env.sh - ads-cli cp ${GITHUB_WORKSPACE}/source/ s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ + ssh ${CLUSTER_ASCEND_910B} "mkdir -p ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source" \ + && rsync -a --delete ${GITHUB_WORKSPACE}/source/ ${CLUSTER_ASCEND_910B}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ || echo "failure to connect to ascend 910b" # ssh ${CLUSTER_KLX} "mkdir -p ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source" \ # && rsync -a --delete ${GITHUB_WORKSPACE}/source/ ${CLUSTER_KLX}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ || echo "failure to connect to kunlunxin" @@ -295,12 +293,6 @@ jobs: needs: [Rsync] if: ${{ contains( needs.Rsync.outputs.output, 'ASCEND' ) }} steps: - - name: COPY Source - run: | - set -e - source ~/Aoss_env.sh - ads-cli cp s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss-internal.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ - ads-cli --dryrun --deleteSrc cp s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss-internal.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/source/ /dev/null 2>&1 >/dev/null - name: build run: | set -e @@ -327,10 +319,7 @@ jobs: set -e cd ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1} if [[ \"${{ needs.Rsync.outputs.output }}\" == *GENDATA* ]];then - # rsync -a ${CLUSTER_V100}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/${GEN_DATA}/diopi ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ - source ~/Aoss_env.sh - ads-cli cp s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss-internal.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ - ads-cli --dryrun --deleteSrc cp s3://${Platform_ci_aoss_name}:${Platform_ci_aoss_url}@platform.aoss-internal.cn-sh-01c.sensecoreapi-oss.cn${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ /dev/null 2>&1 >/dev/null + rsync -a ${CLUSTER_V100}:${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/${GEN_DATA}/diopi ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ else ln -s ${GEN_DATA_PATH}/${GEN_DATA}/diopi ${DEEPLINK_PATH}/${GITHUB_RUN_NUMBER}/${BUILD_TEST1}/diopi_test/python/cache/ fi From 5dc21b849a924602f02b0ef3b1a3dd888cd2a72f Mon Sep 17 00:00:00 2001 From: POI-WX Date: Thu, 27 Jun 2024 11:17:20 +0800 Subject: [PATCH 09/10] uodate --- impl/ascend/aclnn/adaptor.hpp | 40 ----------------------------------- 1 file changed, 40 deletions(-) diff --git a/impl/ascend/aclnn/adaptor.hpp b/impl/ascend/aclnn/adaptor.hpp index 066ac7139..5c214c111 100644 --- a/impl/ascend/aclnn/adaptor.hpp +++ b/impl/ascend/aclnn/adaptor.hpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -300,45 +299,6 @@ class AclWorkspace final { void* workspaceAddr_ = nullptr; }; -template -struct IsAclnnType { - using value = - typename std::disjunction, std::is_same, std::is_same, std::is_same, - std::is_same, std::is_same, std::is_same>::value; -}; - -template ...>, void> = 0> -static std::pair computeWorkspaceSize(Args&&... args){ - static const auto workspaceSizeFuncAddr = getOpApiFuncAddr(workspaceApi); - using WorkspaceSizeFunc = int (*)(Args..., uint64_t*, aclOpExecutor**); - WorkspaceSizeFunc workspaceSizeFunc = reinterpret_cast(workspaceSizeFuncAddr); - uint64_t workspaceSize = 0; - aclOpExecutor* executor = nullptr; - auto workspaceStatus = std::invoke(workspaceSizeFunc, std::forward(args)..., &workspaceSize, &executor); - ASCEND_CHECK_THROW(workspaceStatus == ACL_SUCCESS, "[%s]'s return value is not equal to ACL_SUCCESS. aclnnStatus is %d.", workspaceApi, workspaceStatus); - return {workspaceSize, executor}; -} - -template -struct IsAclnnType { - using value = - typename std::disjunction, std::is_same, std::is_same, std::is_same, - std::is_same, std::is_same, std::is_same>::value; -}; - -template ...>, void> = 0> -static std::pair computeWorkspaceSize(Args&&... args){ - static const auto workspaceSizeFuncAddr = getOpApiFuncAddr(workspaceApi); - using WorkspaceSizeFunc = int (*)(Args..., uint64_t*, aclOpExecutor**); - WorkspaceSizeFunc workspaceSizeFunc = reinterpret_cast(workspaceSizeFuncAddr); - uint64_t workspaceSize = 0; - aclOpExecutor* executor = nullptr; - auto workspaceStatus = std::invoke(workspaceSizeFunc, std::forward(args)..., &workspaceSize, &executor); - ASCEND_CHECK_THROW(workspaceStatus == ACL_SUCCESS, "[%s]'s return value is not equal to ACL_SUCCESS. aclnnStatus is %d.", workspaceApi, workspaceStatus); - return {workspaceSize, executor}; -} - -// std::true_type if it's one of the types listed, otherwise std::false_type template struct IsAclnnBuildInType : std::disjunction, std::is_same, std::is_same, std::is_same, From 61bc28958e5a6f9b5fb5ae82ee027040d3134ce9 Mon Sep 17 00:00:00 2001 From: POI-WX Date: Thu, 27 Jun 2024 11:18:52 +0800 Subject: [PATCH 10/10] update --- impl/ascend/aclnn/adaptor.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/impl/ascend/aclnn/adaptor.hpp b/impl/ascend/aclnn/adaptor.hpp index 5c214c111..7c024a627 100644 --- a/impl/ascend/aclnn/adaptor.hpp +++ b/impl/ascend/aclnn/adaptor.hpp @@ -299,6 +299,7 @@ class AclWorkspace final { void* workspaceAddr_ = nullptr; }; +// std::true_type if it's one of the types listed, otherwise std::false_type template struct IsAclnnBuildInType : std::disjunction, std::is_same, std::is_same, std::is_same,