Merge pull request #1591 from finos/remove-tbb

Remove TBB
finos · Oct 24, 2021 · 64bdfd7 · 64bdfd7
2 parents a74343c + 7a65a43
commit 64bdfd7
Show file tree

Hide file tree

Showing 21 changed files with 52 additions and 403 deletions.
diff --git a/cmake/TBB.txt.in b/cmake/TBB.txt.in
diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake
diff --git a/cpp/perspective/CMakeLists.txt b/cpp/perspective/CMakeLists.txt
@@ -307,18 +307,6 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
 		include_directories( ${Boost_INCLUDE_DIRS} )
 	endif()
 
-	# TBB is a dependency that we can build as part of our build process, so it
-	# does not necessarily have to be present before Perspective is built.
-	find_package(TBB)
-
-	if(NOT TBB_FOUND)
-		psp_build_message("${Red}TBB could not be located - building TBB from external source ${ColorReset}")
-		psp_build_dep("tbb" "${PSP_CMAKE_MODULE_PATH}/TBB.txt.in")
-	else()
-		psp_build_message("${Cyan}Found TBB: TBB_INCLUDE_DIRS - ${TBB_INCLUDE_DIRS}, TBB_LIBRARY_DIRS - ${TBB_LIBRARY_DIRS} ${ColorReset}")
-		include_directories( ${TBB_INCLUDE_DIRS} )
-	endif()
-
 	if(WIN32)
 		foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
 			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd${warning}")
@@ -666,9 +654,6 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
 		# Link against minimal arrow static library
 		target_link_libraries(psp arrow)
 
-		target_link_libraries(psp tbb)
-		target_link_libraries(binding tbb)
-
 		target_link_libraries(binding psp)
 
 		# The compiled libraries will be put in CMAKE_LIBRARY_OUTPUT_DIRECTORY by default. In the
@@ -678,11 +663,6 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
 		add_custom_command(TARGET psp POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:psp> ${PSP_PYTHON_SRC}/table/)
 		add_custom_command(TARGET binding POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:binding> ${PSP_PYTHON_SRC}/table/)
 
-		if(WIN32)
-			if(NOT TBB_FOUND)
-				add_custom_command(TARGET binding POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:tbb> ${PSP_PYTHON_SRC}/table/)
-			endif()
-		endif()
 		########################
 	else()
 		add_library(psp SHARED ${WASM_SOURCE_FILES})

diff --git a/cpp/perspective/src/cpp/arg_sort.cpp b/cpp/perspective/src/cpp/arg_sort.cpp
@@ -12,9 +12,7 @@
 #include <perspective/arg_sort.h>
 #include <perspective/multi_sort.h>
 #include <perspective/scalar.h>
-#ifdef PSP_PARALLEL_FOR
-#include <tbb/parallel_sort.h>
-#endif
+
 namespace perspective {
 
 void

diff --git a/cpp/perspective/src/cpp/context_grouped_pkey.cpp b/cpp/perspective/src/cpp/context_grouped_pkey.cpp
@@ -535,7 +535,7 @@ t_ctx_grouped_pkey::rebuild() {
 
     t_datumcmp cmp;
 
-    PSP_PSORT(data.begin(), data.end(), cmp);
+    std::sort(data.begin(), data.end(), cmp);
 
     std::vector<t_uindex> root_children;
 
@@ -618,7 +618,7 @@ t_ctx_grouped_pkey::rebuild() {
     }
 
 #ifdef PSP_PARALLEL_FOR
-    tbb::parallel_for(0, int(naggs), 1,
+    parallel_for(int(naggs),
         [&aggtable, &aggindices, &aggspecs, &tbl](int aggnum)
 #else
     for (t_uindex aggnum = 0; aggnum < naggs; ++aggnum)