Use oneTBB instead of tbb for centos

This builds on debian and centos is still running into issues using the newer
version of gcc to build.

Dockerfile_CENTOS

@@ -68,6 +68,7 @@ RUN dnf --enablerepo=powertools install -y --nobest \
     half \
     #libssl-devel \
     openssl-devel
+    gcc-toolset-11
     #zlib1g-devel && \
     #zlib-devel && \
 

rbuild.ini

@@ -4,12 +4,13 @@ cc = ${rocm_path}/llvm/bin/clang
 deps =
     ROCmSoftwarePlatform/rocm-recipes
     -f requirements.txt
-
+    oneapi-src/oneTBB@v2021.2.2
 [gh]
 ignore = danmar/cppcheck
 deps =
     -f dev-requirements.txt
     oneapi-src/oneDNN@v1.7
+    oneapi-src/oneTBB@v2021.9.0
 define =
     CMAKE_C_COMPILER_LAUNCHER=${deps_dir}/bin/ccache
     CMAKE_CXX_COMPILER_LAUNCHER=${deps_dir}/bin/ccache
@@ -22,6 +23,7 @@ cc = ${rocm_path}/llvm/bin/clang
 deps =
     -f dev-requirements.txt
     oneapi-src/oneDNN@v1.7
+    oneapi-src/oneTBB@v2021.9.0
 define =
     CMAKE_C_COMPILER_LAUNCHER=${deps_dir}/bin/ccache
     CMAKE_CXX_COMPILER_LAUNCHER=${deps_dir}/bin/ccache

src/CMakeLists.txt

@@ -247,14 +247,12 @@ target_include_directories(migraphx SYSTEM PUBLIC $<BUILD_INTERFACE:${HALF_INCLU
 find_package(Threads)
 target_link_libraries(migraphx PUBLIC Threads::Threads)
 
-find_package(TBB QUIET)
-if(NOT TBB_FOUND)
-#Check if TBB is installed in the proper RHEL DIR which is different from
-#debian installs /lib64 vs /usr/lib64
-    include(/usr/lib64/cmake/tbb)
-    find_package(TBB REQUIRED)
+if(EXISTS /opt/rh/gcc-toolset-11/root/usr/bin/g++)
+
 endif()
-target_link_libraries(migraphx PRIVATE TBB::tbb)
+
+find_package(TBB REQUIRED COMPONENTS tbb)
+target_link_libraries(migraphx PUBLIC TBB::tbb)
 
 find_package(nlohmann_json 3.8.0 REQUIRED)
 target_link_libraries(migraphx PRIVATE nlohmann_json::nlohmann_json)

tools/install_prereqs_centos.sh

@@ -33,7 +33,7 @@ export LANG=C.UTF-8
 
 
 # Need pip3 and Python headers to build dependencies
-dnf update && dnf install -y python3-pip python3-dev cmake rocm-cmake rocblas miopen-hip openmp-extras tbb2 tbb-devel
+dnf update && dnf install -y python3-pip python3-dev cmake rocm-cmake rocblas miopen-hip openmp-extras
 
 # Needed for cmake to build various pip packages
 pip3.8 install setuptools wheel