Skip to content

Commit

Permalink
Removes MPI related dependencies. (libocca#608)
Browse files Browse the repository at this point in the history
  • Loading branch information
kris-rowe committed Aug 12, 2022
1 parent f58868b commit 9639c0d
Show file tree
Hide file tree
Showing 22 changed files with 0 additions and 867 deletions.
23 changes: 0 additions & 23 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ option(ENABLE_OPENCL "Build with OpenCL if available" ON)
option(ENABLE_HIP "Build with HIP if available" ON)
option(ENABLE_METAL "Build with Metal if available" ON)
option(ENABLE_DPCPP "Build with SYCL/DPCPP if available" ON)
option(ENABLE_MPI "Build with MPI if available" OFF)

option(ENABLE_TESTS "Build tests" OFF)
option(ENABLE_EXAMPLES "Build simple examples" OFF)
Expand Down Expand Up @@ -223,28 +222,6 @@ if(ENABLE_METAL AND APPLE)
endif()
#=======================================

#---[ MPI ]-----------------------------
if(ENABLE_MPI)
find_package(MPI)

if(MPI_FOUND)
set(OCCA_MPI_ENABLED 1)

message("-- MPI include dirs: ${MPI_CXX_INCLUDE_DIRS}")
message("-- MPI libraries: ${MPI_CXX_LIBRARIES}")
message("-- MPI link flags: ${MPI_CXX_LINK_FLAGS}")
message("-- MPI executable: ${MPIEXEC_EXECUTABLE}")
message("-- MPI numproc flag: ${MPIEXEC_NUMPROC_FLAG}")

# Use the provided imported target MPI::MPI_CXX,
# (which wraps the _INCLUDE_DIRS and _LIBRARIES,) to make our package relocatable
target_link_libraries(libocca PUBLIC MPI::MPI_CXX)
else(MPI_FOUND)
set(OCCA_MPI_ENABLED 0)
endif(MPI_FOUND)
endif(ENABLE_MPI)
#=======================================

# Generate CompiledDefines from libraries we found
configure_file(
scripts/build/compiledDefinesTemplate.hpp.in
Expand Down
3 changes: 0 additions & 3 deletions cmake/ExportAndPackageConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ endif()
if(OCCA_METAL_ENABLED)
string(APPEND exportPackageDependencies "find_dependency(METAL)\n")
endif()
if (OCCA_MPI_ENABLED)
string(APPEND exportPackageDependencies "find_dependency(MPI)\n")
endif()

# List of what targets are exported, for use in configuring occaConfig.cmake.in
# Explicit list because unfortunately no easy way to retrieve it through cmake, even though they all are part of the EXPORT occaExport
Expand Down
8 changes: 0 additions & 8 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,5 @@ if (ENABLE_FORTRAN)
endif()
endmacro()

macro(compile_fortran_mpi_example_with_modes target file)
add_executable(examples_fortran_${target} ${file})
target_link_libraries(examples_fortran_${target} libocca MPI::MPI_Fortran)
if (ENABLE_TESTS)
add_mpi_test_with_modes(examples_fortran_${target})
endif()
endmacro()

add_subdirectory(fortran)
endif()
3 changes: 0 additions & 3 deletions examples/cpp/08_mpi/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions examples/cpp/08_mpi/CMakeLists.txt

This file was deleted.

30 changes: 0 additions & 30 deletions examples/cpp/08_mpi/Makefile

This file was deleted.

15 changes: 0 additions & 15 deletions examples/cpp/08_mpi/README.md

This file was deleted.

8 changes: 0 additions & 8 deletions examples/cpp/08_mpi/addVectors.okl

This file was deleted.

91 changes: 0 additions & 91 deletions examples/cpp/08_mpi/main.cpp

This file was deleted.

1 change: 0 additions & 1 deletion examples/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ add_subdirectory(04_generic_inline_kernel)
add_subdirectory(05_custom_types)
add_subdirectory(06_shared_memory)
add_subdirectory(07_streams)
add_subdirectory(08_mpi)
add_subdirectory(09_native_cpp_kernels)
add_subdirectory(10_native_c_kernels)
add_subdirectory(11_native_cuda_kernels)
Expand Down
6 changes: 0 additions & 6 deletions examples/fortran/10_mpi/CMakeLists.txt

This file was deleted.

24 changes: 0 additions & 24 deletions examples/fortran/10_mpi/Makefile

This file was deleted.

8 changes: 0 additions & 8 deletions examples/fortran/10_mpi/addVectors.okl

This file was deleted.

Loading

0 comments on commit 9639c0d

Please sign in to comment.