Skip to content

Commit

Permalink
Merge pull request #312 from devreal/remove-openmp
Browse files Browse the repository at this point in the history
Remove OpenMP dependency
  • Loading branch information
devreal authored Nov 22, 2024
2 parents dc1c090 + 193e332 commit 33bea54
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions examples/floyd-warshall/floyd_warshall_df.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ using namespace ttg;
#include "../blockmatrix.h"
#include "ttg/util/bug.h"

//#include <omp.h> //

#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
Expand Down

0 comments on commit 33bea54

Please sign in to comment.