From f81dc8c3810c2c579cc849a7023d6a9fc0e96c24 Mon Sep 17 00:00:00 2001 From: Simon Heybrock <simon.heybrock@esss.se> Date: Mon, 19 Feb 2018 11:21:18 +0100 Subject: [PATCH] Re #21631. MPI support for LoadEventAndCompress. --- .../inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h | 4 ++++ Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp | 6 ++++++ dev-docs/source/AlgorithmMPISupport.rst | 1 + 3 files changed, 11 insertions(+) diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h index 7860af3fdb9..ce8aaf3dba4 100644 --- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h +++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h @@ -45,6 +45,10 @@ protected: API::MatrixWorkspace_sptr processChunk(API::MatrixWorkspace_sptr &wksp, double filterBadPulses); + Parallel::ExecutionMode getParallelExecutionMode( + const std::map<std::string, Parallel::StorageMode> &storageModes) + const override; + private: void init() override; void exec() override; diff --git a/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp b/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp index 15744aa6e5c..7d97cad9c7a 100644 --- a/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp +++ b/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp @@ -239,5 +239,11 @@ void LoadEventAndCompress::exec() { setProperty("OutputWorkspace", total); } +Parallel::ExecutionMode LoadEventAndCompress::getParallelExecutionMode( + const std::map<std::string, Parallel::StorageMode> &storageModes) const { + static_cast<void>(storageModes); + return Parallel::ExecutionMode::Distributed; +} + } // namespace WorkflowAlgorithms } // namespace Mantid diff --git a/dev-docs/source/AlgorithmMPISupport.rst b/dev-docs/source/AlgorithmMPISupport.rst index f057f08c116..0961671be45 100644 --- a/dev-docs/source/AlgorithmMPISupport.rst +++ b/dev-docs/source/AlgorithmMPISupport.rst @@ -542,6 +542,7 @@ LoadCanSAS1D Identical see ``IFileLoader LoadDaveGrp Identical see ``IFileLoader`` LoadDiffCal Identical LoadEmptyInstrument Identical see ``IFileLoader`` +LoadEventAndCompress Distributed LoadEventNexus Distributed storage mode of output cannot be changed via a parameter currently, min and max bin boundary are not globally the same LoadEventPreNexus2 Identical see ``IFileLoader`` LoadFITS Identical see ``IFileLoader`` -- GitLab