diff --git a/HeterogeneousCore/MPICore/plugins/MPIReceiver.cc b/HeterogeneousCore/MPICore/plugins/MPIReceiver.cc index 0d4842363181..d669d2fbb35c 100644 --- a/HeterogeneousCore/MPICore/plugins/MPIReceiver.cc +++ b/HeterogeneousCore/MPICore/plugins/MPIReceiver.cc @@ -12,7 +12,6 @@ #include "FWCore/Utilities/interface/Exception.h" #include "HeterogeneousCore/MPICore/interface/MPIToken.h" - #include "FWCore/Concurrency/interface/Async.h" #include "FWCore/Concurrency/interface/chain_first.h" #include "FWCore/Framework/interface/stream/EDProducer.h" @@ -64,7 +63,7 @@ public: void acquire(edm::Event const& event, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder holder) final { const MPIToken& token = event.get(upstream_); - + edm::Service as; as->runAsync( std::move(holder), @@ -72,12 +71,11 @@ public: int numProducts; token.channel()->receiveProduct(instance_, numProducts); // edm::LogAbsolute("MPIReceiver") << "Received number of products: " << numProducts; - assert((numProducts == static_cast(products_.size())) && "Receiver number of products is different than expected"); + assert((numProducts == static_cast(products_.size())) && + "Receiver number of products is different than expected"); }, - []() { return "Calling MPIReceiver::acquire()"; } - ); + []() { return "Calling MPIReceiver::acquire()"; }); } - void produce(edm::Event& event, edm::EventSetup const&) final { // read the MPIToken used to establish the communication channel diff --git a/HeterogeneousCore/MPICore/plugins/MPISender.cc b/HeterogeneousCore/MPICore/plugins/MPISender.cc index 34539702e841..a2e3416bfb24 100644 --- a/HeterogeneousCore/MPICore/plugins/MPISender.cc +++ b/HeterogeneousCore/MPICore/plugins/MPISender.cc @@ -98,18 +98,14 @@ public: const MPIToken& token = event.get(upstream_); int numProducts = static_cast(products_.size()); - + // Submit sending of all products to run in the additional asynchronous threadpool edm::Service as; as->runAsync( std::move(holder), - [this, token, numProducts]() { - token.channel()->sendProduct(instance_, numProducts); - }, - []() { return "Calling MPISender::acquire()"; } - ); + [this, token, numProducts]() { token.channel()->sendProduct(instance_, numProducts); }, + []() { return "Calling MPISender::acquire()"; }); } - void produce(edm::Event& event, edm::EventSetup const&) final { MPIToken token = event.get(upstream_);