Skip to content

Commit 31127cb

Browse files
Merge pull request #989 from IntelPython/do-not-enable-host-device-in-ci
[CI] Do not use SYCL_ENABLE_HOST_DEVICE in GitHub actions
2 parents 78d94aa + a565a0a commit 31127cb

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

.github/workflows/conda-package.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,13 @@ jobs:
160160
. $CONDA/etc/profile.d/conda.sh
161161
conda activate test_dpctl
162162
export OCL_ICD_FILENAMES=libintelocl.so
163-
export SYCL_ENABLE_HOST_DEVICE=1
164163
python -c "import dpctl; dpctl.lsplatform()"
165164
- name: Run tests
166165
run: |
167166
. $CONDA/etc/profile.d/conda.sh
168167
conda activate test_dpctl
169168
# echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd
170169
export OCL_ICD_FILENAMES=libintelocl.so
171-
export SYCL_ENABLE_HOST_DEVICE=1
172170
# clinfo -l
173171
python -m pytest -p no:faulthandler --pyargs $MODULE_NAME
174172
@@ -297,14 +295,12 @@ jobs:
297295
shell: cmd /C CALL {0}
298296
run: |
299297
python -c "import sys; print(sys.executable)"
300-
set SYCL_ENABLE_HOST_DEVICE=1
301298
python -c "import dpctl; dpctl.lsplatform()"
302299
python -c "import dpctl; print(dpctl.get_devices(backend='opencl', device_type='gpu'))"
303300
python -c "import dpctl; print(dpctl.get_num_devices(backend='opencl', device_type='gpu'))"
304301
- name: Run tests
305302
shell: cmd /C CALL {0}
306303
run: |
307-
set SYCL_ENABLE_HOST_DEVICE=1
308304
python -c "import sys; print(sys.executable)"
309305
python -m pytest -p no:faulthandler --pyargs ${{ env.MODULE_NAME }}
310306
@@ -435,7 +431,6 @@ jobs:
435431
run: |
436432
source $CONDA/etc/profile.d/conda.sh
437433
export OCL_ICD_FILENAMES=libintelocl.so
438-
export SYCL_ENABLE_HOST_DEVICE=1
439434
conda activate examples
440435
conda list
441436
cd examples/pybind11
@@ -497,7 +492,6 @@ jobs:
497492
cd examples/python
498493
source $CONDA/etc/profile.d/conda.sh
499494
export OCL_ICD_FILENAMES=libintelocl.so
500-
export SYCL_ENABLE_HOST_DEVICE=1
501495
conda activate examples
502496
for script in $(find . \( -not -name "_*" -and -name "*.py" \))
503497
do
@@ -603,7 +597,6 @@ jobs:
603597
conda activate test_dpctl
604598
# echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd
605599
export OCL_ICD_FILENAMES=libintelocl.so
606-
export SYCL_ENABLE_HOST_DEVICE=1
607600
python -c "import dpctl; dpctl.lsplatform()"
608601
export ARRAY_API_TESTS_MODULE=dpctl.tensor
609602
cd /home/runner/work/array-api-tests

.github/workflows/generate-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
shell: bash -l {0}
8686
run: |
8787
source /opt/intel/oneapi/setvars.sh
88-
SYCL_ENABLE_HOST_DEVICE=1 python scripts/gen_coverage.py
88+
python scripts/gen_coverage.py
8989
9090
- name: Install coverall dependencies
9191
shell: bash -l {0}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,4 @@ jobs:
119119
sycl-ls
120120
CC=clang CXX=clang++ python setup.py develop -G Ninja
121121
python -c "import dpctl; dpctl.lsplatform()" || exit 1
122-
SYCL_ENABLE_HOST_DEVICE=1 python -m pytest -v dpctl/tests
122+
python -m pytest -v dpctl/tests

dpctl/tests/_device_attributes_checks.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"level_zero:gpu:0",
4040
"gpu:0",
4141
"gpu:1",
42-
"1",
42+
"0",
4343
]
4444

4545
list_of_invalid_filter_selectors = [
@@ -571,7 +571,11 @@ def check_vendor(device):
571571
def check_default_selector_score(device):
572572
sc = device.default_selector_score
573573
assert type(sc) is int
574-
assert sc > 0
574+
assert sc > 0 or not (
575+
device.has_aspect_cpu
576+
or device.has_aspect_gpu
577+
or device.has_aspect_accelerator
578+
)
575579

576580

577581
def check_backend(device):

0 commit comments

Comments
 (0)