Skip to content

bugfix: Fix axom's MSVC with OpenMP build #1977

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

Merged
johnbowen42 merged 6 commits into from
Jan 26, 2026
Merged

bugfix: Fix axom's MSVC with OpenMP build #1977

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddb4788
Fix bug caused by compiling a library including RAJA with openmp and …
johnbowen42 Jan 15, 2026
8ae9134
Fix MSVC OpenMP bug
johnbowen42 Jan 15, 2026
237d32b
Merge branch 'develop' into bugfix/bowen/msvc-openmp-bugs
johnbowen42 Jan 22, 2026
de085ef
add static assert
johnbowen42 Jan 23, 2026
9c679a9
Fix omp.h conditional include on MSVC
johnbowen42 Jan 26, 2026
8631d76
Merge branch 'develop' into bugfix/bowen/msvc-openmp-bugs
johnbowen42 Jan 26, 2026
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
3 changes: 3 additions & 0 deletions include/RAJA/internal/ThreadUtils_CPU.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
#include "RAJA/config.hpp"

#include "RAJA/pattern/thread.hpp"
#if defined(RAJA_ENABLE_OPENMP)
#include <omp.h>
#include "RAJA/policy/openmp/thread.hpp"
#endif
#include "RAJA/policy/sequential/thread.hpp"

namespace RAJA
Expand Down
4 changes: 4 additions & 0 deletions include/RAJA/policy/openmp/forall.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ forall_impl(resources::Host host_res,
}
else
{
// This branch handles the case of an OpenMP reduction through the RAJA::kernel
// abstraction. MSVC is not supported in this case.
#if !defined(RAJA_COMPILER_MSVC)
auto reducers_tuple = loop_body.data.param_tuple;

using EXEC_POL = camp::decay<InnerPolicy>;
Expand Down Expand Up @@ -110,6 +113,7 @@ forall_impl(resources::Host host_res,
}
}
RAJA::expt::detail::resolve_params<EXEC_POL>(reducers_tuple);
#endif
}
return resources::EventProxy<resources::Host>(host_res);
}
Expand Down