Skip to content
Snippets Groups Projects
Commit 38a5c40e authored by Simon Heybrock's avatar Simon Heybrock
Browse files

Revert "Re #21181. Keep partitioner in IndexInfo permanently."

This reverts commit 285916c7.
parent 5011fd73
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,6 @@ class Communicator; ...@@ -17,7 +17,6 @@ class Communicator;
} }
namespace Indexing { namespace Indexing {
class GlobalSpectrumIndex; class GlobalSpectrumIndex;
class RoundRobinPartitioner;
class SpectrumIndexSet; class SpectrumIndexSet;
class SpectrumNumberTranslator; class SpectrumNumberTranslator;
...@@ -136,7 +135,6 @@ private: ...@@ -136,7 +135,6 @@ private:
nullptr}; nullptr};
mutable Kernel::cow_ptr<SpectrumNumberTranslator> m_spectrumNumberTranslator{ mutable Kernel::cow_ptr<SpectrumNumberTranslator> m_spectrumNumberTranslator{
nullptr}; nullptr};
mutable std::unique_ptr<RoundRobinPartitioner> m_partitioner;
}; };
} // namespace Indexing } // namespace Indexing
......
...@@ -80,9 +80,7 @@ IndexInfo::IndexInfo(const IndexInfo &other) ...@@ -80,9 +80,7 @@ IndexInfo::IndexInfo(const IndexInfo &other)
m_communicator( m_communicator(
Kernel::make_unique<Parallel::Communicator>(*other.m_communicator)), Kernel::make_unique<Parallel::Communicator>(*other.m_communicator)),
m_spectrumDefinitions(other.m_spectrumDefinitions), m_spectrumDefinitions(other.m_spectrumDefinitions),
m_spectrumNumberTranslator(other.m_spectrumNumberTranslator), m_spectrumNumberTranslator(other.m_spectrumNumberTranslator) {}
m_partitioner(
Kernel::make_unique<RoundRobinPartitioner>(*other.m_partitioner)) {}
IndexInfo::IndexInfo(IndexInfo &&) = default; IndexInfo::IndexInfo(IndexInfo &&) = default;
...@@ -309,11 +307,11 @@ void IndexInfo::makeSpectrumNumberTranslator( ...@@ -309,11 +307,11 @@ void IndexInfo::makeSpectrumNumberTranslator(
throw std::runtime_error("IndexInfo: unknown storage mode " + throw std::runtime_error("IndexInfo: unknown storage mode " +
Parallel::toString(m_storageMode)); Parallel::toString(m_storageMode));
} }
m_partitioner = Kernel::make_unique<RoundRobinPartitioner>( auto partitioner = Kernel::make_unique<RoundRobinPartitioner>(
numberOfPartitions, partition, numberOfPartitions, partition,
Partitioner::MonitorStrategy::TreatAsNormalSpectrum); Partitioner::MonitorStrategy::TreatAsNormalSpectrum);
m_spectrumNumberTranslator = Kernel::make_cow<SpectrumNumberTranslator>( m_spectrumNumberTranslator = Kernel::make_cow<SpectrumNumberTranslator>(
std::move(spectrumNumbers), *m_partitioner, partition); std::move(spectrumNumbers), *partitioner, partition);
} }
template MANTID_INDEXING_DLL IndexInfo::IndexInfo(std::vector<SpectrumNumber>, template MANTID_INDEXING_DLL IndexInfo::IndexInfo(std::vector<SpectrumNumber>,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment