From 71f8dd9cdf229633ec6f6197530e85da2833f991 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Wed, 18 Feb 2026 15:18:13 +0100 Subject: [PATCH 1/4] Updated TBB version to 2022.3 --- scripts/cmake-presets/os.json | 1 + scripts/cmake-presets/release.json | 10 +++++----- scripts/cmake-presets/tbb.json | 9 ++++++++- tutorials/README.md | 10 +++++----- tutorials/README.md.in | 10 +++++----- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/scripts/cmake-presets/os.json b/scripts/cmake-presets/os.json index b595c58cd5..f6c532fd27 100644 --- a/scripts/cmake-presets/os.json +++ b/scripts/cmake-presets/os.json @@ -91,6 +91,7 @@ "EMBREE_TBB_2021_10_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.10.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", "EMBREE_TBB_2021_11_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.11.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", "EMBREE_TBB_2021_12_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.12.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", + "EMBREE_TBB_2022_3_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.12.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", "EMBREE_TBB_DIR": "" } } diff --git a/scripts/cmake-presets/release.json b/scripts/cmake-presets/release.json index 895b75424a..0fd7d07393 100644 --- a/scripts/cmake-presets/release.json +++ b/scripts/cmake-presets/release.json @@ -14,7 +14,7 @@ "configurePresets": [ { "name": "release-windows", - "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"], + "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2022_3_0"], "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", @@ -23,7 +23,7 @@ }, { "name": "release-macos", - "inherits": ["package-macos", "env", "clang", "ispc1_23_0", "tbb2021_11_0"], + "inherits": ["package-macos", "env", "clang", "ispc1_23_0", "tbb2022_3_0"], "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", @@ -33,7 +33,7 @@ }, { "name": "release-macos-arm", - "inherits": ["package-macos", "env", "clang", "ispc1_23_0", "tbb2021_11_0"], + "inherits": ["package-macos", "env", "clang", "ispc1_23_0", "tbb2022_3_0"], "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", @@ -53,7 +53,7 @@ { "name": "release-windows-sycl", - "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"], + "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2022_3_0"], "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", @@ -64,7 +64,7 @@ }, { "name": "release-linux-sycl", - "inherits": ["package-linux", "env", "dpcpp", "ispc1_23_0", "tbb2021_11_0"], + "inherits": ["package-linux", "env", "dpcpp", "ispc1_23_0", "tbb2022_3_0"], "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", diff --git a/scripts/cmake-presets/tbb.json b/scripts/cmake-presets/tbb.json index 3ccfeb07aa..3cc518f2aa 100644 --- a/scripts/cmake-presets/tbb.json +++ b/scripts/cmake-presets/tbb.json @@ -88,9 +88,16 @@ "TBB_DIR": "$env{EMBREE_TBB_2021_12_0_DIR}" } }, + { + "name": "tbb2022_3_0", + "inherits": "tbb_SYSTEM", + "cacheVariables": { + "TBB_DIR": "$env{EMBREE_TBB_2022_3_0_DIR}" + } + }, { "name": "tbb_NEWEST", - "inherits": "tbb2021_12_0" + "inherits": "tbb2022_3_0" } ] } \ No newline at end of file diff --git a/tutorials/README.md b/tutorials/README.md index 6cda60c187..8c5bf91ffb 100644 --- a/tutorials/README.md +++ b/tutorials/README.md @@ -23,9 +23,9 @@ use the DPC++ compiler: set "INCLUDE=%DPCPP_DIR%\include;%INCLUDE%" set "LIB=%DPCPP_DIR%\lib;%LIB%" -Now download and unpack some recent TBB version for Windows, e.g. oneTBB 2021.2.0: +Now download and unpack some recent TBB version for Windows, e.g. oneTBB 2022.3.0: - https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-win.zip + https://github.com/oneapi-src/oneTBB/releases/download/v2022.3.0/oneapi-tbb-2022.3.0-win.zip To compile tutorials contained in this folder first create and enter a build folder inside the tutorial you want to compile. E.g. for the @@ -72,10 +72,10 @@ To properly configure your environment, you have to source the source dpcpp_compiler/startup.sh -Now download and unpack some recent TBB version for Linux, e.g. oneTBB 2021.2.0: +Now download and unpack some recent TBB version for Linux, e.g. oneTBB 2022.3.0: - wget https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-lin.tgz - tar xzf oneapi-tbb-2021.2.0-lin.tgz + wget https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2022.3.0-lin.tgz + tar xzf oneapi-tbb-2022.3.0-lin.tgz To compile tutorials contained in this folder first create and enter a build folder inside the tutorial you want to compile. E.g. for the diff --git a/tutorials/README.md.in b/tutorials/README.md.in index c350dc69fd..48c4237449 100644 --- a/tutorials/README.md.in +++ b/tutorials/README.md.in @@ -23,9 +23,9 @@ use the DPC++ compiler: set "INCLUDE=%DPCPP_DIR%\include;%INCLUDE%" set "LIB=%DPCPP_DIR%\lib;%LIB%" -Now download and unpack some recent TBB version for Windows, e.g. oneTBB 2021.2.0: +Now download and unpack some recent TBB version for Windows, e.g. oneTBB 2022.3.0: - https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-win.zip + https://github.com/oneapi-src/oneTBB/releases/download/v2022.3.0/oneapi-tbb-2022.3.0-win.zip To compile tutorials contained in this folder first create and enter a build folder inside the tutorial you want to compile. E.g. for the @@ -72,10 +72,10 @@ To properly configure your environment, you have to source the source dpcpp_compiler/startup.sh -Now download and unpack some recent TBB version for Linux, e.g. oneTBB 2021.2.0: +Now download and unpack some recent TBB version for Linux, e.g. oneTBB 2022.3.0: - wget https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2021.2.0-lin.tgz - tar xzf oneapi-tbb-2021.2.0-lin.tgz + wget https://github.com/oneapi-src/oneTBB/releases/download/v2022.3.0/oneapi-tbb-2022.3.0-lin.tgz + tar xzf oneapi-tbb-2022.3.0-lin.tgz To compile tutorials contained in this folder first create and enter a build folder inside the tutorial you want to compile. E.g. for the From 1fed0973f4cc6f4be92bebda25311a38be48fdc8 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Thu, 19 Feb 2026 09:44:48 +0100 Subject: [PATCH 2/4] Update tutorials/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- tutorials/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/README.md b/tutorials/README.md index 8c5bf91ffb..3808cc954a 100644 --- a/tutorials/README.md +++ b/tutorials/README.md @@ -74,7 +74,7 @@ To properly configure your environment, you have to source the Now download and unpack some recent TBB version for Linux, e.g. oneTBB 2022.3.0: - wget https://github.com/oneapi-src/oneTBB/releases/download/v2021.2.0/oneapi-tbb-2022.3.0-lin.tgz + wget https://github.com/oneapi-src/oneTBB/releases/download/v2022.3.0/oneapi-tbb-2022.3.0-lin.tgz tar xzf oneapi-tbb-2022.3.0-lin.tgz To compile tutorials contained in this folder first create and enter a From ac7b5e401d8d345a99abe09b7b3f18dba57907d7 Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Thu, 19 Feb 2026 09:45:14 +0100 Subject: [PATCH 3/4] Update scripts/cmake-presets/os.json Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- scripts/cmake-presets/os.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake-presets/os.json b/scripts/cmake-presets/os.json index f6c532fd27..4959c012ae 100644 --- a/scripts/cmake-presets/os.json +++ b/scripts/cmake-presets/os.json @@ -91,7 +91,7 @@ "EMBREE_TBB_2021_10_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.10.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", "EMBREE_TBB_2021_11_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.11.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", "EMBREE_TBB_2021_12_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.12.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", - "EMBREE_TBB_2022_3_0_DIR": "$env{APPS_PATH}/tbb/tbb-2021.12.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", + "EMBREE_TBB_2022_3_0_DIR": "$env{APPS_PATH}/tbb/tbb-2022.3.0-$env{EMBREE_TBB_VERSION_SUFFIX}/lib/cmake/tbb", "EMBREE_TBB_DIR": "" } } From fd2c9b06d647319d481f5796d41425a78b55185a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 8 May 2026 14:00:02 +0000 Subject: [PATCH 4/4] Update CMake TBB_DIR examples to use oneapi-tbb-2022.3.0 Agent-Logs-Url: https://github.com/RenderKit/embree/sessions/b1282a1f-ad86-4c40-a406-bc46f86ceed5 Co-authored-by: stefanatwork <93931354+stefanatwork@users.noreply.github.com> --- tutorials/README.md | 4 ++-- tutorials/README.md.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tutorials/README.md b/tutorials/README.md index 3808cc954a..732baeabd1 100644 --- a/tutorials/README.md +++ b/tutorials/README.md @@ -43,7 +43,7 @@ the Embree and TBB installation on your system. -D CMAKE_C_COMPILER=clang -D CMAKE_BUILD_TYPE=Release -D embree_DIR=%cd%\..\..\..\lib\cmake\embree-4.4.0\ - -D TBB_DIR=path_to_tbb\oneapi-tbb-2021.2.0\lib\cmake\tbb .. + -D TBB_DIR=path_to_tbb\oneapi-tbb-2022.3.0\lib\cmake\tbb .. Now you can build the tutorial: @@ -92,7 +92,7 @@ the Embree and TBB installation on your system. -D CMAKE_CXX_COMPILER=clang++ \ -D CMAKE_C_COMPILER=clang \ -D embree_DIR=`pwd`/../../../lib/cmake/embree-4.4.0/ \ - -D TBB_DIR=path_to_tbb/oneapi-tbb-2021.2.0/lib/cmake/tbb/ .. + -D TBB_DIR=path_to_tbb/oneapi-tbb-2022.3.0/lib/cmake/tbb/ .. Now you can build the tutorial: diff --git a/tutorials/README.md.in b/tutorials/README.md.in index 48c4237449..11574434ae 100644 --- a/tutorials/README.md.in +++ b/tutorials/README.md.in @@ -43,7 +43,7 @@ the Embree and TBB installation on your system. -D CMAKE_C_COMPILER=clang -D CMAKE_BUILD_TYPE=Release -D embree_DIR=%cd%\..\..\..\lib\cmake\embree-@EMBREE_VERSION@\ - -D TBB_DIR=path_to_tbb\oneapi-tbb-2021.2.0\lib\cmake\tbb .. + -D TBB_DIR=path_to_tbb\oneapi-tbb-2022.3.0\lib\cmake\tbb .. Now you can build the tutorial: @@ -92,7 +92,7 @@ the Embree and TBB installation on your system. -D CMAKE_CXX_COMPILER=clang++ \ -D CMAKE_C_COMPILER=clang \ -D embree_DIR=`pwd`/../../../lib/cmake/embree-@EMBREE_VERSION@/ \ - -D TBB_DIR=path_to_tbb/oneapi-tbb-2021.2.0/lib/cmake/tbb/ .. + -D TBB_DIR=path_to_tbb/oneapi-tbb-2022.3.0/lib/cmake/tbb/ .. Now you can build the tutorial: