Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
38a5c40e
Commit
38a5c40e
authored
7 years ago
by
Simon Heybrock
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Indexing/inc/MantidIndexing/IndexInfo.h
+0
-2
0 additions, 2 deletions
Framework/Indexing/inc/MantidIndexing/IndexInfo.h
Framework/Indexing/src/IndexInfo.cpp
+3
-5
3 additions, 5 deletions
Framework/Indexing/src/IndexInfo.cpp
with
3 additions
and
7 deletions
Framework/Indexing/inc/MantidIndexing/IndexInfo.h
+
0
−
2
View file @
38a5c40e
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Framework/Indexing/src/IndexInfo.cpp
+
3
−
5
View file @
38a5c40e
...
@@ -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
>,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment