Merge pull request #358 from MaryaSharf/marya/add-sycl_nbody

Replacing the ock-demo workflow to use multiple jobs for its components instead of using the same workflow.
uxlfoundation · Feb 26, 2024 · 5ecbff0 · 5ecbff0
2 parents ad32db2 + 4293bfa
commit 5ecbff0
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 53 deletions.
diff --git a/.github/actions/build_portBLAS_action/action.yml b/.github/actions/build_portBLAS_action/action.yml
@@ -14,17 +14,39 @@ runs:
       shell: bash
       run: git clone --recursive https://github.com/codeplaysoftware/portBLAS
 
+       # installs tools, ninja, installs llvm and sets up sccahe
+    - name: setup ubuntu
+      uses:  ./.github/actions/setup_ubuntu_build
+
+    - name: Get Intel OneAPI BaseToolkit
+      shell: bash
+      run: |
+        wget "https://github.com/intel/llvm/releases/download/nightly-2024-02-08/sycl_linux.tar.gz"
+        mkdir linux_nightly_release
+        tar -xzf sycl_linux.tar.gz -C linux_nightly_release
+
     - name: Set up Environment and Build portBLAS
       shell: bash
       run: |
-        ls
-        export LD_LIBRARY_PATH=${{ inputs.workspace }}/linux_nightly_release/lib:$LD_LIBRARY_PATH
-        export CMAKE_CXX_COMPILER=${{ inputs.workspace }}/linux_nightly_release/bin/clang++
-        export CMAKE_C_COMPILER=${{ inputs.workspace }}/linux_nightly_release/bin/clang
+        export LD_LIBRARY_PATH=$(pwd)/linux_nightly_release/lib:$LD_LIBRARY_PATH
+        export CMAKE_CXX_COMPILER=$(pwd)/linux_nightly_release/bin/clang++
+        export CMAKE_C_COMPILER=$(pwd)/linux_nightly_release/bin/clang
         export OCL_ICD_FILENAMES=${{ inputs.workspace }}/install/lib/libCL.so
-        export CXX=${{ inputs.workspace }}/linux_nightly_release/bin/clang++
+        export CXX=$(pwd)/linux_nightly_release/bin/clang++
+
         # Note: With default options enabled, portBLAS supports complex math using
         # <ext/oneapi/experimental/sycl_complex.hpp>. It was removed in DPC++ in 0b5757bf.
         # To disable this -DBLAS_ENABLE_COMPLEX=OFF needs to added to cmake command line.
         cmake -B portBLAS_build_dir portBLAS -GNinja -DSYCL_COMPILER=dpcpp -DBLAS_ENABLE_COMPLEX=OFF
-        ninja -C $(pwd)/portBLAS_build_dir
+        ninja -C $(pwd)/portBLAS_build_dir
+
+    - name: Package artifacts
+      shell: bash
+      run: |
+        tar -cvzf portBLAS_build.tar.gz portBLAS_build_dir
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: portBLAS_build
+        path: portBLAS_build.tar.gz
diff --git a/.github/actions/build_portDNN_action/action.yml b/.github/actions/build_portDNN_action/action.yml
@@ -1,4 +1,4 @@
-name: build-portDNN
+name: build_portDNN
 description: Action to clone and build portDNN using oneAPI
 
 inputs:
@@ -14,14 +14,40 @@ runs:
       shell: bash
       run: git clone --recursive https://github.com/codeplaysoftware/portDNN.git
 
+    - name: Install prerequisites
+      shell: bash
+      run: |
+        sudo apt-get install -y spirv-tools
+
+    - name: Install Ninja
+      uses: llvm/actions/install-ninja@main
+
+    - name: Get Intel OneAPI Nightly Release
+      shell: bash
+      run: |
+        # Update the nightly release from intel/llvm from 2024-02-12 to daily once
+        # everything has stablised
+        wget "https://github.com/intel/llvm/releases/download/nightly-2024-02-12/sycl_linux.tar.gz"
+        mkdir linux_nightly_release
+        tar -xzf sycl_linux.tar.gz -C linux_nightly_release
+
     - name: Set up Environment and build portDNN
       shell: bash
       run: |
-        ls
-        export LD_LIBRARY_PATH=${{ inputs.workspace }}/linux_nightly_release/lib:$LD_LIBRARY_PATH
-        export CMAKE_CXX_COMPILER=${{ inputs.workspace }}/linux_nightly_release/bin/clang++
-        export CMAKE_C_COMPILER=${{ inputs.workspace }}/linux_nightly_release/bin/clang
-        export OCL_ICD_FILENAMES=${{ inputs.workspace }}/install/lib/libCL.so
-
-        cmake -B portDNN_build_dir portDNN -GNinja -DCMAKE_CXX_COMPILER=$(pwd)/linux_nightly_release/bin/clang++ -DSNN_BUILD_BENCHMARKS=OFF -DSNN_BENCH_SYCLBLAS=OFF -DSNN_BUILD_DOCUMENTATION=OFF
-        ninja -C portDNN_build_dir
+        export LD_LIBRARY_PATH=$(pwd)/linux_nightly_release/lib:$LD_LIBRARY_PATH
+        export CMAKE_CXX_COMPILER=$(pwd)/linux_nightly_release/bin/clang++
+        export CMAKE_C_COMPILER=$(pwd)/linux_nightly_release/bin/clang
+        export OCL_ICD_FILENAMES=${{ inputs.workspace }}/ock_install_dir/lib/libCL.so
+        cmake -B portDNN_build_dir portDNN -GNinja -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DSNN_BUILD_BENCHMARKS=OFF -DSNN_BENCH_SYCLBLAS=OFF -DSNN_BUILD_DOCUMENTATION=OFF -DSNN_BUILD_TESTS=OFF
+        ninja -C portDNN_build_dir
+
+    - name: Package artifacts
+      shell: bash
+      run: |
+        tar -cvzf portDNN_build.tar.gz portDNN_build_dir
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: portDNN_build
+        path: portDNN_build.tar.gz
diff --git a/.github/actions/build_vgg_resnet_action/action.yml b/.github/actions/build_vgg_resnet_action/action.yml
@@ -27,7 +27,7 @@ runs:
       shell: bash
       run: git clone --recursive --depth 1 --single-branch https://github.com/codeplaysoftware/portDNN.git
 
-    - name: Download Daily Release
+    - name: Get Intel OneAPI Nightly Release
       shell: bash
       run: |
         wget "https://github.com/intel/llvm/releases/download/nightly-2024-02-08/sycl_linux.tar.gz"
@@ -42,9 +42,9 @@ runs:
     - name: Set up environment and build networks
       shell: bash
       run: |
-        export LD_LIBRARY_PATH=${{ inputs.workspace }}/ock_install_dir/lib:${{ inputs.workspace }}/linux_nightly_release/lib/libsycl.so:${{ inputs.workspace }}/linux_nightly_release/lib:$LD_LIBRARY_PATH
-        export CMAKE_CXX_COMPILER=${{ inputs.workspace }}/linux_nightly_release/bin/clang++
-        export CMAKE_C_COMPILER=${{ inputs.workspace }}/linux_nightly_release/bin/clang
+        export LD_LIBRARY_PATH=${{ inputs.workspace }}/ock_install_dir/lib:$(pwd)/linux_nightly_release/lib/libsycl.so:$(pwd)/linux_nightly_release/lib:$LD_LIBRARY_PATH
+        export CMAKE_CXX_COMPILER=$(pwd)/linux_nightly_release/bin/clang++
+        export CMAKE_C_COMPILER=$(pwd)/linux_nightly_release/bin/clang
         export CA_HAL_DEBUG=1
         export CA_PROFILE_LEVEL=3
         export ONEAPI_DEVICE_SELECTOR=opencl:fpga
@@ -55,6 +55,8 @@ runs:
         export SYCL_CONFIG_FILE_NAME=""
         export portDNN_source=$(pwd)/portDNN
         export OCL_ICD_VENDORS=/dev/null
+        export CXX=icpx
+        export CC=icpx
 
         # VGG16
         mkdir vdata
@@ -76,9 +78,9 @@ runs:
         python $portDNN_source/samples/networks/img2bin.py $(pwd)/Labrador_Retriever_Molly.jpg
 
         # Testing on image for VGG16
-        CA_HAL_DEBUG=1 CA_PROFILE_LEVEL=3 OCL_ICD_FILENAMES=${{ inputs.workspace }}/ock_install_dir/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:fpga SYCL_CONFIG_FILE_NAME=  ${{ inputs.workspace }}/portDNN_build_dir/samples/networks/vgg/vgg vdata/ $(pwd)/Labrador_Retriever_Molly.jpg.bin
+        CA_HAL_DEBUG=1 CA_PROFILE_LEVEL=3 OCL_ICD_FILENAMES=${OCL_ICD_FILENAMES} ONEAPI_DEVICE_SELECTOR=opencl:fpga SYCL_CONFIG_FILE_NAME=  ${{ inputs.workspace }}/portDNN_build_dir/samples/networks/vgg/vgg vdata/ $(pwd)/Labrador_Retriever_Molly.jpg.bin
         # Testing on image for Resnet50
-        CA_HAL_DEBUG=1 CA_PROFILE_LEVEL=3 OCL_ICD_FILENAMES=${{ inputs.workspace }}/ock_install_dir/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:fpga SYCL_CONFIG_FILE_NAME=  ${{ inputs.workspace }}/portDNN_build_dir/samples/networks/resnet50/resnet50 rdata/ $(pwd)/Labrador_Retriever_Molly.jpg.bin
+        CA_HAL_DEBUG=1 CA_PROFILE_LEVEL=3 OCL_ICD_FILENAMES=${OCL_ICD_FILENAMES} ONEAPI_DEVICE_SELECTOR=opencl:fpga SYCL_CONFIG_FILE_NAME=  ${{ inputs.workspace }}/portDNN_build_dir/samples/networks/resnet50/resnet50 rdata/ $(pwd)/Labrador_Retriever_Molly.jpg.bin
 
     - name: Package artifacts
       shell: bash

diff --git a/.github/workflows/run_ock_demo.yml b/.github/workflows/run_ock_demo.yml
@@ -50,20 +50,19 @@ jobs:
         run: |
           ninja -C $(pwd)/build install
 
-      - name: Download Daily Release
+      - name: Get Intel OneAPI BaseToolkit
         run: |
-          # Update the nightly release from intel/llvm from 2024-01-30 to daily once
-          # everything has stablised
-          wget "https://github.com/intel/llvm/releases/download/nightly-2024-02-12/sycl_linux.tar.gz"
-          mkdir linux_nightly_release
-          tar -xzf sycl_linux.tar.gz -C linux_nightly_release
+          wget https://registrationcenter-download.intel.com/akdlm/IRC_NAS/bb99984f-370f-413d-bbec-38928d2458f2/l_dpcpp-cpp-compiler_p_2024.0.2.29.sh
+          export TERMINFO=/usr/lib/terminfo
+          sh $(pwd)/l_dpcpp-cpp-compiler_p_2024.0.2.29.sh -a --silent --eula accept
+          mv /home/runner/intel $(pwd)
 
       - name: Test RSICV examples
         run: |
           # Set environment variables
-          export LD_LIBRARY_PATH=$(pwd)/install/lib:$(pwd)/linux_nightly_release/lib/libsycl.so:$(pwd)/linux_nightly_release/lib:$LD_LIBRARY_PATH
-          export CMAKE_CXX_COMPILER=$(pwd)/linux_nightly_release/bin/clang++
-          export CMAKE_C_COMPILER=$(pwd)/linux_nightly_release/bin/clang
+          export LD_LIBRARY_PATH=$(pwd)/install/lib:$(pwd)/intel/oneapi/compiler/2024.0/lib/libsycl.so:$(pwd)/intel/oneapi/compiler/2024.0/lib:$LD_LIBRARY_PATH
+          export CMAKE_CXX_COMPILER=$(pwd)/intel/oneapi/compiler/2024.0/bin/compiler/clang++
+          export CMAKE_C_COMPILER=$(pwd)/intel/oneapi/compiler/2024.0/bin/compiler/clang
           export CA_HAL_DEBUG=1
           export CA_PROFILE_LEVEL=3
           export ONEAPI_DEVICE_SELECTOR=opencl:fpga
@@ -74,7 +73,7 @@ jobs:
           export SYCL_CONFIG_FILE_NAME=""
 
           mkdir ock_example_tests
-          cmake -GNinja -Bock_example_tests -DCMAKE_CXX_COMPILER=$(pwd)/linux_nightly_release/bin/clang++ -DCMAKE_C_COMPILER=$(pwd)/linux_nightly_release/bin/clang -DOpenCL_LIBRARY=$(pwd)/install/lib/libCL.so -DOpenCL_INCLUDE_DIR=$(pwd)/linux_nightly_release/include/sycl $(pwd)/examples/applications
+          cmake -GNinja -Bock_example_tests -DCMAKE_CXX_COMPILER=$(pwd)/intel/oneapi/compiler/2024.0/bin/compiler/clang++ -DCMAKE_C_COMPILER=$(pwd)/intel/oneapi/compiler/2024.0/bin/compiler/clang -DOpenCL_LIBRARY=$(pwd)/install/lib/libCL.so -DOpenCL_INCLUDE_DIR=$(pwd)/intel/oneapi/compiler/2024.0/include/sycl $(pwd)/examples/applications
           ninja -C ock_example_tests
 
           # Run tests
@@ -83,35 +82,39 @@ jobs:
           cd ..
           mv ock_example_tests/bin install/tests
 
-      - name: Build portBLAS
-        uses: ./.github/actions/build_portBLAS_action
-        with:
-          workspace: ${{ github.workspace }}
-
-      - name: Build portDNN
-        uses: ./.github/actions/build_portDNN_action
-        with:
-          workspace: ${{ github.workspace }}
-
       - name: Package build artifacts
         run: |
           mv install ock_install_dir
           tar -cvzf ock_demo_artifacts.tar.gz ock_install_dir
-          tar -cvzf ock_demo_components.tar.gz portDNN_build_dir portBLAS_build_dir -C examples/technical_blogs/ock_demo_blog getting_started.md envvars
 
       - name: Upload OCK artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ock_demo_build
           path: ock_demo_artifacts.tar.gz
 
-      - name: Upload OCK demo components artifacts
-        uses: actions/upload-artifact@v4
+  build_portBLAS:
+    runs-on: ubuntu-22.04
+    needs: run_riscv_m1_ock_demo
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Download OCK artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: ock_demo_components
-          path: ock_demo_components.tar.gz
+          name: ock_demo_build
 
-  build_and_run_networks:
+      - name: Untar artifacts
+        run: |
+          tar -xvzf ock_demo_artifacts.tar.gz
+
+      - name: Build portBLAS
+        uses: ./.github/actions/build_portBLAS_action
+        with:
+          workspace: ${{ github.workspace }}
+
+  build_portDNN:
     runs-on: ubuntu-22.04
     needs: run_riscv_m1_ock_demo
     steps:
@@ -123,15 +126,38 @@ jobs:
         with:
           name: ock_demo_build
 
-      - name: Download OCK components artifacts
+      - name: Untar artifacts
+        run: |
+          tar -xvzf ock_demo_artifacts.tar.gz
+          rm ock_demo_artifacts.tar.gz
+          df .
+
+      - name: Build portDNN
+        uses: ./.github/actions/build_portDNN_action
+        with:
+          workspace: ${{ github.workspace }}
+
+  build_and_run_networks:
+    runs-on: ubuntu-22.04
+    needs: [run_riscv_m1_ock_demo, build_portDNN]
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Download OCK artifacts
         uses: actions/download-artifact@v4
         with:
-          name: ock_demo_components
+          name: ock_demo_build
+
+      - name: Download portDNN build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: portDNN_build
 
       - name: Untar artifacts
         run: |
           tar -xvzf ock_demo_artifacts.tar.gz
-          tar -xvzf ock_demo_components.tar.gz
+          tar -xvzf portDNN_build.tar.gz
 
       - name: Build vgg and resnet
         uses: ./.github/actions/build_vgg_resnet_action
@@ -140,7 +166,7 @@ jobs:
 
   publish_OCK_demo_artifacts:
     runs-on: ubuntu-22.04
-    needs: [run_riscv_m1_ock_demo, build_and_run_networks]
+    needs: [run_riscv_m1_ock_demo, build_portBLAS, build_portDNN, build_and_run_networks]
     env:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:
@@ -149,10 +175,15 @@ jobs:
         with:
           name: ock_demo_build
 
-      - name: Download OCK components artifacts
+      - name: Download portDNN build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: portDNN_build
+
+      - name: Download portBLAS build artifacts
         uses: actions/download-artifact@v4
         with:
-          name: ock_demo_components
+          name: portBLAS_build
 
       - name: Download network artifacts
         uses: actions/download-artifact@v4
@@ -169,6 +200,10 @@ jobs:
             echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
           fi
 
+      - name: Concatenate the tars to create OCK components
+        run: |
+          tar --concatenate --file=ock_demo_components.tar.gz portDNN_build.tar.gz portBLAS_build.tar.gz
+
       - name: Create OCK demo release
         uses: softprops/action-gh-release@v1
         env: