Skip to content

Commit ffe9a51

Browse files
author
Fábio
authored
Merge branch 'main' into fabio/fix_cuda_intermittent
2 parents 428e1d2 + cdde496 commit ffe9a51

File tree

152 files changed

+10704
-1246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+10704
-1246
lines changed

‎.github/docker/ubuntu-22.04.Dockerfile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2023 Intel Corporation
1+
# Copyright (C) 2023-2024 Intel Corporation
22
# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
33
# See LICENSE.TXT
44
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -51,20 +51,23 @@ RUN apt-get update \
5151
${BASE_DEPS} \
5252
${UR_DEPS} \
5353
${MISC_DEPS} \
54+
&& rm -rf /var/lib/apt/lists/* \
5455
&& apt-get clean all
5556

56-
RUN pip3 install ${UR_PYTHON_DEPS}
57+
# pip package is pinned to a version, but it's probably improperly parsed here
58+
# hadolint ignore=DL3013
59+
RUN pip3 install --no-cache-dir ${UR_PYTHON_DEPS}
5760

5861
# Install DPC++
59-
COPY install_dpcpp.sh install_dpcpp.sh
62+
COPY install_dpcpp.sh /opt/install_dpcpp.sh
6063
ENV DPCPP_PATH=/opt/dpcpp
61-
RUN ./install_dpcpp.sh
64+
RUN /opt/install_dpcpp.sh
6265

6366
# Install libbacktrace
64-
COPY install_libbacktrace.sh install_libbacktrace.sh
65-
RUN ./install_libbacktrace.sh
67+
COPY install_libbacktrace.sh /opt/install_libbacktrace.sh
68+
RUN /opt/install_libbacktrace.sh
6669

6770
# Add a new (non-root) 'user'
6871
ENV USER user
6972
ENV USERPASS pass
70-
RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
73+
RUN useradd -m "${USER}" -g sudo -p "$(mkpasswd ${USERPASS})"

‎.github/workflows/bandit.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ concurrency:
77
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
88
cancel-in-progress: true
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
linux:
1215
name: Bandit
1316
runs-on: ubuntu-latest
1417

1518
steps:
1619
- name: Clone the git repo
17-
uses: actions/checkout@v3
20+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
1821

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

‎.github/workflows/cmake.yml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ concurrency:
66
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
77
cancel-in-progress: true
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
ubuntu-build:
1114
name: Build - Ubuntu
@@ -36,7 +39,7 @@ jobs:
3639
runs-on: ${{matrix.os}}
3740

3841
steps:
39-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
4043

4144
- name: Install apt packages
4245
run: |
@@ -122,7 +125,7 @@ jobs:
122125
runs-on: 'ubuntu-22.04'
123126

124127
steps:
125-
- uses: actions/checkout@v3
128+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
126129

127130
- name: Install pip packages
128131
run: pip install -r third_party/requirements.txt
@@ -163,18 +166,18 @@ jobs:
163166
strategy:
164167
matrix:
165168
adapter: [
166-
{name: CUDA, triplet: nvptx64-nvidia-cuda, platform: ""},
167-
{name: HIP, triplet: amdgcn-amd-amdhsa, platform: ""},
168-
{name: L0, triplet: spir64, platform: ""},
169-
{name: OPENCL, triplet: spir64, platform: "Intel(R) OpenCL"}
169+
{name: CUDA, platform: ""},
170+
{name: HIP, platform: ""},
171+
{name: L0, platform: ""},
172+
{name: OPENCL, platform: "Intel(R) OpenCL"}
170173
]
171174
build_type: [Debug, Release]
172175
compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++}]
173176

174177
runs-on: ${{matrix.adapter.name}}
175178

176179
steps:
177-
- uses: actions/checkout@v3
180+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
178181

179182
- name: Install pip packages
180183
run: pip install -r third_party/requirements.txt
@@ -198,8 +201,7 @@ jobs:
198201
-DUR_BUILD_ADAPTER_${{matrix.adapter.name}}=ON
199202
-DUR_DPCXX=${{github.workspace}}/dpcpp_compiler/bin/clang++
200203
-DUR_SYCL_LIBRARY_DIR=${{github.workspace}}/dpcpp_compiler/lib
201-
-DUR_CONFORMANCE_TARGET_TRIPLES=${{matrix.adapter.triplet}}
202-
${{ matrix.adapter.name == 'HIP' && '-DAMD_ARCH=gfx1030' || '' }}
204+
${{ matrix.adapter.name == 'HIP' && '-DUR_CONFORMANCE_AMD_ARCH=gfx1030' || '' }}
203205
${{ matrix.adapter.name == 'HIP' && '-DUR_HIP_PLATFORM=AMD' || '' }}
204206
205207
- name: Build
@@ -240,13 +242,13 @@ jobs:
240242
runs-on: ${{matrix.adapter.name}}
241243

242244
steps:
243-
- uses: actions/checkout@v3
245+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
244246

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

248250
- name: Init conda env
249-
uses: conda-incubator/setup-miniconda@v2
251+
uses: conda-incubator/setup-miniconda@9f54435e0e72c53962ee863144e47a4b094bfd35 # v2.3.0
250252
with:
251253
miniconda-version: "latest"
252254
activate-environment: examples
@@ -306,9 +308,9 @@ jobs:
306308
runs-on: ${{matrix.os}}
307309

308310
steps:
309-
- uses: actions/checkout@v3
311+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
310312

311-
- uses: actions/setup-python@v4
313+
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
312314
with:
313315
python-version: 3.9
314316

@@ -357,9 +359,9 @@ jobs:
357359
runs-on: ${{matrix.os}}
358360

359361
steps:
360-
- uses: actions/checkout@v3
362+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
361363

362-
- uses: actions/setup-python@v4
364+
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
363365
with:
364366
python-version: 3.9
365367

‎.github/workflows/codeql.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ concurrency:
66
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
77
cancel-in-progress: true
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
analyze-ubuntu:
1114
name: Analyze on Ubuntu
@@ -18,10 +21,10 @@ jobs:
1821

1922
steps:
2023
- name: Checkout repository
21-
uses: actions/checkout@v3
24+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2225

2326
- name: Initialize CodeQL
24-
uses: github/codeql-action/init@v2
27+
uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
2528
with:
2629
languages: cpp, python
2730

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

3740
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@v2
41+
uses: github/codeql-action/analyze@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
3942

4043
analyze-windows:
4144
name: Analyze on Windows
@@ -48,10 +51,10 @@ jobs:
4851

4952
steps:
5053
- name: Checkout repository
51-
uses: actions/checkout@v3
54+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
5255

5356
- name: Initialize CodeQL
54-
uses: github/codeql-action/init@v2
57+
uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
5558
with:
5659
languages: cpp, python
5760

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

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

‎.github/workflows/coverage.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Coverage
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
ubuntu-build:
710
name: Build - Ubuntu
@@ -16,7 +19,7 @@ jobs:
1619
runs-on: ${{matrix.os}}
1720

1821
steps:
19-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2023

2124
- name: Install apt packages
2225
run: |
@@ -72,7 +75,7 @@ jobs:
7275
run: ctest -T Coverage
7376

7477
- name: Upload coverage to Codecov
75-
uses: codecov/codecov-action@v3
78+
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
7679
with:
7780
gcov: true
7881
gcov_include: source

‎.github/workflows/coverity.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ env:
2323
COVERITY_SCAN_BRANCH_PATTERN: "main"
2424
TRAVIS_BRANCH: ${{ github.ref_name }}
2525

26+
permissions:
27+
contents: read
2628

2729
jobs:
2830
linux:
@@ -31,7 +33,7 @@ jobs:
3133

3234
steps:
3335
- name: Clone the git repo
34-
uses: actions/checkout@v3
36+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
3537

3638
- name: Install pip packages
3739
run: pip install -r third_party/requirements.txt
@@ -51,6 +53,7 @@ jobs:
5153
-DCUDA_CUDA_LIBRARY=/usr/local/cuda/lib64/stubs/libcuda.so
5254
-DUR_BUILD_ADAPTER_NATIVE_CPU=ON
5355
-DUR_BUILD_ADAPTER_HIP=ON
56+
-DUR_BUILD_ADAPTER_OPENCL=ON
5457
5558
- name: Run Coverity
5659
run: |

‎.github/workflows/docs.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
3030

31-
- uses: actions/setup-python@v4
31+
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
3232
with:
3333
python-version: 3.9
3434

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

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

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

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

@@ -62,4 +62,4 @@ jobs:
6262
steps:
6363
- name: Deploy to GitHub Pages
6464
id: deployment
65-
uses: actions/deploy-pages@v1
65+
uses: actions/deploy-pages@f27bcc15848fdcdcc02f01754eb838e44bcf389b # v1.2.9

‎.github/workflows/e2e_nightly.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
# Run every day at 23:00 UTC
66
- cron: '0 23 * * *'
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
e2e-build-hw:
1013
name: Build SYCL, UR, run E2E
@@ -29,12 +32,12 @@ jobs:
2932
rm -rf ./* || true
3033
3134
- name: Checkout UR
32-
uses: actions/checkout@v4
35+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3336
with:
3437
path: ur-repo
3538

3639
- name: Checkout SYCL
37-
uses: actions/checkout@v4
40+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3841
with:
3942
repository: intel/llvm
4043
ref: sycl

‎.github/workflows/hadolint.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Runs linter for Docker files
2+
name: Hadolint
3+
4+
on:
5+
workflow_dispatch:
6+
push:
7+
pull_request:
8+
paths:
9+
- '.github/docker/*Dockerfile'
10+
- '.github/workflows/hadolint.yml'
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
linux:
21+
name: Hadolint
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- name: Clone the git repo
26+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
27+
28+
- name: Run Hadolint
29+
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf # v3.1.0
30+
with:
31+
recursive: true
32+
dockerfile: ".github/docker/*Dockerfile"
33+
# ignore pinning apt packages to versions
34+
ignore: DL3008

‎.github/workflows/nightly.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
# Run every day at 23:00 UTC
66
- cron: '0 23 * * *'
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
long-fuzz-test:
1013
name: Run long fuzz tests
@@ -16,7 +19,7 @@ jobs:
1619
runs-on: 'ubuntu-22.04'
1720

1821
steps:
19-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2023

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

0 commit comments

Comments
 (0)