Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to use dockers built for OCK #638

Merged
merged 1 commit into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/do_build_ock/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ inputs:
default: OFF
gtest_launcher:
description: "Googletest suite launcher command (default launcher used for ubuntu)"
default: "/usr/bin/python;-u;${{ github.workspace }}/scripts/gtest-terse-runner.py"
default: "/usr/bin/python3;-u;${{ github.workspace }}/scripts/gtest-terse-runner.py"
build_32_bit:
description: "32-bit building"
default: OFF
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:
echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
# required due to using non docker to build llvm
# If we switch to always using docker we can drop.
sudo apt-get install --yes lib32ncurses-dev
sudo apt-get install --yes lib32ncurses-dev
if [ "${{ inputs.cross_arch }}" = "x86" ]; then sudo dpkg --add-architecture i386 ; fi
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
if [ "${{ inputs.ubuntu_version }}" = "20.04" ]; then sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.243-focal.list https://packages.lunarg.com/vulkan/1.3.243/lunarg-vulkan-1.3.243-focal.list; fi
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/planned_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ on:
type: boolean
default: false

permissions:
packages: read

jobs:

# Calculate some useful variables that can be used through the workflow
Expand Down Expand Up @@ -82,7 +85,7 @@ jobs:
# build llvm. Otherwise we choose ubuntu-22.04 (use a container for both for consistency).
runs-on: cp-ubuntu-24.04
container:
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/intel/llvm/ubuntu2404_base:latest' || 'ghcr.io/intel/llvm/ubuntu2204_base:latest' }}
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' }}
volumes:
- ${{github.workspace}}:${{github.workspace}}
if : inputs.ock && contains(inputs.target_list, 'linux')
Expand Down Expand Up @@ -159,7 +162,7 @@ jobs:
# TODO: host-x86_64-linux only - expand for other targets
runs-on: cp-ubuntu-24.04
container:
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/intel/llvm/ubuntu2404_base:latest' || 'ghcr.io/intel/llvm/ubuntu2204_base:latest' }}
image: ${{ contains(matrix.target, 'host_riscv') && 'ghcr.io/uxlfoundation/ock_ubuntu_24.04:latest' || 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest' }}
volumes:
- ${{github.workspace}}:${{github.workspace}}
steps:
Expand Down Expand Up @@ -194,7 +197,7 @@ jobs:
# TODO: Extend if we decide to enable for windows or build natively on another target
runs-on: cp-ubuntu-24.04
container:
image: ghcr.io/intel/llvm/ubuntu2204_base:latest
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
volumes:
- ${{github.workspace}}:${{github.workspace}}

Expand All @@ -218,7 +221,7 @@ jobs:
# TODO: Extend if we decide to enable for windows or build natively on another target
runs-on: cp-ubuntu-24.04
container:
image: ghcr.io/intel/llvm/ubuntu2204_base:latest
image: 'ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest'
volumes:
- ${{github.workspace}}:${{github.workspace}}

Expand Down
50 changes: 45 additions & 5 deletions .github/workflows/run_pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@ on:
required: false
type: bool
default: true
permissions: {}

permissions:
packages: read

jobs:

# build and run host x86_64, execute UnitCL and lit tests and build and run offline
run_host_x86_64:
runs-on: ubuntu-22.04

container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
steps:
- name: Checkout repo
uses: actions/[email protected]
Expand Down Expand Up @@ -75,7 +80,10 @@ jobs:
run_riscv_m1:

runs-on: ubuntu-22.04

container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
steps:
- name: Checkout repo
uses: actions/[email protected]
Expand Down Expand Up @@ -103,7 +111,12 @@ jobs:
run_clang_tidy_changes:

runs-on: ubuntu-22.04

# Disable until the awk line works on the container
if: false
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
steps:
- name: Checkout repo
uses: actions/[email protected]
Expand Down Expand Up @@ -232,6 +245,10 @@ jobs:
# Based on: mr-ubuntu-gcc-x86_64-riscv-fp16-cl3.0-unitcl_vecz
run_ubuntu_gcc_x86_64_riscv_fp16_cl3_0_unitcl_vecz:
runs-on: ubuntu-22.04
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 60
steps:
- name: Checkout repo
Expand Down Expand Up @@ -261,6 +278,10 @@ jobs:
# Based on: mr-ubuntu-clang-x86-llvm-previous-cl3-0-offline
run-ubuntu-clang-x86-llvm-latest-cl3-0-offline:
runs-on: ubuntu-22.04
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 90 # offline needs longer timeout
steps:
- name: Checkout repo
Expand Down Expand Up @@ -300,6 +321,10 @@ jobs:
# Based on: mr-ubuntu-gcc-x86_64-riscv-fp16-cl3-0
run-ubuntu-gcc-x86_64-riscv-fp16-cl3-0:
runs-on: ubuntu-22.04
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 60
steps:
- name: Checkout repo
Expand Down Expand Up @@ -331,6 +356,10 @@ jobs:
# Based on: mr-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release
run-ubuntu-gcc-x86-llvm-latest-x86_64-images-cl3-0-release:
runs-on: ubuntu-22.04
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 60
steps:
- name: Checkout repo
Expand All @@ -356,7 +385,7 @@ jobs:
run-ubuntu-gcc-aarch64-llvm-latest-cl3-0-fp16:
runs-on: cp-ubuntu-24.04
container:
image: ghcr.io/intel/llvm/ubuntu2204_base:latest
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 90 # aarch64 needs longer timeout
Expand Down Expand Up @@ -387,12 +416,19 @@ jobs:
# and: mr-ubuntu-gcc-x86_64-clik-refsi
run-ubuntu-gcc-x86_64-clik-refsi:
runs-on: ubuntu-22.04
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 60
steps:
- name: Checkout repo
uses: actions/[email protected]
- name: Install Ninja
uses: llvm/actions/install-ninja@main
- name: install risc-v toolchain
run:
sudo apt-get install --yes gcc-riscv64-linux-gnu g++-riscv64-linux-gnu
- run: echo WORKSPACE is $GITHUB_WORKSPACE && echo PWD is `pwd` && ls -al
- name: Run Clik
run: |
Expand All @@ -407,6 +443,10 @@ jobs:
run-ubuntu-gcc-x86_64-refsi-g1-wi-cl3-0:
if: ${{ !inputs.is_pull_request }} # do not run as PR job for now to avoid flooding the concurrency
runs-on: ubuntu-22.04
container:
image: ghcr.io/uxlfoundation/ock_ubuntu_22.04:latest
volumes:
- ${{github.workspace}}:${{github.workspace}}
timeout-minutes: 60
steps:
- name: Checkout repo
Expand Down