Skip to content

Commit 88a939a

Browse files
Merge remote-tracking branch 'origin/master' into add_sycl_queue_fill
2 parents 174396a + 6b3c588 commit 88a939a

5 files changed

Lines changed: 15 additions & 10 deletions

File tree

.github/workflows/conda-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,11 @@ jobs:
186186
- python: '3.14'
187187
python_spec: '3.14.* *_cp314'
188188
experimental: false
189-
runner: ubuntu-22.04
189+
runner: ubuntu-latest
190190
- python: '3.14'
191191
python_spec: '3.14.* *_cp314t'
192192
experimental: false
193-
runner: ubuntu-22.04
193+
runner: ubuntu-latest
194194
experimental: [false]
195195
runner: [ubuntu-latest]
196196
continue-on-error: ${{ matrix.experimental }}

.github/workflows/os-llvm-sycl-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions: read-all
99
jobs:
1010
install-compiler:
1111
name: Build with nightly build of DPC++ toolchain
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
timeout-minutes: 90
1414

1515
env:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
pre-commit:
1212
name: pre-commit
1313

14-
runs-on: ubuntu-24.04
14+
runs-on: ubuntu-latest
1515
timeout-minutes: 30
1616

1717
steps:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2020
* Registered `DPCTL_PARTITION_AFFINITY_DOMAIN_UNKNOWN` enumerator when `DPCTLDevice_GetPartitionAffinityDomains` receives an unrecognized value from the SYCL runtime [gh-2324](https://github.com/IntelPython/dpctl/pull/2324)
2121

2222
### Fixed
23+
* Fixed incorrect paths in `GetLevelZeroHeaders.cmake` [gh-2366](https://github.com/IntelPython/dpctl/pull/2366)
2324

2425
### Maintenance
2526
* Updated pybind11 version used by `dpctl` and examples [gh-2357](https://github.com/IntelPython/dpctl/pull/2357)

libsyclinterface/cmake/modules/GetLevelZeroHeaders.cmake

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
#
1515
# The module uses git to clone the Level Zero source repository into the
16-
# CMAKE_CURRENT_BINARY_DIR. The path to the Level Zero headers is then returned
16+
# CMAKE_BINARY_DIR. The path to the Level Zero headers is then returned
1717
# to the caller in the LEVEL_ZERO_INCLUDE_DIR variable.
1818
#
1919
# Example usage:
@@ -26,13 +26,13 @@
2626

2727
function(get_level_zero_headers)
2828

29-
if(EXISTS level-zero)
29+
if(EXISTS "${CMAKE_BINARY_DIR}/level-zero/.git")
3030
# Update the checkout
3131
execute_process(
3232
COMMAND ${GIT_EXECUTABLE} fetch
3333
RESULT_VARIABLE result
3434
ERROR_VARIABLE error
35-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
35+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/level-zero"
3636
OUTPUT_STRIP_TRAILING_WHITESPACE
3737
ERROR_STRIP_TRAILING_WHITESPACE
3838
)
@@ -43,11 +43,15 @@ function(get_level_zero_headers)
4343
)
4444
endif()
4545
else()
46+
# remove level-zero directory if it exists
47+
file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/level-zero")
48+
4649
# Clone the Level Zero git repo
4750
execute_process(
4851
COMMAND ${GIT_EXECUTABLE} clone https://github.com/oneapi-src/level-zero.git
4952
RESULT_VARIABLE result
5053
ERROR_VARIABLE error
54+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
5155
OUTPUT_STRIP_TRAILING_WHITESPACE
5256
ERROR_STRIP_TRAILING_WHITESPACE
5357
)
@@ -65,7 +69,7 @@ function(get_level_zero_headers)
6569
RESULT_VARIABLE result
6670
OUTPUT_VARIABLE latest_tag
6771
ERROR_VARIABLE error
68-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
72+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/level-zero"
6973
OUTPUT_STRIP_TRAILING_WHITESPACE
7074
ERROR_STRIP_TRAILING_WHITESPACE
7175
)
@@ -81,7 +85,7 @@ function(get_level_zero_headers)
8185
COMMAND ${GIT_EXECUTABLE} checkout ${latest_tag}
8286
RESULT_VARIABLE result
8387
ERROR_VARIABLE error
84-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/level-zero
88+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/level-zero"
8589
OUTPUT_STRIP_TRAILING_WHITESPACE
8690
ERROR_STRIP_TRAILING_WHITESPACE
8791
)
@@ -95,7 +99,7 @@ function(get_level_zero_headers)
9599
# Populate the path to the headers
96100
find_path(LEVEL_ZERO_INCLUDE_DIR
97101
NAMES zet_api.h
98-
PATHS ${CMAKE_BINARY_DIR}/level-zero/include
102+
PATHS "${CMAKE_BINARY_DIR}/level-zero/include"
99103
NO_DEFAULT_PATH
100104
NO_CMAKE_ENVIRONMENT_PATH
101105
NO_CMAKE_PATH

0 commit comments

Comments
 (0)