Skip to content

Commit

Permalink
Merge branch 'main' into sean/unique-addr-mode-per-dim-adapters
Browse files Browse the repository at this point in the history
  • Loading branch information
Seanst98 committed Jan 15, 2024
2 parents 4749e99 + 79c28d0 commit 7b0a45a
Show file tree
Hide file tree
Showing 151 changed files with 3,260 additions and 6,025 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read

jobs:
linux:
name: Bandit
runs-on: ubuntu-latest

steps:
- name: Clone the git repo
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install pip packages
run: pip install -r third_party/requirements.txt
Expand Down
25 changes: 14 additions & 11 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read

jobs:
ubuntu-build:
name: Build - Ubuntu
Expand Down Expand Up @@ -36,7 +39,7 @@ jobs:
runs-on: ${{matrix.os}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install apt packages
run: |
Expand Down Expand Up @@ -110,7 +113,7 @@ jobs:

- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"

fuzztest-build:
name: Build and run quick fuzztest scenarios
Expand All @@ -122,7 +125,7 @@ jobs:
runs-on: 'ubuntu-22.04'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install pip packages
run: pip install -r third_party/requirements.txt
Expand Down Expand Up @@ -174,7 +177,7 @@ jobs:
runs-on: ${{matrix.adapter.name}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install pip packages
run: pip install -r third_party/requirements.txt
Expand Down Expand Up @@ -240,13 +243,13 @@ jobs:
runs-on: ${{matrix.adapter.name}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install pip packages
run: pip install -r third_party/requirements.txt

- name: Init conda env
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@9f54435e0e72c53962ee863144e47a4b094bfd35 # v2.3.0
with:
miniconda-version: "latest"
activate-environment: examples
Expand Down Expand Up @@ -306,9 +309,9 @@ jobs:
runs-on: ${{matrix.os}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- uses: actions/setup-python@v4
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.9

Expand Down Expand Up @@ -346,7 +349,7 @@ jobs:

- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"


macos-build:
Expand All @@ -357,9 +360,9 @@ jobs:
runs-on: ${{matrix.os}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- uses: actions/setup-python@v4
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.9

Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

permissions:
contents: read

jobs:
analyze-ubuntu:
name: Analyze on Ubuntu
Expand All @@ -18,10 +21,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
with:
languages: cpp, python

Expand All @@ -35,7 +38,7 @@ jobs:
run: cmake --build ${{github.workspace}}/build -j $(nproc)

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12

analyze-windows:
name: Analyze on Windows
Expand All @@ -48,10 +51,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
with:
languages: cpp, python

Expand All @@ -65,4 +68,4 @@ jobs:
run: cmake --build ${{github.workspace}}/build -j $(nproc) --config Release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
9 changes: 6 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Coverage

on: [push, pull_request]

permissions:
contents: read

jobs:
ubuntu-build:
name: Build - Ubuntu
Expand All @@ -16,7 +19,7 @@ jobs:
runs-on: ${{matrix.os}}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install apt packages
run: |
Expand Down Expand Up @@ -65,14 +68,14 @@ jobs:

- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "python|umf|loader|validation|tracing|unit|urtrace"
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "umf|loader|validation|tracing|unit|urtrace"

- name: Quick Coverage Info
working-directory: ${{github.workspace}}/build
run: ctest -T Coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
with:
gcov: true
gcov_include: source
28 changes: 23 additions & 5 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ name: coverity-unified-runtime
# It runs static analysis build - Coverity. It requires special token (set in CI's secret).

on:
push:
branches: ["main"]
workflow_dispatch:
schedule:
# Run every day at 22:00 UTC
- cron: '0 22 * * *'

env:
WORKDIR: ${{ github.workspace }}
Expand All @@ -22,20 +23,37 @@ env:
COVERITY_SCAN_BRANCH_PATTERN: "main"
TRAVIS_BRANCH: ${{ github.ref_name }}

permissions:
contents: read

jobs:
linux:
name: Coverity
runs-on: ubuntu-latest
runs-on: coverity

steps:
- name: Clone the git repo
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install pip packages
run: pip install -r third_party/requirements.txt

- name: Configure CMake
run: cmake -B $WORKDIR/build -DUR_ENABLE_TRACING=ON -DUR_DEVELOPER_MODE=ON -DUR_BUILD_TESTS=ON -DUMF_ENABLE_POOL_TRACKING=ON
run: >
cmake
-B $WORKDIR/build
-DUR_ENABLE_TRACING=ON
-DUR_DEVELOPER_MODE=ON
-DUR_BUILD_TESTS=ON
-DUMF_ENABLE_POOL_TRACKING=ON
-DUR_FORMAT_CPP_STYLE=ON
-DCMAKE_BUILD_TYPE=Debug
-DUR_BUILD_ADAPTER_L0=ON
-DUR_BUILD_ADAPTER_CUDA=ON
-DCUDA_CUDA_LIBRARY=/usr/local/cuda/lib64/stubs/libcuda.so
-DUR_BUILD_ADAPTER_NATIVE_CPU=ON
-DUR_BUILD_ADAPTER_HIP=ON
-DUR_BUILD_ADAPTER_OPENCL=ON
- name: Run Coverity
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- uses: actions/setup-python@v4
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
with:
python-version: 3.9

Expand All @@ -41,14 +41,14 @@ jobs:
run: python3 -m pip install -r third_party/requirements.txt

- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@c5a3e1159e0cbdf0845eb8811bd39e39fc3099c2 # v2.1.3

- name: Build Documentation
working-directory: ${{github.workspace}}/scripts
run: python3 run.py --core

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@84bb4cd4b733d5c320c9c9cfbc354937524f4d64 # v1.0.10
with:
path: ${{github.workspace}}/docs/html

Expand All @@ -62,4 +62,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@f27bcc15848fdcdcc02f01754eb838e44bcf389b # v1.2.9
28 changes: 19 additions & 9 deletions .github/workflows/e2e_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ on:
# Run every day at 23:00 UTC
- cron: '0 23 * * *'

permissions:
contents: read

jobs:
e2e-build-hw:
name: Build SYCL, UR, run E2E
strategy:
matrix:
adapter: [
{name: CUDA}
{name: CUDA, str_name: cuda, prefix: "ext_oneapi_", config: "--cuda --hip", unit: "gpu"},
{name: OPENCL, str_name: opencl, prefix: "", config: "", unit: "cpu"}
]
build_type: [Release]
compiler: [{c: clang, cxx: clang++}]
Expand All @@ -28,12 +32,12 @@ jobs:
rm -rf ./* || true
- name: Checkout UR
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
path: ur-repo

- name: Checkout SYCL
uses: actions/checkout@v4
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
repository: intel/llvm
ref: sycl
Expand All @@ -59,12 +63,18 @@ jobs:
run: LD_LIBRARY_PATH=${{github.workspace}}/dpcpp_compiler/lib
cmake --build ${{github.workspace}}/ur-repo/build -j $(nproc)

- name: Set env vars & pre setup
- name: Set prefer UR
run: echo "SYCL_PREFER_UR=1" >> $GITHUB_ENV

- name: Set CUDA env vars
if: matrix.adapter.name == 'CUDA'
run: |
echo "SYCL_PREFER_UR=1" >> $GITHUB_ENV
echo "CUDA_LIB_PATH=/usr/local/cuda/lib64/stubs" >> $GITHUB_ENV
echo "LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
source /opt/intel/oneapi/setvars.sh
- name: Run pre setup
run: |
source /opt/intel/oneapi/setvars.sh --force
sycl-ls
- name: Configure SYCL
Expand All @@ -73,7 +83,7 @@ jobs:
-t ${{matrix.build_type}}
-o ${{github.workspace}}/sycl_build
--cmake-gen "Unix Makefiles"
--ci-defaults --cuda --hip
--ci-defaults ${{matrix.adapter.config}}
--cmake-opt="-DLLVM_INSTALL_UTILS=ON"
--cmake-opt="-DSYCL_PI_TESTS=OFF"
--cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache
Expand All @@ -91,7 +101,7 @@ jobs:
- name: Swap UR loader and adapters
run: |
cp ${{github.workspace}}/ur-repo/build/lib/libur_loader.so* ${{github.workspace}}/sycl_build/lib/
cp ${{github.workspace}}/ur-repo/build/lib/libur_adapter_cuda.so* ${{github.workspace}}/sycl_build/lib/
cp ${{github.workspace}}/ur-repo/build/lib/libur_adapter_${{matrix.adapter.str_name}}.so* ${{github.workspace}}/sycl_build/lib/
- name: Set additional env. vars
run: |
Expand All @@ -110,7 +120,7 @@ jobs:
-GNinja
-B ${{github.workspace}}/build-e2e/
-S ${{github.workspace}}/sycl-repo/sycl/test-e2e/
-DSYCL_TEST_E2E_TARGETS="ext_oneapi_cuda:gpu"
-DSYCL_TEST_E2E_TARGETS="${{matrix.adapter.prefix}}${{matrix.adapter.str_name}}:${{matrix.adapter.unit}}"
-DCMAKE_CXX_COMPILER="$(which clang++)"
-DLLVM_LIT="${{github.workspace}}/sycl-repo/llvm/utils/lit/lit.py"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
# Run every day at 23:00 UTC
- cron: '0 23 * * *'

permissions:
contents: read

jobs:
long-fuzz-test:
name: Run long fuzz tests
Expand All @@ -16,7 +19,7 @@ jobs:
runs-on: 'ubuntu-22.04'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

- name: Install pip packages
run: pip install -r third_party/requirements.txt
Expand Down
Loading

0 comments on commit 7b0a45a

Please sign in to comment.