Skip to content

Commit ac26fe5

Browse files
authored
Merge pull request #1505 from LLNL/bugfix/gunney/uses-mem-space
Host execution space can use more than just its default and unified m…
2 parents 28b5401 + 41f612b commit ac26fe5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/axom/core/execution/internal/omp_exec.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ struct execution_space<OMP_EXEC>
6666
}
6767
static bool usesMemorySpace(axom::MemorySpace m) noexcept
6868
{
69-
return m == memory_space
69+
return m == MemorySpace::Dynamic
7070
#ifdef AXOM_USE_UMPIRE
71-
|| m == MemorySpace::Unified
71+
|| m == MemorySpace::Host || m == MemorySpace::Unified
7272
#endif
7373
;
7474
}

src/axom/core/execution/internal/seq_exec.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ struct execution_space<SEQ_EXEC>
7575
}
7676
static bool usesMemorySpace(axom::MemorySpace m) noexcept
7777
{
78-
return m == memory_space
78+
return m == MemorySpace::Dynamic
7979
#ifdef AXOM_USE_UMPIRE
80-
|| m == MemorySpace::Unified
80+
|| m == MemorySpace::Host || m == MemorySpace::Unified
8181
#endif
8282
;
8383
}

0 commit comments

Comments
 (0)