Skip to content

Fix fallback in has_struct_arg_count_bug #558

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.

Sign up for GitHub

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
inducer merged 2 commits into from
May 1, 2022
Merged

Fix fallback in has_struct_arg_count_bug #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01cae4b
fix fallback in has_struct_arg_count_bug
alexfikl May 1, 2022
ae13aff
fix ci after changes in ci-support
alexfikl May 1, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ jobs:
./configure.py --cl-inc-dir="$TEST_ENV_ROOT/include" --cl-lib-dir="$TEST_ENV_ROOT/lib"
git add -f siteconf.py

prepare_downstream_build "$DOWNSTREAM_PROJECT"
prepare_downstream_build "https://github.com/inducer/$DOWNSTREAM_PROJECT.git"
sed -i 's/pyopencl/ocl-icd/' .test-conda-env-py3.yml
build_py_project_in_conda_env
test_py_project
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Downstream:
./configure.py --cl-inc-dir="$TEST_ENV_ROOT/include" --cl-lib-dir="$TEST_ENV_ROOT/lib"
git add -f siteconf.py

prepare_downstream_build "$DOWNSTREAM_PROJECT"
prepare_downstream_build "https://github.com/inducer/$DOWNSTREAM_PROJECT.git"
sed -i 's/pyopencl/ocl-icd/' .test-conda-env-py3.yml
build_py_project_in_conda_env
test_py_project
Expand Down
10 changes: 5 additions & 5 deletions pyopencl/characterize/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,11 @@ def get_pocl_version(platform, fallback_value=None):
return None

import re
ver_match = re.match(
r"^OpenCL [0-9.]+ pocl ([0-9]+)\.([0-9]+)", platform.version)
version = platform.version
ver_match = re.match(r"^OpenCL [0-9.]+ pocl ([0-9]+)\.([0-9]+)", version)

if ver_match is None:
msg = ("pocl version number did not have expected format: '%s'"
% platform.version)
msg = f"pocl version number did not have expected format: '{version}'"
if fallback_value is not None:
from warnings import warn
warn(msg)
Expand Down Expand Up @@ -378,7 +378,7 @@ def has_struct_arg_count_bug(dev, ctx=None):
if dev.platform.name == "Apple" and dev.type & cl.device_type.CPU:
return "apple"
if dev.platform.name == "Portable Computing Language":
pocl_version = get_pocl_version(dev.platform, fallback_value=(0.14))
pocl_version = get_pocl_version(dev.platform, fallback_value=(0, 14))
if pocl_version <= (0, 13):
return "pocl"
elif pocl_version <= (0, 14) and _check_for_pocl_arg_count_bug(dev, ctx):
Expand Down