Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable logging within distributed OpenMP calls by default and make all logging thread safe. #1243

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Disable logging within distributed OpenMP calls by default and make all logging thread safe. #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876cae9
Changed logging level to 3 for the distributable thread updates. Adde…
Sep 6, 2023
1c6453d
Updated release notes.
Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions documentation/release_5.2.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ <h3>Changed functionality</h3>
<li>The parameter <code>use_view_offset</code> was removed from the <code>interpolate_projdata</code> functions. View-offset is now always taken into account.
<br /><a href="https://github.com/UCL/STIR/pull/1172/">PR #1172</a>.
</li>
<li>The info, warning and error calls are thread safe now (which makes them slower), and the logging output in <code>distributable.cxx</code> was changed from verbosity 2 (which is the STIR default) to verbosity 3.
This is to reduce the default output during iterative reconstructions.
<br /><a href="https://github.com/UCL/STIR/pull/1243/">PR #1243</a>.
</li>
</ul>

<h3>Deprecated functionality</h3>
Expand Down
27 changes: 16 additions & 11 deletions src/buildblock/TextWriter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,22 @@ aTextWriter* TextWriterHandle::warning_channel_;
aTextWriter* TextWriterHandle::error_channel_;

void writeText(const char* text, OUTPUT_CHANNEL channel) {
TextWriterHandle h;
switch (channel) {
case INFORMATION_CHANNEL:
h.print_information(text);
break;
case WARNING_CHANNEL:
h.print_warning(text);
break;
case ERROR_CHANNEL:
h.print_error(text);
}
#if defined(STIR_OPENMP)
#pragma omp critical(TEXTWRITER)
#endif
{
TextWriterHandle h;
switch (channel) {
case INFORMATION_CHANNEL:
h.print_information(text);
break;
case WARNING_CHANNEL:
h.print_warning(text);
break;
case ERROR_CHANNEL:
h.print_error(text);
}
}
}

END_NAMESPACE_STIR
4 changes: 2 additions & 2 deletions src/recon_buildblock/distributable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@ void distributable_computation(
const int thread_num=omp_get_thread_num();
info(boost::format("Thread %d/%d calculating segment_num: %d, view_num: %d")
% thread_num % omp_get_num_threads()
% view_segment_num.segment_num() % view_segment_num.view_num(), 2);
% view_segment_num.segment_num() % view_segment_num.view_num(), 3);
#else
info(boost::format("calculating segment_num: %d, view_num: %d")
% view_segment_num.segment_num() % view_segment_num.view_num(), 2);
% view_segment_num.segment_num() % view_segment_num.view_num(), 3);
#endif

#ifdef STIR_OPENMP
Expand Down