From 193e3329caadf657606a35fa8521d4a62f56b3c6 Mon Sep 17 00:00:00 2001 From: Joseph Schuchart Date: Fri, 22 Nov 2024 11:27:40 -0500 Subject: [PATCH] Remove OpenMP dependency No code is actually using OpenMP. Some examples still have OpenMP commented out. I'll leave it there for historical reasons. Signed-off-by: Joseph Schuchart --- CMakeLists.txt | 2 -- examples/CMakeLists.txt | 4 ++-- examples/floyd-warshall/floyd_warshall_df.cc | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03d4105eb..230c23124 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,8 +220,6 @@ endif(MPI_FOUND) if (TTG_EXAMPLES) # TiledArray brings in BTAS AND linear algebra (BLAS++/LAPACK++) include(FindOrFetchTiledArray) - # OpenMP may also be used by some examples - find_package(OpenMP COMPONENTS CXX) # std::execution may also be used by some examples find_package(CXXStdExecution) endif (TTG_EXAMPLES) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b5d1ff622..e0dd5a49d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -75,8 +75,8 @@ add_ttg_executable(fw-apsp floyd-warshall/floyd_warshall.cc LINK_LIBRARIES MADwo add_ttg_executable(helloworld helloworld/helloworld.cpp) add_ttg_executable(simplegenerator simplegenerator/simplegenerator.cc RUNTIMES "mad") -if (OpenMP_CXX_FOUND AND TARGET std::execution) - add_ttg_executable(fw-apsp-df floyd-warshall/floyd_warshall_df.cc LINK_LIBRARIES OpenMP::OpenMP_CXX std::execution MADworld) +if (TARGET std::execution) + add_ttg_executable(fw-apsp-df floyd-warshall/floyd_warshall_df.cc LINK_LIBRARIES std::execution MADworld) endif () add_ttg_executable(ge ge/ge.cc SINGLERANKONLY) if (TARGET std::execution) diff --git a/examples/floyd-warshall/floyd_warshall_df.cc b/examples/floyd-warshall/floyd_warshall_df.cc index 4612848fc..8850962d7 100644 --- a/examples/floyd-warshall/floyd_warshall_df.cc +++ b/examples/floyd-warshall/floyd_warshall_df.cc @@ -28,8 +28,6 @@ using namespace ttg; #include "../blockmatrix.h" #include "ttg/util/bug.h" -//#include // - #include "FW-APSP/FloydIterativeKernelDF.h" // contains the iterative kernel #include "FW-APSP/FloydRecursiveSerialKernelDF.h" // contains the recursive but serial kernels // #include "FloydRecursiveParallelKernel.h" // contains the recursive and parallel kernels