Skip to content

Commit 607ea7b

Browse files
0x12CC0x12CC
committed
Merge branch 'main' into cooperative_kernel_functions
Signed-off-by: Michael Aziz <michael.aziz@intel.com>
2 parents 699fb43 + 03cd9d1 commit 607ea7b

File tree

146 files changed

+5044
-2322
lines changed

Some content is hidden

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

146 files changed

+5044
-2322
lines changed

‎.github/workflows/bandit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Clone the git repo
20-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
20+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2121

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

‎.github/workflows/cmake.yml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ${{matrix.os}}
4040

4141
steps:
42-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
42+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4343

4444
- name: Install apt packages
4545
run: |
@@ -68,7 +68,7 @@ jobs:
6868
if: matrix.os == 'ubuntu-22.04'
6969
run: |
7070
sudo apt install libncurses5
71-
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2023-09-21/sycl_linux.tar.gz
71+
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz
7272
mkdir -p ${{github.workspace}}/dpcpp_compiler
7373
tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C ${{github.workspace}}/dpcpp_compiler
7474
@@ -125,7 +125,7 @@ jobs:
125125
runs-on: 'ubuntu-22.04'
126126

127127
steps:
128-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
128+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
129129

130130
- name: Install pip packages
131131
run: pip install -r third_party/requirements.txt
@@ -169,22 +169,23 @@ jobs:
169169
{name: CUDA, platform: ""},
170170
{name: HIP, platform: ""},
171171
{name: L0, platform: ""},
172-
{name: OPENCL, platform: "Intel(R) OpenCL"}
172+
{name: OPENCL, platform: "Intel(R) OpenCL"},
173+
{name: NATIVE_CPU, platform: ""}
173174
]
174175
build_type: [Debug, Release]
175176
compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++}]
176177

177178
runs-on: ${{matrix.adapter.name}}
178179

179180
steps:
180-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
181+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
181182

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

185186
- name: Download DPC++
186187
run: |
187-
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2023-09-21/sycl_linux.tar.gz
188+
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz
188189
mkdir dpcpp_compiler
189190
tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C dpcpp_compiler
190191
@@ -212,15 +213,7 @@ jobs:
212213
working-directory: ${{github.workspace}}/build
213214
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "adapter-specific" --timeout 180
214215

215-
# Temporarily disabling platform test for L0, because of hang
216-
# See issue: #824
217-
- name: Test L0 adapter
218-
if: matrix.adapter.name == 'L0'
219-
working-directory: ${{github.workspace}}/build
220-
run: ctest -C ${{matrix.build_type}} --output-on-failure -L "conformance" -E "platform-adapter_level_zero" --timeout 180
221-
222216
- name: Test adapters
223-
if: matrix.adapter.name != 'L0'
224217
working-directory: ${{github.workspace}}/build
225218
run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --output-on-failure -L "conformance" --timeout 180
226219

@@ -230,7 +223,8 @@ jobs:
230223

231224
examples-build-hw:
232225
name: Build - examples on HW
233-
if: github.repository == 'oneapi-src/unified-runtime' # run only on upstream; forks won't have the HW
226+
# if: github.repository == 'oneapi-src/unified-runtime' # run only on upstream; forks won't have the HW
227+
if: false # temporaily disabled due to conda env setup issues
234228
strategy:
235229
matrix:
236230
adapter: [
@@ -242,7 +236,7 @@ jobs:
242236
runs-on: ${{matrix.adapter.name}}
243237

244238
steps:
245-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
239+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
246240

247241
- name: Install pip packages
248242
run: pip install -r third_party/requirements.txt
@@ -308,7 +302,7 @@ jobs:
308302
runs-on: ${{matrix.os}}
309303

310304
steps:
311-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
305+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
312306

313307
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
314308
with:
@@ -359,7 +353,7 @@ jobs:
359353
runs-on: ${{matrix.os}}
360354

361355
steps:
362-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
356+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
363357

364358
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
365359
with:

‎.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
24+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2525

2626
- name: Initialize CodeQL
2727
uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
@@ -51,7 +51,7 @@ jobs:
5151

5252
steps:
5353
- name: Checkout repository
54-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
54+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5555

5656
- name: Initialize CodeQL
5757
uses: github/codeql-action/init@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12

‎.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{matrix.os}}
2020

2121
steps:
22-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
22+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2323

2424
- name: Install apt packages
2525
run: |

‎.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Clone the git repo
36-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
36+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3737

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

‎.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
29+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3030

3131
- uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
3232
with:

‎.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
runs-on: 'ubuntu-22.04'
2020

2121
steps:
22-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
22+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2323

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

2727
- name: Download DPC++
2828
run: |
29-
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2023-08-31/sycl_linux.tar.gz
29+
wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2024-01-29/sycl_linux.tar.gz
3030
mkdir dpcpp_compiler
3131
tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C dpcpp_compiler
3232

‎.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
permissions:
1616
contents: write
1717
steps:
18-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
18+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
1919

2020
- name: Create weekly prerelease
2121
run:

‎.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: "Checkout code"
36-
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
36+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3737
with:
3838
persist-credentials: false
3939

‎CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,15 @@ if(UR_ENABLE_TRACING)
126126
endif()
127127

128128
if(UR_ENABLE_SANITIZER)
129-
add_compile_definitions(UR_ENABLE_SANITIZER)
129+
if(APPLE)
130+
message(WARNING "Sanitizer layer isn't supported on macOS")
131+
set(UR_ENABLE_SANITIZER OFF)
132+
elseif(WIN32)
133+
message(WARNING "Sanitizer layer isn't supported on Windows")
134+
set(UR_ENABLE_SANITIZER OFF)
135+
else()
136+
add_compile_definitions(UR_ENABLE_SANITIZER)
137+
endif()
130138
endif()
131139

132140
if(UR_USE_ASAN)

0 commit comments

Comments
 (0)