Skip to content

Backport pr-919 to gold/2021#930

Merged
oleksandr-pavlyk merged 4 commits intogold/2021from
backport-pr-919
Oct 14, 2022
Merged

Backport pr-919 to gold/2021#930
oleksandr-pavlyk merged 4 commits intogold/2021from
backport-pr-919

Conversation

@oleksandr-pavlyk
Copy link
Copy Markdown
Contributor

This PR backport changes to CMakeLists.txt added in #919 to fix building of gold/2021 sources with updated scikit-build.

  • Have you provided a meaningful PR description?
  • Have you added a test, reproducer or referred to an issue with a reproducer?
  • Have you tested your changes locally for CPU and GPU devices?
  • Have you made sure that new changes do not introduce compiler warnings?
  • If this PR is a work in progress, are you filing the PR as a draft?

In scikit-build 0.14.0 -DCMAKE_FIND_PATH_MODE_INCLUDE=ONLY started being
set. This breaks working of IntelDPCPP integration with cmake, since
find_file starts ignoring specified paths and hints.

Setting the value in CMakeLists.txt overrides that value
Variables were set in the nested scope and not propagated to the
parent scope.

The config also has erroneous space before the trailing @ symbol.
This is to ensure that find_library can find libpi_level_zero
and libpi_opencl
@oleksandr-pavlyk oleksandr-pavlyk changed the title Backport pr 919 Backport pr-919 to gold/2021 Oct 12, 2022
@github-actions
Copy link
Copy Markdown

@oleksandr-pavlyk
Copy link
Copy Markdown
Contributor Author

@xaleryb The internal CI is green, merging.

FYI, some other changes in gold/2021 conflict with main branch. Resolving the conflict is easy though.

@oleksandr-pavlyk oleksandr-pavlyk merged commit b93d567 into gold/2021 Oct 14, 2022
@oleksandr-pavlyk oleksandr-pavlyk deleted the backport-pr-919 branch October 14, 2022 14:21
@github-actions
Copy link
Copy Markdown

Deleted rendered PR docs from intelpython.github.com/dpctl, latest should be updated shortly. 🤞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant