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

Bugfix fof SAGA_final #3

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Bugfix fof SAGA_final #3

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
4e8dd56
final commit - segmentation fault still intermittent but last try wit…
samdporter Sep 30, 2024
a131cd9
Workaround for IndicatorBox leading to crash with accelerated=True
paskino Oct 17, 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 main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
>>> algorithm.run(np.inf, callbacks=metrics + submission_callbacks)
"""
#%%
import partitioner
from cil.optimisation.algorithms import ISTA, Algorithm
from cil.optimisation.functions import IndicatorBox, SAGAFunction
from cil.optimisation.utilities import (Preconditioner, Sampler,
StepSizeRule)
from sirf.contrib.partitioner import partitioner
from petric import Dataset
import numpy as np

Expand Down Expand Up @@ -246,7 +246,7 @@ def __init__(self, data: Dataset, update_objective_interval=10):
f = -FullGradientInitialiserFunction(obj_funs, sampler=sampler, init_steps=5)

preconditioner = BSREMPreconditioner(obj_funs, epsilon=data.OSEM_image.max()/1e6, freeze_iter=10*update_interval+5)
g = IndicatorBox(lower=0, accelerated=True) # non-negativity constraint
g = IndicatorBox(lower=0, accelerated=False) # non-negativity constraint

step_size_rule = ArmijoStepSearchRule(0.08, beta, decay, max_iter=100, tol=0.2, init_steps=5, update_interval=10*update_interval+5)

Expand Down
264 changes: 0 additions & 264 deletions partitioner.py
View file
Open in desktop

This file was deleted.