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.

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

OneDPL: add versions 2021.6.1 & 2021.7.0 #11635

Merged
merged 5 commits into from
Aug 10, 2022

Conversation

jhabermas
Copy link
Contributor

Specify library name and version: OneDPL/2021.7.0

This PR adds two of the latest versions of OneDPL to the recipe, which allow integration of latest OneTBB and fix C++20 compilation errors.


  • I've read the guidelines for contributing.
  • I've followed the PEP8 style guides for Python code in the recipes.
  • I've used the latest Conan client version.
  • I've tried at least one configuration locally with the conan-center hook activated.

@CLAassistant
Copy link

CLAassistant commented Jul 11, 2022

CLA assistant check
All committers have signed the CLA.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

Fix license path
@conan-center-bot

This comment has been minimized.

@uilianries
Copy link
Member

@jhabermas I see both recipes are pretty similar. Why not combine both on same folder (all)?

@jhabermas
Copy link
Contributor Author

jhabermas commented Jul 18, 2022

@uilianries As the old recipe has not been maintained since creation I thought it may be easier to just create a new one. The OneDPL project has changed in terms of folders/files layout, but it is possible to merge the two if you think that would be better.

@jgsogo
Copy link
Contributor

jgsogo commented Jul 19, 2022

Yes, please, merge them. In the long term it is easier to maintain just one conanfile.py.... and IMHO merging these two recipes shouldn't result in something too complex. Thanks!

@jhabermas
Copy link
Contributor Author

jhabermas commented Jul 19, 2022

@jgsogo How would you suggest dealing with different include file structure and namespaces, i.e. <pstl/execution> in 2020x vs <oneapi/dpl/execution> in 2021.x, in test packages?

@jgsogo
Copy link
Contributor

jgsogo commented Aug 1, 2022

There are several options, but I would just go with the most straightforward one: duplicate the main.cpp file and use a different one for each version (like main.2020x.cpp and main.2021x.cpp, then:

test_package/conanfile.py


def build(self):
   ...
   cmake.definitions["VERSION"] = "2020x"/"2021x"

and the CMakeLists.txt with something like:

add_executable(${PROJECT_NAME} main.${VERSION}.cpp)

But any approach will probably be ok.

@conan-center-bot

This comment has been minimized.

Copy link
Contributor

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

Looks good, but now linter errors need to be fixed before merging:

image

I hope the help on the linked docs page is enough. If not, please let me know and I can submit a PR with the required changes to your branch.

Thanks!

@conan-center-bot

This comment has been minimized.

@conan-center-bot
Copy link
Collaborator

All green in build 6 (212526919b8073fa9e4627d9615bd99237ffee48):

  • onedpl/20200330@:
    All packages built successfully! (All logs)

  • onedpl/2021.7.0@:
    All packages built successfully! (All logs)

  • onedpl/2021.6.1@:
    All packages built successfully! (All logs)

Copy link
Contributor

@jgsogo jgsogo left a comment

Choose a reason for hiding this comment

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

Thanks for taking care of linter errors! 🙌

@conan-center-bot conan-center-bot merged commit a6f93da into conan-io:master Aug 10, 2022
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.

5 participants