Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 1 addition & 0 deletions scripts/cmake-presets/os.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": ""
}
}
Expand Down
10 changes: 5 additions & 5 deletions scripts/cmake-presets/release.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This are still cmake preset setting that do not exist anymore.

"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion scripts/cmake-presets/tbb.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
10 changes: 5 additions & 5 deletions tutorials/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +26 to +28
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

@copilot apply changes based on this feedback

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Updated the CMake TBB_DIR examples in tutorials/README.md (both Windows and Linux sections) to reference oneapi-tbb-2022.3.0 instead of oneapi-tbb-2021.2.0. Committed in fd2c9b0.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Updated in 8d038cc: both Windows and Linux -D TBB_DIR=... examples now use oneapi-tbb-2022.3.0 for consistency.


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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tutorials/README.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +26 to +28
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

@copilot apply changes based on this feedback

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Updated the CMake TBB_DIR examples in tutorials/README.md.in (both Windows and Linux sections) to reference oneapi-tbb-2022.3.0 instead of oneapi-tbb-2021.2.0. Committed in fd2c9b0.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Updated in 8d038cc: both Windows and Linux -D TBB_DIR=... examples now use oneapi-tbb-2022.3.0 so the template stays consistent.


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
Expand Down Expand Up @@ -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
Expand Down
Loading