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

add onetbb/2021.11.0 #20813

Closed
wants to merge 10 commits into from
Closed

add onetbb/2021.11.0 #20813

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8eb8318
add onetbb/2021.11.0-rc1
Oct 28, 2023
00cd82f
add 2021.11.0-rc1 to config.yml
Oct 28, 2023
7102c7a
allow macos build as per https://github.com/oneapi-src/oneTBB/pull/1132
Oct 28, 2023
c7b51bd
correct _tbbbind_supported condition; bump pkgconf
Oct 28, 2023
6eddec0
remove pdb files
Oct 30, 2023
d945b61
import rm
Oct 30, 2023
da1247b
use release, not release candidate
Nov 20, 2023
a1774b6
correct version
Nov 20, 2023
2f9a153
Merge branch 'master' into add_onetbb
uilianries Nov 22, 2023
4f2e659
Update recipes/onetbb/all/conanfile.py
AndreyMlashkin Nov 22, 2023
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
3 changes: 3 additions & 0 deletions recipes/onetbb/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2021.11.0-rc1":
url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.11.0-rc1.tar.gz"
sha256: "ff0fbbf6ffcb0e81beacfddf5ef5b1eab0bb16f4e4c4bae517ed1f4e3b269b47"
Copy link
Contributor

Choose a reason for hiding this comment

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

please, fix this condition:

conan-center-index/recipes/onetbb/all/conanfile.py

Lines 49 to 51 in 42ff589

@property
def _tbbbind_supported(self):
return Version(self.version) >= "2021.1.1" and not self.settings.os == "Macos"

because tbbbind is available since 2021.11.0 (see oneapi-src/oneTBB#1132)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't have Mac to verify that, so I will just apply it and lets see the CI output

"2021.10.0":
url: "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.10.0.tar.gz"
sha256: "487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b"
Expand Down Expand Up @@ -41,6 +44,6 @@
- patch_description: "Use pkg_search_module with IMPORTED_TARGET"
patch_type: "portability"
patch_source:
- "https://github.com/oneapi-src/oneTBB/pull/448.diff"
- "https://github.com/oneapi-src/oneTBB/commit/df3096075a00942acbdd3ce9347f5298cc153fd6.diff"
patch_file: "patches/pkg-search-module-use-imported-target.diff"
10 changes: 7 additions & 3 deletions recipes/onetbb/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from conan.errors import ConanInvalidConfiguration
from conan.tools.build import cross_building
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, load, rmdir
from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, load, rmdir, rm
from conan.tools.gnu import PkgConfigDeps
from conan.tools.scm import Version
import os
Expand Down Expand Up @@ -48,7 +48,9 @@ def _tbbbind_hwloc_version(self):

@property
def _tbbbind_supported(self):
return Version(self.version) >= "2021.1.1" and not self.settings.os == "Macos"
if self.settings.os == "Macos":
return Version(self.version) >= "2021.11.0"
return Version(self.version) >= "2021.1.1"

@property
def _tbbbind_build(self):
Expand Down Expand Up @@ -94,7 +96,7 @@ def requirements(self):

def build_requirements(self):
if not self._tbbbind_explicit_hwloc and not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.5")
self.tool_requires("pkgconf/2.0.3")

def package_id(self):
if Version(self.version) < "2021.5.0":
Expand Down Expand Up @@ -160,6 +162,8 @@ def package(self):
rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
rmdir(self, os.path.join(self.package_folder, "share"))
rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))
rm(self, "*.pdb", os.path.join(self.package_folder, "lib"))
AndreyMlashkin marked this conversation as resolved.
Show resolved Hide resolved

def package_info(self):
self.cpp_info.set_property("cmake_file_name", "TBB")
Expand Down
2 changes: 2 additions & 0 deletions recipes/onetbb/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"2021.11.0-rc1":
folder: all
"2021.10.0":
folder: all
"2021.9.0":
Expand Down