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

bump master #165

Merged
merged 123 commits into from
Jun 16, 2022
Merged

bump master #165

merged 123 commits into from
Jun 16, 2022

Conversation

joeljonsson
Copy link
Collaborator

@joeljonsson joeljonsson commented Apr 9, 2022 •
edited
Loading

Once the remaining PRs (#163 #166) are merged into develop and stable, it is time to plan a bump of master

joeljonsson and others added 30 commits September 3, 2021 11:20
@joeljonsson
add LazyAccess and LazyIterator
dce235e
@joeljonsson
clean up GenIterator
ba84e15
@joeljonsson
add lazy iterator test
f7a2844
@joeljonsson
add lazy patch reconstruction function + test
be755f9
@cheesema
Change name to build and test
7521d99
@cheesema
Add some channel and time specific tests to coverage
55c801a
@cheesema
Fix missing pass through of channel and t, for call without particle …
e132e4c 
…name
@joeljonsson
Merge pull request #159 from AdaptiveParticles/add_io_tests
271aea2 
Add io tests
@joeljonsson
Merge branch 'develop' into lazy_loading
0eb05b8
@joeljonsson
resolve libtiff warnings
ca11baa
@joeljonsson
resolve libtiff deprecated type warnings
725d7a2
@joeljonsson
resolve deprecation warning
4cb179e
@joeljonsson
remove std::isnan check causing build errors on windows
1838fe6
@joeljonsson
add 'smooth' and 'level' lazy reconstruction functions
f33ad44
@joeljonsson
add tests for lazy reconstruct smooth and level
4db6b95
@joeljonsson
fix typo: downsamplePyrmaid -> downsamplePyramid
f7235f4
@joeljonsson
add downsamplePyramid method with reduction operators as templates
59ea7c8
@joeljonsson
add sample particles methods with reduction operators as templates
2b631ea
@joeljonsson
add find_boundary and dilate methods
40eeb80
@joeljonsson
add sample_labels_with_boundary method
a2f47df
@joeljonsson
rename sample_parts_from_img_downsampled -> sample_image, keep old me…
c322004 
…thods with deprecation warning
@joeljonsson
reformat find_neighbor if statements
70b389d
@joeljonsson
add lazy access example
2288c5d
@cheesema
Merge pull request #161 from AdaptiveParticles/label_sampling
30b923b 
Expand particle sampling methods
@joeljonsson
change 'read_particles' call to detect particle dataset
bbd84b7
@joeljonsson
split LazyData::init_file into LazyData::init and LazyData::init_tree…
dfa59e4 
…, add particle dataset detection and refactor usages
@joeljonsson
bump submodule gtest to latest commit
ff841a4
@joeljonsson
bump gtest version requirement to 1.10.0
f9a64fc
@cheesema
Merge pull request #160 from AdaptiveParticles/lazy_loading
4fec777 
Expand lazy functionality
@joeljonsson
remove commented out code
be8661c
joeljonsson and others added 13 commits June 1, 2022 12:42
@joeljonsson
add cuda gradient_cfd method
5838610
@joeljonsson
add test for cuda gradient_cfd method
d508d71
@joeljonsson
add cuda gradient_sobel method
df7c52b
@joeljonsson
add test for cuda gradient_sobel method
c1a51d0
@joeljonsson
add functions addSquare and elementWiseSqrt
ba2207e
@joeljonsson
add cuda gradient/sobel magnitude methods + tests
06da7ec
@joeljonsson
add additional test cases for gradient tests
a594f4a
@joeljonsson
automatically compute block and grid sizes in richardson_lucy
660825d
@joeljonsson
rename new convolution functions
c073c3f 
`isotropic_convolve_xxx` -> `isotropic_convolve_xxx_direct`.
Reinstante default arguments for the old function signatures to retain
the previous behavior.
@joeljonsson
add access initialization steps to gpu proceccing methods
36bd143
@joeljonsson
remove now redundant conversion of stencil
27559e3
@joeljonsson
add use_cuda option to Example_compute_gradient
96039d6
@joeljonsson
Merge pull request #175 from AdaptiveParticles/cuda_numerics
c869596 
Fix issue with APRStencil methods, expand cuda numerics functionality
@joeljonsson joeljonsson marked this pull request as ready for review June 10, 2022 11:08
@joeljonsson
Copy link
Collaborator Author

I think it's time to push this through. @krzysg @cheesema is there anything you feel should be changed/added before?

I guess there are a few breaking changes compared to the current master, so we might want to bump the major version. The CUDA pipeline should not break anything, so we can easily merge that in once it's working.

@krzysg
Copy link
Member

krzysg commented Jun 10, 2022 •
edited
Loading

The CUDA pipeline should not break anything, so we can easily merge that in once it's working.

Correct. It is quite independent part of code so should not be any problems in future.

I do not see anything against pushing it to master.

@joeljonsson joeljonsson requested a review from krzysg June 11, 2022 14:58
krzysg
krzysg previously approved these changes Jun 12, 2022
View reviewed changes
@joeljonsson joeljonsson requested a review from krzysg June 15, 2022 14:34
@joeljonsson
Copy link
Collaborator Author

ah, maybe I didn't have to re-request the review - sorry if so @krzysg . Once the tests have passed (and you approve, again) I'll push this through and create a new release

@joeljonsson joeljonsson merged commit dca7e7f into master Jun 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krzysg krzysg krzysg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@joeljonsson @krzysg @cheesema