From 386046c089cae624bbb86ce66f6e5d2e55ac5649 Mon Sep 17 00:00:00 2001 From: Alexey Kukanov Date: Mon, 30 Sep 2024 22:10:53 +0200 Subject: [PATCH 1/3] Add oneTBB specification version macro --- .../source/configuration/version_information.rst | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/elements/oneTBB/source/configuration/version_information.rst b/source/elements/oneTBB/source/configuration/version_information.rst index d0951881b..128d9f1df 100644 --- a/source/elements/oneTBB/source/configuration/version_information.rst +++ b/source/elements/oneTBB/source/configuration/version_information.rst @@ -1,4 +1,5 @@ .. SPDX-FileCopyrightText: 2019-2021 Intel Corporation +.. SPDX-FileCopyrightText: Contributors to the oneAPI Specification project. .. .. SPDX-License-Identifier: CC-BY-4.0 @@ -14,6 +15,8 @@ version and runtime information. // Defined in header + #define ONETBB_SPEC_VERSION /*implementation-defined*/ + #define TBB_VERSION_MAJOR /*implementation-defined*/ #define TBB_VERSION_MINOR /*implementation-defined*/ #define TBB_VERSION_STRING /*implementation-defined*/ @@ -25,16 +28,21 @@ version and runtime information. const char* TBB_runtime_version(); int TBB_runtime_interface_version(); -**Version Macros** +Version Macros +-------------- oneTBB defines macros related to versioning, as described below. +* ``ONETBB_SPEC_VERSION`` macro defined to the decimal literal which value equals to + ``x * 100 + y``, where ``x`` is the major version and ``y`` is the minor version + of the latest specification of oneTBB fully supported by the implementation. * ``TBB_VERSION_MAJOR`` macro defined to integral value that represents major library version. * ``TBB_VERSION_MINOR`` macro defined to integral value that represents minor library version. * ``TBB_VERSION_STRING`` macro defined to the string representation of the full library version. -* ``TBB_INTERFACE_VERSION`` macro defined to current interface version. The value is a decimal - numeral of the form ``xyyz`` where ``x`` is the major interface version number and ``y`` is the - minor interface version number. This macro is increased in each release. +* ``TBB_INTERFACE_VERSION`` macro defined to a decimal literal for the current interface version. + The value of the literal equals to ``x * 1000 + y * 10 + z`` where ``x`` is the major interface + version number, ``y`` is the minor interface version number, and ``z`` is a decimal digit. + This macro is increased in each release. * ``TBB_INTERFACE_VERSION_MAJOR`` macro defined to ``TBB_INTERFACE_VERSION/1000``, which is the major interface version number. * ``TBB_INTERFACE_VERSION_MINOR`` macro defined to ``TBB_INTERFACE_VERSION%1000/10``, which is the From 30424843d5b05ddd0a171e9b5343ba6ac0d859fb Mon Sep 17 00:00:00 2001 From: Alexey Kukanov Date: Mon, 30 Sep 2024 22:17:03 +0200 Subject: [PATCH 2/3] A grammar fix --- .../oneTBB/source/configuration/version_information.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/elements/oneTBB/source/configuration/version_information.rst b/source/elements/oneTBB/source/configuration/version_information.rst index 128d9f1df..2674496f5 100644 --- a/source/elements/oneTBB/source/configuration/version_information.rst +++ b/source/elements/oneTBB/source/configuration/version_information.rst @@ -33,7 +33,7 @@ Version Macros oneTBB defines macros related to versioning, as described below. -* ``ONETBB_SPEC_VERSION`` macro defined to the decimal literal which value equals to +* ``ONETBB_SPEC_VERSION`` macro defined to the decimal literal whose value equals to ``x * 100 + y``, where ``x`` is the major version and ``y`` is the minor version of the latest specification of oneTBB fully supported by the implementation. * ``TBB_VERSION_MAJOR`` macro defined to integral value that represents major library version. From 417967373b70df0939614239ddf53a0c93bb1305 Mon Sep 17 00:00:00 2001 From: Alexey Kukanov Date: Thu, 3 Oct 2024 16:22:56 +0200 Subject: [PATCH 3/3] Add the actual specification version --- source/elements/oneTBB/source/index.rst | 4 ++++ source/elements/oneTBB/source/nested-index.rst | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/source/elements/oneTBB/source/index.rst b/source/elements/oneTBB/source/index.rst index c90312e80..56e292ace 100644 --- a/source/elements/oneTBB/source/index.rst +++ b/source/elements/oneTBB/source/index.rst @@ -1,10 +1,14 @@ .. SPDX-FileCopyrightText: 2019-2021 Intel Corporation +.. SPDX-FileCopyrightText: Contributors to the oneAPI Specification project. .. .. SPDX-License-Identifier: CC-BY-4.0 ============================================== oneAPI Threading Building Blocks Specification ============================================== +**[spec.version]** + +**Version**: |tbb_version|. .. toctree:: :maxdepth: 2 diff --git a/source/elements/oneTBB/source/nested-index.rst b/source/elements/oneTBB/source/nested-index.rst index 6b0418897..744e10a4e 100644 --- a/source/elements/oneTBB/source/nested-index.rst +++ b/source/elements/oneTBB/source/nested-index.rst @@ -1,4 +1,5 @@ .. SPDX-FileCopyrightText: 2019-2021 Intel Corporation +.. SPDX-FileCopyrightText: Contributors to the oneAPI Specification project. .. .. SPDX-License-Identifier: CC-BY-4.0 @@ -7,6 +8,9 @@ ====== oneTBB ====== +**[spec.version]** + +This is the specification of |tbb_full_name|, part of the oneAPI Specification version |tbb_version|. .. toctree:: :maxdepth: 2