Skip to content

Fixed OpenMP and CUDA guards #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chicsa wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixed OpenMP and CUDA guards #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
381a07a
Fixed OpenMP and CUDA guards
chicsa Sep 26, 2023
24c5292
Fixed multiple definition of MPI_COM_SELF, when MPI-enabled applicati…
chicsa Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/axom/quest/interface/internal/mpicomm_wrapper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
#ifdef AXOM_USE_MPI
#include <mpi.h>
#else
#ifndef MPI_VERSION
using MPI_Comm = int;
constexpr int MPI_COMM_SELF = -1;
#endif
#endif

#endif /* QUEST_MPICOMM_WRAPPER_HPP_ */
4 changes: 2 additions & 2 deletions src/axom/quest/interface/signed_distance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,14 +342,14 @@ void signed_distance_set_execution_space(SignedDistExec exec_space)
signed_distance_initialized(),
"signed distance query already initialized; setting option has no effect!");

#if defined(AXOM_USE_OPENMP) && defined(AXOM_USE_RAJA)
#if !defined(AXOM_USE_OPENMP) && !defined(AXOM_USE_RAJA)
if(exec_space == SignedDistExec::OpenMP)
{
SLIC_ERROR("Signed distance query not compiled with OpenMP support");
}
#endif

#if defined(AXOM_USE_GPU) && defined(AXOM_USE_RAJA)
#if !defined(AXOM_USE_GPU) && !defined(AXOM_USE_RAJA)
if(exec_space == SignedDistExec::GPU)
{
SLIC_ERROR("Signed distance query not compiled with GPU support");
Expand Down