Skip to content

Commit 7c5280b

Browse files
committed
Set parallel execution policy
1 parent 77636f3 commit 7c5280b

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

demo/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ void
152152
advect()
153153
{
154154
#ifdef _MSC_VER
155-
concurrency::parallel_for_each
155+
concurrency::parallel_for_each(
156156
#elif defined(__APPLE__) && defined(__clang__)
157-
std::for_each
157+
std::for_each(oneapi::dpl::execution::par,
158158
#else
159-
__gnu_parallel::for_each
159+
__gnu_parallel::for_each(
160160
#endif
161-
(positions.begin(), positions.end(), [&](std::array<Real, 3>& x)
161+
positions.begin(), positions.end(), [&](std::array<Real, 3>& x)
162162
{
163163
std::array<Real, 3> v = enright_velocity_field(x);
164164
x[0] += static_cast<Real>(0.005) * v[0];

include/Config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace CompactNSearch
1515
#ifdef _MSC_VER
1616
#include <ppl.h>
1717
#elif defined(__APPLE__) && defined(__clang__)
18+
#include <oneapi/dpl/execution>
1819
#include <oneapi/dpl/algorithm>
1920
#else
2021
#include <parallel/algorithm>

src/CompactNSearch.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,13 @@ NeighborhoodSearch::update_point_sets()
235235

236236
// Precompute cell indices.
237237
#ifdef _MSC_VER
238-
concurrency::parallel_for_each
238+
concurrency::parallel_for_each(
239239
#elif defined(__APPLE__) && defined(__clang__)
240-
std::for_each
240+
std::for_each(oneapi::dpl::execution::par,
241241
#else
242-
__gnu_parallel::for_each
242+
__gnu_parallel::for_each(
243243
#endif
244-
(m_point_sets.begin(), m_point_sets.end(), [&](PointSet& d)
244+
m_point_sets.begin(), m_point_sets.end(), [&](PointSet& d)
245245
{
246246
if (d.is_dynamic())
247247
{
@@ -316,13 +316,13 @@ NeighborhoodSearch::erase_empty_entries(std::vector<unsigned int> const& to_dele
316316

317317
// Perform neighborhood search.
318318
#ifdef _MSC_VER
319-
concurrency::parallel_for_each
319+
concurrency::parallel_for_each(
320320
#elif defined(__APPLE__) && defined(__clang__)
321-
std::for_each
321+
std::for_each(oneapi::dpl::execution::par,
322322
#else
323-
__gnu_parallel::for_each
323+
__gnu_parallel::for_each(
324324
#endif
325-
(kvps.begin(), kvps.end(), [&](std::pair<HashKey const, unsigned int>* kvp_)
325+
kvps.begin(), kvps.end(), [&](std::pair<HashKey const, unsigned int>* kvp_)
326326
{
327327
auto& kvp = *kvp_;
328328

@@ -416,13 +416,13 @@ NeighborhoodSearch::query()
416416

417417
// Perform neighborhood search.
418418
#ifdef _MSC_VER
419-
concurrency::parallel_for_each
419+
concurrency::parallel_for_each(
420420
#elif defined(__APPLE__) && defined(__clang__)
421-
std::for_each
421+
std::for_each(oneapi::dpl::execution::par,
422422
#else
423-
__gnu_parallel::for_each
423+
__gnu_parallel::for_each(
424424
#endif
425-
(kvps.begin(), kvps.end(), [&](std::pair<HashKey const, unsigned int> const* kvp_)
425+
kvps.begin(), kvps.end(), [&](std::pair<HashKey const, unsigned int> const* kvp_)
426426
{
427427
auto const& kvp = *kvp_;
428428
HashEntry const& entry = m_entries[kvp.second];
@@ -478,13 +478,13 @@ NeighborhoodSearch::query()
478478
std::vector<Spinlock> entry_locks(m_entries.size());
479479

480480
#ifdef _MSC_VER
481-
concurrency::parallel_for_each
481+
concurrency::parallel_for_each(
482482
#elif defined(__APPLE__) && defined(__clang__)
483-
std::for_each
483+
std::for_each(oneapi::dpl::execution::par,
484484
#else
485-
__gnu_parallel::for_each
485+
__gnu_parallel::for_each(
486486
#endif
487-
(kvps.begin(), kvps.end(), [&](std::pair<HashKey const, unsigned int> const* kvp_)
487+
kvps.begin(), kvps.end(), [&](std::pair<HashKey const, unsigned int> const* kvp_)
488488
{
489489
auto const& kvp = *kvp_;
490490
HashEntry const& entry = m_entries[kvp.second];

0 commit comments

Comments
 (0)