Skip to content

Commit

Permalink
Remove all development scaffolding; add download_dpcpp_artefact revie…
Browse files Browse the repository at this point in the history
…w update
  • Loading branch information
alan-forbes-cp committed Dec 12, 2024
1 parent 2bcf868 commit d86e0f2
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 36 deletions.
24 changes: 12 additions & 12 deletions .github/actions/do_build_dpcpp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ description: build dpc++
inputs:
target:
description: 'target architecture'
build:
description: 'build not download'
type: boolean
default: true
download_dpcpp_artefact:
description: 'none | dpcpp_release' # TODO: add support for 'previous workflow' download
type: string
default: "none"

runs:
using: "composite"
Expand All @@ -27,14 +27,14 @@ runs:
sudo apt-get install spirv-tools

- name: clone dpc++
if: inputs.build == 'true'
if: inputs.download_dpcpp_artefact == 'none'
uses: actions/checkout@v4
with:
repository: intel/llvm
path: llvm

- name: dpcpp configure
if: inputs.build == 'true'
if: inputs.download_dpcpp_artefact == 'none'
shell: bash
run:
cd llvm; python buildbot/configure.py
Expand All @@ -47,19 +47,19 @@ runs:
--cmake-opt=-DLLVM_ENABLE_ZSTD=OFF

- name: build sycl-headers
if: inputs.build == 'true'
if: inputs.download_dpcpp_artefact == 'none'
shell: bash
run:
cmake --build llvm/build -- sycl-headers

- name: build dpc plus plus
if: inputs.build == 'true'
if: inputs.download_dpcpp_artefact == 'none'
shell: bash
run:
python llvm/buildbot/compile.py -o llvm/build -v -j 8

- name: build extra utilties
if: inputs.build == 'true'
if: inputs.download_dpcpp_artefact == 'none'
# Build various utilities, since those aren't proper dependencies.
# FileCheck and not are needed for tests. The rest are needed for
# cross builds. They are enabled on all targets for consistency.
Expand All @@ -70,7 +70,7 @@ runs:
opt prepare_builtins -j8

- name: copy utilities
if: inputs.build == 'true'
if: inputs.download_dpcpp_artefact == 'none'
shell: bash
run:
cd llvm/build/bin;
Expand All @@ -80,7 +80,7 @@ runs:
# TODO: For now just linux x86_64
# Review for location of components (paths) and any archive package/unpackage reqs.
#- name: install config files to pick up libraries for cross compilation.
# if: inputs.build == 'true'
# if: inputs.download_dpcpp_artefact == 'none'
# shell: bash
# run: |
# echo Installing configuration files
Expand All @@ -95,7 +95,7 @@ runs:
# done

- name: download dpc plus plus
if: inputs.build == 'false'
if: inputs.download_dpcpp_artefact == 'dpcpp_release'
shell: bash
run: |
mkdir -p llvm/build/install
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ on:
push:
branches:
- main
# pull_request:
# branches:
# - main
# paths:
# - 'source/**'
# - 'clik/**'
# - 'modules/**'
# - 'examples/**'
# - 'cmake/**'
# - 'hal/**'
# - '.github/actions/do_build_ock/**'
# - '.github/actions/setup_build/**'
# - '.github/workflows/codeql.yml'
# - 'CMakeLists.txt'
pull_request:
branches:
- main
paths:
- 'source/**'
- 'clik/**'
- 'modules/**'
- 'examples/**'
- 'cmake/**'
- 'hal/**'
- '.github/actions/do_build_ock/**'
- '.github/actions/setup_build/**'
- '.github/workflows/codeql.yml'
- 'CMakeLists.txt'
schedule:
- cron: '19 9 * * 3'

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/planned_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@ jobs:
uses: ./.github/actions/do_build_dpcpp
with:
target: ${{ matrix.target }}
# TODO: Finalise archive/download/build functionailtY
#build: false
build: true

build_sycl_cts:
needs: [workflow_vars, build_icd, build_dpcpp_native_host]
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/planned_testing_caller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ jobs:
if: github.repository == 'uxlfoundation/oneapi-construction-kit' || github.event_name != 'schedule'
uses: ./.github/workflows/planned_testing.yml
with:
# TODO: restore
# target_list: '["host_x86_64_linux", "host_aarch64_linux", "host_riscv64_linux", "host_i686_linux", "host_refsi_linux", "host_x86_64_windows" ]'
target_list: '["host_x86_64_linux", "host_aarch64_linux", "host_riscv64_linux", "host_i686_linux", "host_refsi_linux", "host_x86_64_windows" ]'
target_list: '["host_x86_64_linux"]'
ock: true
test_tornado: false
test_tornado: true
test_sycl_cts: true
test_opencl_cts: false
test_opencl_cts: true
# Have a pull request setting which can be used to test the flow as best as possible
# in a reasonable time
pull_request: ${{ github.event_name == 'pull_request' }}
4 changes: 1 addition & 3 deletions .github/workflows/run_pr_tests_caller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ concurrency:
jobs:
run-with-pull:
name: Call PR testing on pull request
if: false
# TODO restore
# ${{ github.event_name == 'pull_request' }}
if: ${{ github.event_name == 'pull_request' }}
uses: ./.github/workflows/run_pr_tests.yml
with:
update_cache: false
Expand Down

0 comments on commit d86e0f2

Please sign in to comment.