Skip to content
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

Jump to bottom

Fix finding ocl-icd in non-standard directories #1252

Merged
merged 2 commits into from
Jun 20, 2023
Merged

Fix finding ocl-icd in non-standard directories #1252

merged 2 commits into from
Jun 20, 2023

Conversation

isuruf
Copy link
Member

@isuruf isuruf commented Jun 9, 2023

No description provided.

@pjaaskel pjaaskel requested a review from franz June 13, 2023 12:33
jansol
jansol approved these changes Jun 15, 2023
View reviewed changes
Copy link
Contributor

@jansol jansol left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. This got me thinking, can/does ocl-icd expose the macOS OpenCL framework for the proxy device?

EDIT: nvm, saw the mention in the docs in the other PR

CMakeLists.txt
@@ -988,6 +988,7 @@ else()
pkg_check_modules(OCL_ICD ocl-icd>=1.3)
endif()

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stray newline?

franz
franz requested changes Jun 15, 2023
View reviewed changes
Copy link
Contributor

@franz franz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, one minor nitpick

CMakeLists.txt
endif()

# Find OCL_ICD_LIBRARIES with the hint from pkg-config
find_library(OCL_ICD_LIBRARIES
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC how find_library works, this would find any library named OpenCL in any paths it searches, and that includes "system" paths. But in this case we want to find only ocl-icd, not any other OpenCL ICD. So i think this one needs a NO_DEFAULT_PATH

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't that what's done already at https://github.com/pocl/pocl/blob/master/CMakeLists.txt#L991-L1003 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but that code was also incorrectly leaving OCL_ICD_LIBRARIES set when it found other than ocl-icd loader. But this is just a minor nitpick.

@franz franz merged commit f2d1092 into pocl:release_4_0 Jun 20, 2023
31 checks passed
@isuruf
Copy link
Member Author

isuruf commented Jun 21, 2023

@jansol, I use https://github.com/jrprice/ocl_icd_wrapper to expose Apple's OpenCL framework to the ICD loader.

@isuruf isuruf deleted the ocl-icd branch June 21, 2023 18:11
@isuruf isuruf mentioned this pull request Aug 29, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@franz franz franz requested changes

@jansol jansol jansol approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@isuruf @franz @jansol