Skip to content

[CI] Do not use SYCL_ENABLE_HOST_DEVICE in GitHub actions #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .github/workflows/conda-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,13 @@ jobs:
. $CONDA/etc/profile.d/conda.sh
conda activate test_dpctl
export OCL_ICD_FILENAMES=libintelocl.so
export SYCL_ENABLE_HOST_DEVICE=1
python -c "import dpctl; dpctl.lsplatform()"
- name: Run tests
run: |
. $CONDA/etc/profile.d/conda.sh
conda activate test_dpctl
# echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd
export OCL_ICD_FILENAMES=libintelocl.so
export SYCL_ENABLE_HOST_DEVICE=1
# clinfo -l
python -m pytest -p no:faulthandler --pyargs $MODULE_NAME

Expand Down Expand Up @@ -297,14 +295,12 @@ jobs:
shell: cmd /C CALL {0}
run: |
python -c "import sys; print(sys.executable)"
set SYCL_ENABLE_HOST_DEVICE=1
python -c "import dpctl; dpctl.lsplatform()"
python -c "import dpctl; print(dpctl.get_devices(backend='opencl', device_type='gpu'))"
python -c "import dpctl; print(dpctl.get_num_devices(backend='opencl', device_type='gpu'))"
- name: Run tests
shell: cmd /C CALL {0}
run: |
set SYCL_ENABLE_HOST_DEVICE=1
python -c "import sys; print(sys.executable)"
python -m pytest -p no:faulthandler --pyargs ${{ env.MODULE_NAME }}

Expand Down Expand Up @@ -435,7 +431,6 @@ jobs:
run: |
source $CONDA/etc/profile.d/conda.sh
export OCL_ICD_FILENAMES=libintelocl.so
export SYCL_ENABLE_HOST_DEVICE=1
conda activate examples
conda list
cd examples/pybind11
Expand Down Expand Up @@ -497,7 +492,6 @@ jobs:
cd examples/python
source $CONDA/etc/profile.d/conda.sh
export OCL_ICD_FILENAMES=libintelocl.so
export SYCL_ENABLE_HOST_DEVICE=1
conda activate examples
for script in $(find . \( -not -name "_*" -and -name "*.py" \))
do
Expand Down Expand Up @@ -603,7 +597,6 @@ jobs:
conda activate test_dpctl
# echo "libintelocl.so" | tee /etc/OpenCL/vendors/intel-cpu.icd
export OCL_ICD_FILENAMES=libintelocl.so
export SYCL_ENABLE_HOST_DEVICE=1
python -c "import dpctl; dpctl.lsplatform()"
export ARRAY_API_TESTS_MODULE=dpctl.tensor
cd /home/runner/work/array-api-tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
shell: bash -l {0}
run: |
source /opt/intel/oneapi/setvars.sh
SYCL_ENABLE_HOST_DEVICE=1 python scripts/gen_coverage.py
python scripts/gen_coverage.py

- name: Install coverall dependencies
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/os-llvm-sycl-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,4 @@ jobs:
sycl-ls
CC=clang CXX=clang++ python setup.py develop -G Ninja
python -c "import dpctl; dpctl.lsplatform()" || exit 1
SYCL_ENABLE_HOST_DEVICE=1 python -m pytest -v dpctl/tests
python -m pytest -v dpctl/tests
8 changes: 6 additions & 2 deletions dpctl/tests/_device_attributes_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"level_zero:gpu:0",
"gpu:0",
"gpu:1",
"1",
"0",
]

list_of_invalid_filter_selectors = [
Expand Down Expand Up @@ -571,7 +571,11 @@ def check_vendor(device):
def check_default_selector_score(device):
sc = device.default_selector_score
assert type(sc) is int
assert sc > 0
assert sc > 0 or not (
device.has_aspect_cpu
or device.has_aspect_gpu
or device.has_aspect_accelerator
)


def check_backend(device):
Expand Down