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.

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

Fred ros realinput #45

Merged
merged 10 commits into from
Jul 10, 2017
Merged

Fred ros realinput #45

merged 10 commits into from
Jul 10, 2017

Conversation

mtazzari
Copy link
Owner

I fixed the implementation of real_to_complex()

Frederik Beaujean and others added 8 commits July 10, 2017 18:32
I want a clean C header file for those that use C/C++. The only reason we had
void* was to make cython happy. Now all functions that take a void*
make a cast and call the typed function. To keep things clean, we now
have three headers. One for C users, one for python, and one with the
typedefs that everyone needs. All headers end in .h, so they can be
used from both C and C++.

Not all tests pass on my machine. The failures are

* test_rotix
* test_loss
* test_sample[SP_par1]
related to #37
Nothing is computed, the test just ensures that galario can used from
C. This helped to fix a few problems and fixes #38.
* tests now compute the shift
* Update readme on build types
galario.cpp:
* conversion to complex with openmp and cuda kernel
* save some redundancies
* remove commented code
* replace missing hard-coded nthreads per block

libcommon.py:
* uniform input checks

test_galario.py:
* pass real images where appropriate
real_to_complex_d() kernel had a wrong implementation for a 1d array, so that
it was operating only the first nx elements, instead of nx*nx.
Now I implemented the 2d kernel and works perfectly.

All tests pass, both on CPU and GPU.
@mtazzari
Copy link
Owner Author

@fredRos
I have solved the issue, committed and pushed. Is this the right thing? I see now there are two pull requests. I thought that my push was going to add to your pull request.
How should we proceed now?

Frederik Beaujean added 2 commits July 10, 2017 23:09
@fredRos fredRos merged commit 08aeb2a into master Jul 10, 2017
@fredRos fredRos deleted the fredRos-realinput branch July 10, 2017 21:12
@fredRos
Copy link
Collaborator

fredRos commented Jul 10, 2017

Thanks for the fix. I copied the code but that was for a 1D block. Should have known better. A few minor fixes and it's now in master finally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants