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

Jump to bottom

remove multiple exit from prange #1901

Merged
merged 8 commits into from
Oct 16, 2024
Merged

remove multiple exit from prange #1901

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
728efaf
remove multiple exit from prange
paskino Aug 22, 2024
0752322
Added description of kl_div fix
paskino Sep 24, 2024
7a17552
Merge branch 'master' into kl-multiple-exits
paskino Sep 24, 2024
5fe4179
skips computation of KL divergence if inf was already computed
paskino Oct 1, 2024
e71f22c
Merge branch 'master' into kl-multiple-exits
paskino Oct 1, 2024
9c23739
use single int for stopping threads and add unit test
paskino Oct 2, 2024
6011878
Merge branch 'master' into kl-multiple-exits
paskino Oct 16, 2024
f16cce6
updated changelog
paskino Oct 16, 2024
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: 2 additions & 2 deletions Wrappers/Python/cil/optimisation/functions/KullbackLeibler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def kl_div(x, y, eta):
accumulator[get_thread_id()] += Y
else:
# out.flat[i] = numpy.inf
return numpy.inf
accumulator[get_thread_id()] = numpy.inf
paskino marked this conversation as resolved.
Show resolved Hide resolved
return sum(accumulator)

@njit(parallel=True)
Expand All @@ -372,7 +372,7 @@ def kl_div_mask(x, y, eta, mask):
accumulator[get_thread_id()] += Y
else:
# out.flat[i] = numpy.inf
return numpy.inf
accumulator[get_thread_id()] = numpy.inf
paskino marked this conversation as resolved.
Show resolved Hide resolved
return sum(accumulator)

# convex conjugate
Expand Down
Loading