diff --git a/scripts/cmake-presets/os.json b/scripts/cmake-presets/os.json index b595c58cd5..4959c012ae 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-2022.3.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..3808cc954a 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/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 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