diff --git a/.build-tools/containers/buildenv-acl/Dockerfile b/.build-tools/containers/buildenv-acl/Dockerfile index 3acf24c8..717ee9d0 100644 --- a/.build-tools/containers/buildenv-acl/Dockerfile +++ b/.build-tools/containers/buildenv-acl/Dockerfile @@ -42,5 +42,4 @@ ENV ESCAPED_LD_LIBRARY_PATH='$LD_LIBRARY_PATH' RUN echo "LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64:/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:$ESCAPED_LD_LIBRARY_PATH" >> $HOME/.hicr-env.sh RUN echo "source /usr/local/Ascend/ascend-toolkit/set_env.sh" >> $HOME/.hicr-env.sh - WORKDIR $HOME diff --git a/.build-tools/containers/buildenv/Dockerfile b/.build-tools/containers/buildenv/Dockerfile index 3bfb3ac9..d085d104 100644 --- a/.build-tools/containers/buildenv/Dockerfile +++ b/.build-tools/containers/buildenv/Dockerfile @@ -183,7 +183,6 @@ RUN echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig' >> $ RUN echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/share/pkgconfig' >> $HOME/.hicr-env.sh RUN echo 'source ${HOME}/.venv/bin/activate' >> $HOME/.hicr-env.sh - RUN echo 'source $HOME/.hicr-env.sh' >> $HOME/.bashrc USER $ROOT_USER RUN chown -R $USER $HOME diff --git a/.github/workflows/master-build-ascend-workflow.yml b/.github/workflows/master-build-acl-workflow.yml similarity index 100% rename from .github/workflows/master-build-ascend-workflow.yml rename to .github/workflows/master-build-acl-workflow.yml diff --git a/examples/meson.build b/examples/meson.build index 6b513d0f..ca4ba281 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,7 +1,7 @@ subdir('memcpy') subdir('kernel') subdir('topology') -# subdir('neuralNetwork') +subdir('neuralNetwork') if 'RPCEngine' in enabledFrontends subdir('RPCEngine') diff --git a/examples/neuralNetwork/kernels/ascend/0_Add_0_2_1_100_0_2_1_100_0_2_1_100.om b/examples/neuralNetwork/kernels/acl/0_Add_0_2_1_100_0_2_1_100_0_2_1_100.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/0_Add_0_2_1_100_0_2_1_100_0_2_1_100.om rename to examples/neuralNetwork/kernels/acl/0_Add_0_2_1_100_0_2_1_100_0_2_1_100.om diff --git a/examples/neuralNetwork/kernels/ascend/0_GEMM_0_2_1_784_0_2_512_784_0_2_1_512_0_2_1_0_2_1_0_2_1_512.om b/examples/neuralNetwork/kernels/acl/0_GEMM_0_2_1_784_0_2_512_784_0_2_1_512_0_2_1_0_2_1_0_2_1_512.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/0_GEMM_0_2_1_784_0_2_512_784_0_2_1_512_0_2_1_0_2_1_0_2_1_512.om rename to examples/neuralNetwork/kernels/acl/0_GEMM_0_2_1_784_0_2_512_784_0_2_1_512_0_2_1_0_2_1_0_2_1_512.om diff --git a/examples/neuralNetwork/kernels/ascend/0_Relu_0_2_1_512_0_2_1_512.om b/examples/neuralNetwork/kernels/acl/0_Relu_0_2_1_512_0_2_1_512.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/0_Relu_0_2_1_512_0_2_1_512.om rename to examples/neuralNetwork/kernels/acl/0_Relu_0_2_1_512_0_2_1_512.om diff --git a/examples/neuralNetwork/kernels/ascend/1_GEMM_0_2_1_512_0_2_200_512_0_2_1_200_0_2_1_0_2_1_0_2_1_200.om b/examples/neuralNetwork/kernels/acl/1_GEMM_0_2_1_512_0_2_200_512_0_2_1_200_0_2_1_0_2_1_0_2_1_200.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/1_GEMM_0_2_1_512_0_2_200_512_0_2_1_200_0_2_1_0_2_1_0_2_1_200.om rename to examples/neuralNetwork/kernels/acl/1_GEMM_0_2_1_512_0_2_200_512_0_2_1_200_0_2_1_0_2_1_0_2_1_200.om diff --git a/examples/neuralNetwork/kernels/ascend/1_Relu_0_2_1_200_0_2_1_200.om b/examples/neuralNetwork/kernels/acl/1_Relu_0_2_1_200_0_2_1_200.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/1_Relu_0_2_1_200_0_2_1_200.om rename to examples/neuralNetwork/kernels/acl/1_Relu_0_2_1_200_0_2_1_200.om diff --git a/examples/neuralNetwork/kernels/ascend/2_GEMM_0_2_1_200_0_2_100_200_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om b/examples/neuralNetwork/kernels/acl/2_GEMM_0_2_1_200_0_2_100_200_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/2_GEMM_0_2_1_200_0_2_100_200_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om rename to examples/neuralNetwork/kernels/acl/2_GEMM_0_2_1_200_0_2_100_200_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om diff --git a/examples/neuralNetwork/kernels/ascend/2_Relu_0_2_1_100_0_2_1_100.om b/examples/neuralNetwork/kernels/acl/2_Relu_0_2_1_100_0_2_1_100.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/2_Relu_0_2_1_100_0_2_1_100.om rename to examples/neuralNetwork/kernels/acl/2_Relu_0_2_1_100_0_2_1_100.om diff --git a/examples/neuralNetwork/kernels/ascend/3_GEMM_0_2_1_512_0_2_100_512_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om b/examples/neuralNetwork/kernels/acl/3_GEMM_0_2_1_512_0_2_100_512_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/3_GEMM_0_2_1_512_0_2_100_512_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om rename to examples/neuralNetwork/kernels/acl/3_GEMM_0_2_1_512_0_2_100_512_0_2_1_100_0_2_1_0_2_1_0_2_1_100.om diff --git a/examples/neuralNetwork/kernels/ascend/4_GEMM_0_2_1_100_0_2_10_100_0_2_1_10_0_2_1_0_2_1_0_2_1_10.om b/examples/neuralNetwork/kernels/acl/4_GEMM_0_2_1_100_0_2_10_100_0_2_1_10_0_2_1_0_2_1_0_2_1_10.om similarity index 100% rename from examples/neuralNetwork/kernels/ascend/4_GEMM_0_2_1_100_0_2_10_100_0_2_1_10_0_2_1_0_2_1_0_2_1_10.om rename to examples/neuralNetwork/kernels/acl/4_GEMM_0_2_1_100_0_2_10_100_0_2_1_10_0_2_1_0_2_1_0_2_1_10.om diff --git a/examples/neuralNetwork/kernels/compile-ascend.sh b/examples/neuralNetwork/kernels/compile-acl.sh similarity index 100% rename from examples/neuralNetwork/kernels/compile-ascend.sh rename to examples/neuralNetwork/kernels/compile-acl.sh diff --git a/examples/neuralNetwork/source/include/factory/executionUnit/ascend/executionUnitFactory.cpp b/examples/neuralNetwork/source/include/factory/executionUnit/acl/executionUnitFactory.cpp similarity index 100% rename from examples/neuralNetwork/source/include/factory/executionUnit/ascend/executionUnitFactory.cpp rename to examples/neuralNetwork/source/include/factory/executionUnit/acl/executionUnitFactory.cpp diff --git a/examples/neuralNetwork/source/include/factory/executionUnit/ascend/executionUnitFactory.hpp b/examples/neuralNetwork/source/include/factory/executionUnit/acl/executionUnitFactory.hpp similarity index 100% rename from examples/neuralNetwork/source/include/factory/executionUnit/ascend/executionUnitFactory.hpp rename to examples/neuralNetwork/source/include/factory/executionUnit/acl/executionUnitFactory.hpp diff --git a/examples/neuralNetwork/source/include/tensor/ascend/tensor.cpp b/examples/neuralNetwork/source/include/tensor/acl/tensor.cpp similarity index 100% rename from examples/neuralNetwork/source/include/tensor/ascend/tensor.cpp rename to examples/neuralNetwork/source/include/tensor/acl/tensor.cpp diff --git a/examples/neuralNetwork/source/include/tensor/ascend/tensor.hpp b/examples/neuralNetwork/source/include/tensor/acl/tensor.hpp similarity index 100% rename from examples/neuralNetwork/source/include/tensor/ascend/tensor.hpp rename to examples/neuralNetwork/source/include/tensor/acl/tensor.hpp