-
Notifications
You must be signed in to change notification settings - Fork 425
Updated TBB version to 2022.3 #586
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @copilot apply changes based on this feedback There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated the CMake There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated in 8d038cc: both Windows and Linux |
||
|
|
||
| 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 | ||
|
|
@@ -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: | ||
|
|
||
|
|
@@ -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 | ||
|
|
@@ -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: | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @copilot apply changes based on this feedback There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated the CMake There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated in 8d038cc: both Windows and Linux |
||
|
|
||
| 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 | ||
|
|
@@ -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: | ||
|
|
||
|
|
@@ -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 | ||
|
|
@@ -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: | ||
|
|
||
|
|
||
There was a problem hiding this comment.
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.