-
Notifications
You must be signed in to change notification settings - Fork 6
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.
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
Upgrade packages post 2.8 release #2280
Conversation
8298cf5
to
09a5663
Compare
09a5663
to
28d9c4b
Compare
8c23ce4
to
0078f55
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On IDAaaS and locally on linux I get a failure in the system test TestGuiSystemReconstruction.test_refine
. I get the same error when i press the Minimise Error button in the recon window. Odd that this passes on github actions.
ERROR mantidimaging.gui.dialogs.async_task.task:task.py:53 Failed to execute task: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (2,) + inhomogeneous part.
Traceback (most recent call last):
File "/home/sam/git/mantidimaging/mantidimaging/gui/dialogs/async_task/task.py", line 50, in run
self.result = call_with_known_parameters(self.task_function, **self.kwargs)
File "/home/sam/git/mantidimaging/mantidimaging/core/utility/func_call.py", line 12, in call_with_known_parameters
return func(**ka)
File "/home/sam/git/mantidimaging/mantidimaging/gui/windows/recon/model.py", line 249, in auto_find_minimisation_sqsum
cor = reconstructor.find_cor(self.images, slice, initial_cor[idx], recon_params)
File "/home/sam/git/mantidimaging/mantidimaging/core/reconstruct/astra_recon.py", line 102, in find_cor
return minimize(minimizer_function, start_cor, method='nelder-mead', tol=0.1).x[0]
File "/home/sam/mambaforge/envs/mantidimaging-dev/lib/python3.10/site-packages/scipy/optimize/_minimize.py", line 719, in minimize
res = _minimize_neldermead(fun, x0, args, callback, bounds=bounds,
File "/home/sam/mambaforge/envs/mantidimaging-dev/lib/python3.10/site-packages/scipy/optimize/_optimize.py", line 817, in _minimize_neldermead
fsim[k] = func(sim[k])
File "/home/sam/mambaforge/envs/mantidimaging-dev/lib/python3.10/site-packages/scipy/optimize/_optimize.py", line 526, in function_wrapper
fx = function(np.copy(x), *(wrapper_args + args))
File "/home/sam/git/mantidimaging/mantidimaging/core/reconstruct/astra_recon.py", line 100, in minimizer_function
return -get_sumsq(AstraRecon.single_sino(images.sino(slice_idx), ScalarCoR(cor), proj_angles, recon_params))
File "/home/sam/git/mantidimaging/mantidimaging/core/reconstruct/astra_recon.py", line 118, in single_sino
vectors = vec_geom_init2d(proj_angles, 1.0, cor.to_vec(image_width).value)
File "/home/sam/git/mantidimaging/mantidimaging/core/reconstruct/astra_recon.py", line 39, in vec_geom_init2d
vectors[i, 2:4] = np.dot(rotation_matrix2d(theta), d0)[:] # center of detector position
ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (2,) + inhomogeneous part.
Traceback (most recent call last):
File "/home/sam/git/mantidimaging/mantidimaging/gui/test/gui_system_reconstruction_test.py", line 103, in <lambda>
QTimer.singleShot(SHORT_DELAY, lambda: self._click_cor_inspect())
File "/home/sam/git/mantidimaging/mantidimaging/gui/test/gui_system_reconstruction_test.py", line 70, in _click_cor_inspect
cls._wait_for_widget_visible(CORInspectionDialogView)
File "/home/sam/git/mantidimaging/mantidimaging/gui/test/gui_system_base.py", line 98, in _wait_for_widget_visible
raise RuntimeError("_wait_for_stack_selector reach max retries")
RuntimeError: _wait_for_stack_selector reach max retries
XFAIL (Unresolved, see #1641)
I'll see if I can work out what is causing this.
The error only happens locally because its being called from |
Looks like it is the d0 line in
|
After running the systems tests on windows, I'm getting the following failures: NOTE :
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, Working here.
Issue
Closes #2268, progresses #2267.
Description
This PR updates the following packages used in MI:
astropy
= 5.0.* -> 6.0.*scipy
= 1.8.* -> 1.14.*numpy
= 1.23.* -> 1.26.*algotom
= 1.0.* -> 1.6.*cudatoolkit
= 10.2.* -> 11.8.*cupy
= 10.2.* -> 12.3.*jenkspy
= 0.2.0 = 0.4.*Testing
make check
Acceptance Criteria
Check that you can rebuild the dev environment without any conflicts with
python ./setup.py create_dev_env
and then MI runs as normal.
NOTE: There will be some depreciation warnings related to
numpy
, these will be dealt with in a future PR.Also, some packages have been updated even though they were not in the original scope as there were conflicts with the dependencies of the packages we were trying to upgrade, e.g.
numpy
andscipy
Documentation
Will add release note