Merge branch 'master' of github.com:Algebraic-Programming/HiCR

Author: SergioMartin86

…ls/containers/buildenv-ascend/Dockerfile …tools/containers/buildenv-acl/Dockerfile.build-tools/containers/buildenv-ascend/Dockerfile renamed to .build-tools/containers/buildenv-acl/Dockerfile .build-tools/containers/buildenv-ascend/Dockerfile renamed to .build-tools/containers/buildenv-acl/Dockerfile

@@ -37,9 +37,9 @@ RUN cd $HOME/cann-toolkit \
   && sudo rm -rf /usr/local/Ascend/ascend-toolkit/${CANN_VERSION}/opp/built-in/data \
   && rm -rf cann-toolkit
 
+
 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

…-tools/containers/buildenv-ascend/run.sh …ild-tools/containers/buildenv-acl/run.sh.build-tools/containers/buildenv-ascend/run.sh renamed to .build-tools/containers/buildenv-acl/run.sh .build-tools/containers/buildenv-ascend/run.sh renamed to .build-tools/containers/buildenv-acl/run.sh

@@ -8,4 +8,4 @@ fi
 folder=${1}
 arch=${2}
 
-docker run --device=/dev/davinci0 --device=/dev/davinci1 --device=/dev/davinci2 --device=/dev/davinci3 --device=/dev/davinci4 --device=/dev/davinci5 --device=/dev/davinci6 --device=/dev/davinci7 --device=/dev/davinci_manager --device=/dev/hisi_hdc --device=/dev/devmm_svm -v /usr/local/dcmi:/usr/local/dcmi -v /usr/local/Ascend/driver:/usr/local/Ascend/driver -v /usr/local/Ascend/firmware:/usr/local/Ascend/firmware -v /usr/local/Ascend/toolbox:/usr/local/Ascend/toolbox -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi --name hicr-ascend -t -d registry.gitlab.huaweirc.ch/zrc-von-neumann-lab/runtime-system-innovations/hicr/${folder}-${arch}:latest bash
+docker run --device=/dev/davinci0 --device=/dev/davinci1 --device=/dev/davinci2 --device=/dev/davinci3 --device=/dev/davinci4 --device=/dev/davinci5 --device=/dev/davinci6 --device=/dev/davinci7 --device=/dev/davinci_manager --device=/dev/hisi_hdc --device=/dev/devmm_svm -v /usr/local/dcmi:/usr/local/dcmi -v /usr/local/Ascend/driver:/usr/local/Ascend/driver -v /usr/local/Ascend/firmware:/usr/local/Ascend/firmware -v /usr/local/Ascend/toolbox:/usr/local/Ascend/toolbox -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi --name hicr-acl -t -d registry.gitlab.huaweirc.ch/zrc-von-neumann-lab/runtime-system-innovations/hicr/${folder}-${arch}:latest bash

.build-tools/containers/buildenv/Dockerfile

@@ -100,7 +100,6 @@ RUN git clone -b noc_extension --single-branch --depth 1 https://github.com/Alge
   && sudo make install || true \
   && sudo rm -rf $HOME/lpf
 
-
 RUN git clone -b 1.11.0 --single-branch --depth 1 https://github.com/bsc-pm/ovni.git $HOME/ovni \
   && cd $HOME/ovni  \
   && mkdir build  \
@@ -184,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

.build-tools/linter/check-linter.sh

@@ -8,7 +8,7 @@ fi
 task="${1}";
 rootDir=`realpath "${2}"`
 fileDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-fileList=`find ${rootDir} -name "*.hpp" -not -path "${rootDir}/extern/*" -not -path "${rootDir}/tests/*" -not -path "${rootDir}/examples/*" -not -path "*/channelsImpl.hpp" -not -path "*/ascend/*" -not -path "*/exceptions.hpp"`
+fileList=`find ${rootDir} -name "*.hpp" -not -path "${rootDir}/extern/*" -not -path "${rootDir}/tests/*" -not -path "${rootDir}/examples/*" -not -path "*/channelsImpl.hpp" -not -path "*/acl/*" -not -path "*/exceptions.hpp"`
 
 fixFlag=""
 if [[ ${task} == "fix" ]]; then fixFlag="--fix-errors --fix-notes"; fi

…rkflows/master-build-ascend-workflow.yml …/workflows/master-build-acl-workflow.yml.github/workflows/master-build-ascend-workflow.yml renamed to .github/workflows/master-build-acl-workflow.yml .github/workflows/master-build-ascend-workflow.yml renamed to .github/workflows/master-build-acl-workflow.yml

@@ -1,4 +1,4 @@
-name: Merge into master - Build Ascend Workflow
+name: Merge into master - Build acl Workflow
 
 # if statements modified to avoid: https://stackoverflow.com/questions/69354003/github-action-job-fire-when-previous-job-skipped
 
@@ -17,7 +17,7 @@ permissions:
 
 env:
   REGISTRY: ghcr.io
-  DOCKERIMAGE: ghcr.io/algebraic-programming/hicr/buildenv-ascend
+  DOCKERIMAGE: ghcr.io/algebraic-programming/hicr/buildenv-acl
 
 defaults:
   run:
@@ -45,7 +45,7 @@ jobs:
           MODIFIED_FILES_PATH: ${{ runner.temp }}/diff.txt
         run: |
           cat $MODIFIED_FILES_PATH
-          if cat $MODIFIED_FILES_PATH | grep -q 'buildenv-ascend/Dockerfile' ; then
+          if cat $MODIFIED_FILES_PATH | grep -q 'buildenv-acl/Dockerfile' ; then
             echo "Dockerfile was modified"
             echo "dockerfile-modified=true" >> $GITHUB_OUTPUT
           else
@@ -90,7 +90,7 @@ jobs:
       - name: Build and push docker image
         uses: docker/build-push-action@v6
         with:
-          context: "{{defaultContext}}:.build-tools/containers/buildenv-ascend"
+          context: "{{defaultContext}}:.build-tools/containers/buildenv-acl"
           push: true
           tags: ${{ steps.dockermeta.outputs.tags }}
           labels: ${{ steps.dockermeta.outputs.labels }}

.github/workflows/master-test-workflow.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup
-        run: source /home/hicr/.bashrc && meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
+        run: source /home/hicr/.bashrc && meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl,acl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
 
       - name: Compile
         run: source /home/hicr/.bashrc && meson compile -C build

.github/workflows/master.yml

@@ -28,8 +28,8 @@ jobs:
     needs: [ build-docker-amd64, build-docker-arm64 ]
     if: |
       always() &&
-      (contains(needs.build-docker-amd64.result, 'success') || contains(needs.build-docker-amd64.result, 'skipped')) &&
-      (contains(needs.build-docker-arm64.result, 'success') || contains(needs.build-docker-arm64.result, 'skipped')) 
+      contains(needs.build-docker-amd64.result, 'success')  &&
+      contains(needs.build-docker-arm64.result, 'success')
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -65,33 +65,33 @@ jobs:
       os: ubuntu-24.04
       arch: amd64
 
-  build-ascend-docker-arm64:
+  build-acl-docker-arm64:
     needs: [ push-buildenv-manifest ]
     if: |
       always() &&
       (contains(needs.push-buildenv-manifest.result, 'success') || contains(needs.push-buildenv-manifest.result, 'skipped'))
-    uses: Algebraic-Programming/HiCR/.github/workflows/master-build-ascend-workflow.yml@master
+    uses: Algebraic-Programming/HiCR/.github/workflows/master-build-acl-workflow.yml@master
     with:
       os: ubuntu-24.04-arm
       arch: arm64
 
-  build-ascend-docker-amd64:
+  build-acl-docker-amd64:
     needs: [ push-buildenv-manifest ]
     if: |
       always() &&
       (contains(needs.push-buildenv-manifest.result, 'success') || contains(needs.push-buildenv-manifest.result, 'skipped'))
-    uses: Algebraic-Programming/HiCR/.github/workflows/master-build-ascend-workflow.yml@master
+    uses: Algebraic-Programming/HiCR/.github/workflows/master-build-acl-workflow.yml@master
     with:
       os: ubuntu-24.04
       arch: amd64
 
-  push-buildenv-ascend-manifest:
+  push-buildenv-acl-manifest:
     runs-on: ubuntu-latest
-    needs: [ build-ascend-docker-amd64, build-ascend-docker-arm64 ]
+    needs: [ build-acl-docker-amd64, build-acl-docker-arm64 ]
     if: |
       always() &&
-      (contains(needs.build-ascend-docker-amd64.result, 'success') || contains(needs.build-ascend-docker-amd64.result, 'skipped')) &&
-      (contains(needs.build-ascend-docker-arm64.result, 'success') || contains(needs.build-ascend-docker-arm64.result, 'skipped')) 
+      contains(needs.build-acl-docker-amd64.result, 'success') &&
+      contains(needs.build-acl-docker-arm64.result, 'success') 
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -105,5 +105,5 @@ jobs:
 
       - name: Create and push manifest images
         run:
-          docker buildx imagetools create --tag ${{ env.DOCKERIMAGE }}-ascend:latest ${{ env.DOCKERIMAGE }}-ascend:amd64-latest ${{ env.DOCKERIMAGE }}-ascend:arm64-latest
+          docker buildx imagetools create --tag ${{ env.DOCKERIMAGE }}-acl:latest ${{ env.DOCKERIMAGE }}-acl:amd64-latest ${{ env.DOCKERIMAGE }}-acl:arm64-latest
 

.github/workflows/pr-development-workflow.yml

@@ -229,7 +229,7 @@ jobs:
           docker run --name hicr --shm-size=1024M --privileged -v $PWD:/home/hicr/hicr -w /home/hicr/hicr -td ${{ env.DOCKERIMAGE }}:${{ inputs.arch }}-latest bash
 
       - name: Setup
-        run: docker exec -u hicr hicr bash -c "meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
+        run: docker exec -u hicr hicr bash -c "meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl,acl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true"
 
       - name: Compile
         run: docker exec -u hicr hicr bash -c "meson compile -C build"
@@ -269,7 +269,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup
-        run: source /home/hicr/.bashrc && meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
+        run: source /home/hicr/.bashrc && meson setup build -Dbackends=hwloc,pthreads,mpi,lpf,nosv,boost,opencl,acl -Dfrontends=channel,RPCEngine,tasking,objectStore -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
 
       - name: Compile
         run: source /home/hicr/.bashrc && meson compile -C build

.gitignore

@@ -10,4 +10,5 @@ atlas_*
 **/*.bin
 **/*ubyte*
 **/.venv
-.cache
+.cache
+examples/neuralNetwork/proto/onnx.proto3.pb.*

.gitlab-ci.yml

@@ -32,17 +32,17 @@ build:
   only:
   - master
 
-build-ascend:
-  image: ghcr.io/algebraic-programming/hicr/buildenv-ascend:latest
+build-acl:
+  image: ghcr.io/algebraic-programming/hicr/buildenv-acl:latest
   tags:
   - docker
-  - ascend
+  - acl
   script:
   - source /home/hicr/.hicr-env.sh
   - echo "$PATH"
   - echo "Building..."
   - mkdir build
-  - meson setup build -Dbackends=hwloc,pthreads,ascend,boost -Dfrontends= -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
+  - meson setup build -Dbackends=hwloc,pthreads,acl,boost -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
   - meson compile -C build
   - echo "Running tests..."
   - meson test -C build