From 094c99dde219d82b888a6aa843b3e8d239e4b5ff Mon Sep 17 00:00:00 2001 From: Marya Date: Sun, 4 Feb 2024 23:22:14 +0000 Subject: [PATCH] update --- .../actions/build_vgg_resnet_action/action.yml | 8 ++++---- .github/workflows/create_publish_artifacts.yml | 16 ++-------------- .github/workflows/run_ock_demo.yml | 15 ++------------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/.github/actions/build_vgg_resnet_action/action.yml b/.github/actions/build_vgg_resnet_action/action.yml index 00916a970..045249f8d 100644 --- a/.github/actions/build_vgg_resnet_action/action.yml +++ b/.github/actions/build_vgg_resnet_action/action.yml @@ -42,13 +42,13 @@ runs: - name: Set up environment and build networks shell: bash run: | - export LD_LIBRARY_PATH=${{ inputs.workspace }}/install/lib:${{ inputs.workspace }}/linux_nightly_release/lib/libsycl.so:${{ inputs.workspace }}/linux_nightly_release/lib:$LD_LIBRARY_PATH + 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 CA_HAL_DEBUG=1 export CA_PROFILE_LEVEL=3 export ONEAPI_DEVICE_SELECTOR=opencl:acc - export OCL_ICD_FILENAMES=${{ inputs.workspace }}/install/lib/libCL.so + export OCL_ICD_FILENAMES=${{ inputs.workspace }}/ock_install_dir/lib/libCL.so # As the oneAPI basetoolkit release has a whitelist of devices, it filters out RefSi. # To override it, as a temporary solution we can point SYCL_CONFIG_FILE_NAME to ``. # This way it doesn't set the default sycl.conf. @@ -76,9 +76,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 }}/install/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc 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=${{ inputs.workspace }}/ock_install_dir/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc 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 }}/install/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc 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=${{ inputs.workspace }}/ock_install_dir/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc 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/create_publish_artifacts.yml b/.github/workflows/create_publish_artifacts.yml index 74f3b8a5e..880d46579 100644 --- a/.github/workflows/create_publish_artifacts.yml +++ b/.github/workflows/create_publish_artifacts.yml @@ -41,12 +41,12 @@ jobs: uses: ./.github/actions/do_build_ock/do_build_m1 with: build_type: Release - install_dir: install + install_dir: ock_install_dir extra_flags: '-DCA_REFSI_M1_DEMO_MODE=ON' - name: Create OCK install run: | - ninja -C $(pwd)/build install + ninja -C $(pwd)/build ock_install_dir - name: Download Daily Release run: | @@ -76,24 +76,12 @@ jobs: cmake -GNinja -Bbuild_ock_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 ninja -C build_ock_tests cd build_ock_tests - ls - # Run simple_vector_add - ./bin/simple-vector-add - env CA_RISCV_VLEN_BITS_MIN=128 CA_RISCV_VF=4 bin/simple-vector-add # Run tests ctest bin/ --verbose cd .. - - name: Setup environment and test Vector Add - run: | - export ONEAPI_ROOT=$(pwd)/linux_nightly_release - export PATH=$(pwd)/linux_nightly_release/bin:$PATH - export LD_LIBRARY_PATH=$(pwd)/linux_nightly_release/lib:$(pwd)/install/lib:$LD_LIBRARY_PATH - - CA_RISCV_DUMP_IR=1 CA_HAL_DEBUG=1 OCL_ICD_FILENAMES=$(pwd)/install/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc SYCL_CONFIG_FILE_NAME="" build_ock_tests/bin/simple-vector-add - - name: Package Artifacts run: | tar -czf ock_install.tar.gz install diff --git a/.github/workflows/run_ock_demo.yml b/.github/workflows/run_ock_demo.yml index 0ee4b974d..0047428bc 100644 --- a/.github/workflows/run_ock_demo.yml +++ b/.github/workflows/run_ock_demo.yml @@ -57,18 +57,6 @@ jobs: mkdir linux_nightly_release tar -xzf sycl_linux.tar.gz -C linux_nightly_release - - name: Clone oneAPI-samples - run: git clone https://github.com/oneapi-src/oneAPI-samples.git - - - name: Setup environment and test Vector Add - run: | - export ONEAPI_ROOT=$(pwd)/linux_nightly_release - export PATH=$(pwd)/linux_nightly_release/bin:$PATH - export LD_LIBRARY_PATH=$(pwd)/linux_nightly_release/lib:$(pwd)/install/lib:$LD_LIBRARY_PATH - - $(pwd)/linux_nightly_release/bin/clang++ -fsycl $(pwd)/oneAPI-samples/DirectProgramming/C++SYCL/DenseLinearAlgebra/vector-add/src/vector-add-buffers.cpp -o vect - CA_RISCV_DUMP_IR=1 CA_HAL_DEBUG=1 OCL_ICD_FILENAMES=$(pwd)/install/lib/libCL.so ONEAPI_DEVICE_SELECTOR=opencl:acc SYCL_CONFIG_FILE_NAME="" ./vect - - name: Test RSICV examples run: | # Set environment variables @@ -105,7 +93,8 @@ jobs: - name: Package Build Artifacts run: | - tar -cvzf ock_demo_artifacts.tar.gz install portDNN_build_dir portBLAS_build_dir build_riscv_tests vect examples/technical_blogs/ock_demo_blog/getting_started.md examples/technical_blogs/ock_demo_blog/envvars + mv install ock_install_dir + tar -cvzf ock_demo_artifacts.tar.gz ock_install_dir portDNN_build_dir portBLAS_build_dir build_riscv_tests examples/technical_blogs/ock_demo_blog/getting_started.md examples/technical_blogs/ock_demo_blog/envvars - name: Upload Artifacts uses: actions/upload-artifact@v4