From 6729a4c4c470a1d36e070ec87802df461ca76e0f Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 18:11:59 +0200 Subject: [PATCH 1/9] add oneTBB package --- cmake/configs/default.cmake | 1 + cmake/projects/oneTBB/hunter.cmake | 32 ++++++++++++++++++++++++++++++ docs/packages/pkg/oneTBB.rst | 21 ++++++++++++++++++++ examples/oneTBB/CMakeLists.txt | 18 +++++++++++++++++ examples/oneTBB/boo.cpp | 16 +++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 cmake/projects/oneTBB/hunter.cmake create mode 100644 docs/packages/pkg/oneTBB.rst create mode 100644 examples/oneTBB/CMakeLists.txt create mode 100644 examples/oneTBB/boo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 9115e4def2..0d43fd72ae 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -417,6 +417,7 @@ hunter_default_version(odb-mysql VERSION 2.4.0) hunter_default_version(odb-pgsql VERSION 2.4.0) hunter_default_version(odb-sqlite VERSION 2.4.0) hunter_default_version(ogles_gpgpu VERSION 0.3.6) +hunter_default_version(oneTBB VERSION 2021.5.0) hunter_default_version(oniguruma VERSION 6.8.1-p0) hunter_default_version(onmt VERSION 0.4.1-p2) hunter_default_version(openddlparser VERSION 0.1.0-p2) diff --git a/cmake/projects/oneTBB/hunter.cmake b/cmake/projects/oneTBB/hunter.cmake new file mode 100644 index 0000000000..672407f0ad --- /dev/null +++ b/cmake/projects/oneTBB/hunter.cmake @@ -0,0 +1,32 @@ +# Copyright (c) 2016-2020, Rahul Sheth, Ruslan Baratov +# All rights reserved. + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) +include(hunter_cmake_args) + +hunter_add_version( + PACKAGE_NAME + oneTBB + VERSION + 2021.5.0 + URL + "https://github.com/oneapi-src/oneTBB/archive/v2021.5.0.tar.gz" + SHA1 + 71750727bd1436f4047342d0adb827c25d7bc2b0 +) + +hunter_cmake_args( + oneTBB + CMAKE_ARGS + TBB_TEST=OFF + TBB_STRICT=OFF +) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(oneTBB) +hunter_download(PACKAGE_NAME oneTBB) diff --git a/docs/packages/pkg/oneTBB.rst b/docs/packages/pkg/oneTBB.rst new file mode 100644 index 0000000000..1dd10f841a --- /dev/null +++ b/docs/packages/pkg/oneTBB.rst @@ -0,0 +1,21 @@ +.. spelling:: + + oneTBB + +.. index:: + single: concurrency ; oneTBB + +.. _pkg.oneTBB: + +oneTBB +=== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `oneTBB_developer `__ (`pr-N `__) + +.. literalinclude:: /../examples/oneTBB/CMakeLists.txt + :language: cmake + :start-after: # DOCUMENTATION_START { + :end-before: # DOCUMENTATION_END } diff --git a/examples/oneTBB/CMakeLists.txt b/examples/oneTBB/CMakeLists.txt new file mode 100644 index 0000000000..be0b5dbd22 --- /dev/null +++ b/examples/oneTBB/CMakeLists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2016-2020, Rahul Sheth, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.2) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-oneTBB) + +# DOCUMENTATION_START { +hunter_add_package(oneTBB) +find_package(TBB CONFIG REQUIRED) + +add_executable(boo boo.cpp) +target_link_libraries(boo PUBLIC TBB::tbb) +# DOCUMENTATION_END } diff --git a/examples/oneTBB/boo.cpp b/examples/oneTBB/boo.cpp new file mode 100644 index 0000000000..876e52120a --- /dev/null +++ b/examples/oneTBB/boo.cpp @@ -0,0 +1,16 @@ +#include + +int main() { + // Calculate sum of numbers 1 to 100 + int sum = oneapi::tbb::parallel_reduce(oneapi::tbb::blocked_range(1,101), 0, + [](oneapi::tbb::blocked_range const& r, int init) -> int { + for (int v = r.begin(); v != r.end(); v++ ) { + init += v; + } + return init; + }, + [](int lhs, int rhs) -> int { + return lhs + rhs; + } + ); +} From 356e7fb98863f54c0d3e254f5187eaed62c37568 Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 18:12:56 +0200 Subject: [PATCH 2/9] trigger rebuild --- examples/oneTBB/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/oneTBB/CMakeLists.txt b/examples/oneTBB/CMakeLists.txt index be0b5dbd22..4111d42025 100644 --- a/examples/oneTBB/CMakeLists.txt +++ b/examples/oneTBB/CMakeLists.txt @@ -13,6 +13,7 @@ project(download-oneTBB) hunter_add_package(oneTBB) find_package(TBB CONFIG REQUIRED) + add_executable(boo boo.cpp) target_link_libraries(boo PUBLIC TBB::tbb) # DOCUMENTATION_END } From 414f73642c49ce47302e18ce84472bb76abeed73 Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 18:14:00 +0200 Subject: [PATCH 3/9] trigger rebuild2 --- cmake/projects/oneTBB/hunter.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/projects/oneTBB/hunter.cmake b/cmake/projects/oneTBB/hunter.cmake index 672407f0ad..0cd5a342f6 100644 --- a/cmake/projects/oneTBB/hunter.cmake +++ b/cmake/projects/oneTBB/hunter.cmake @@ -27,6 +27,7 @@ hunter_cmake_args( TBB_STRICT=OFF ) + hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(oneTBB) hunter_download(PACKAGE_NAME oneTBB) From 09653bb409fe5f1b598e96b20e9f426c6c34d1fb Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 18:20:04 +0200 Subject: [PATCH 4/9] fix threads --- examples/oneTBB/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/oneTBB/CMakeLists.txt b/examples/oneTBB/CMakeLists.txt index 4111d42025..07e4550afa 100644 --- a/examples/oneTBB/CMakeLists.txt +++ b/examples/oneTBB/CMakeLists.txt @@ -12,6 +12,7 @@ project(download-oneTBB) # DOCUMENTATION_START { hunter_add_package(oneTBB) find_package(TBB CONFIG REQUIRED) +find_package(Threads REQUIRED) add_executable(boo boo.cpp) From f7ace1d6f17fbd9cbdbf1671650c86d078e488bd Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 18:25:00 +0200 Subject: [PATCH 5/9] trigger rebuild --- cmake/projects/oneTBB/hunter.cmake | 1 - examples/oneTBB/CMakeLists.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/cmake/projects/oneTBB/hunter.cmake b/cmake/projects/oneTBB/hunter.cmake index 0cd5a342f6..672407f0ad 100644 --- a/cmake/projects/oneTBB/hunter.cmake +++ b/cmake/projects/oneTBB/hunter.cmake @@ -27,7 +27,6 @@ hunter_cmake_args( TBB_STRICT=OFF ) - hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(oneTBB) hunter_download(PACKAGE_NAME oneTBB) diff --git a/examples/oneTBB/CMakeLists.txt b/examples/oneTBB/CMakeLists.txt index 07e4550afa..5161f3c0e8 100644 --- a/examples/oneTBB/CMakeLists.txt +++ b/examples/oneTBB/CMakeLists.txt @@ -14,7 +14,6 @@ hunter_add_package(oneTBB) find_package(TBB CONFIG REQUIRED) find_package(Threads REQUIRED) - add_executable(boo boo.cpp) target_link_libraries(boo PUBLIC TBB::tbb) # DOCUMENTATION_END } From 3896d19c2a805ca37e88a4a66b5113afecfb272e Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 21:26:47 +0200 Subject: [PATCH 6/9] update documentation --- docs/packages/pkg/oneTBB.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/packages/pkg/oneTBB.rst b/docs/packages/pkg/oneTBB.rst index 1dd10f841a..c59a2af943 100644 --- a/docs/packages/pkg/oneTBB.rst +++ b/docs/packages/pkg/oneTBB.rst @@ -10,10 +10,9 @@ oneTBB === -- `Official `__ -- `Hunterized `__ +- `Official `__ - `Example `__ -- Added by `oneTBB_developer `__ (`pr-N `__) +- Added by `craffael `__ (`pr-600 `__) .. literalinclude:: /../examples/oneTBB/CMakeLists.txt :language: cmake From 7f51420a68872af72eda743c38b2e2074256fe94 Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 21:34:10 +0200 Subject: [PATCH 7/9] fix title in documentation --- docs/packages/pkg/oneTBB.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/oneTBB.rst b/docs/packages/pkg/oneTBB.rst index c59a2af943..ed9661a6ec 100644 --- a/docs/packages/pkg/oneTBB.rst +++ b/docs/packages/pkg/oneTBB.rst @@ -8,7 +8,7 @@ .. _pkg.oneTBB: oneTBB -=== +====== - `Official `__ - `Example `__ From fc3e87a300fbcccfd1ff89e935f2f4e9c9488ad4 Mon Sep 17 00:00:00 2001 From: craffael Date: Wed, 24 Aug 2022 22:01:53 +0200 Subject: [PATCH 8/9] tab -> space Co-authored-by: NeroBurner --- cmake/projects/oneTBB/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/oneTBB/hunter.cmake b/cmake/projects/oneTBB/hunter.cmake index 672407f0ad..58b21a07c2 100644 --- a/cmake/projects/oneTBB/hunter.cmake +++ b/cmake/projects/oneTBB/hunter.cmake @@ -24,7 +24,7 @@ hunter_cmake_args( oneTBB CMAKE_ARGS TBB_TEST=OFF - TBB_STRICT=OFF + TBB_STRICT=OFF ) hunter_pick_scheme(DEFAULT url_sha1_cmake) From ae3baee53f2107e444c68c9d748fd7aafe27e610 Mon Sep 17 00:00:00 2001 From: Raffael Casagrande Date: Wed, 24 Aug 2022 22:19:12 +0200 Subject: [PATCH 9/9] updated copyright --- cmake/projects/oneTBB/hunter.cmake | 2 +- examples/oneTBB/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/oneTBB/hunter.cmake b/cmake/projects/oneTBB/hunter.cmake index 58b21a07c2..f8a4713406 100644 --- a/cmake/projects/oneTBB/hunter.cmake +++ b/cmake/projects/oneTBB/hunter.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2020, Rahul Sheth, Ruslan Baratov +# Copyright (c) 2022, Raffael Casagrande # All rights reserved. # !!! DO NOT PLACE HEADER GUARDS HERE !!! diff --git a/examples/oneTBB/CMakeLists.txt b/examples/oneTBB/CMakeLists.txt index 5161f3c0e8..3ec7c74b96 100644 --- a/examples/oneTBB/CMakeLists.txt +++ b/examples/oneTBB/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2016-2020, Rahul Sheth, Ruslan Baratov +# Copyright (c) 2022, Raffael Casagrande # All rights reserved. cmake_minimum_required(VERSION 3.2)