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

Some fixes around hpx compute #2472

Merged
merged 3 commits into from Feb 4, 2017

Conversation

Projects
None yet
3 participants
@atrantan
Copy link
Contributor

commented Jan 30, 2017

This patch :

  • Properly compiles the new cuda example cublas_matmult
  • Fixes issue when for_each is used in Cuda code
@biddisco
Copy link
Contributor

left a comment

Setting the cuda flag ON and renaming to .cu is forcing the example to be compiled with nvcc. The example was intended to NOT be compiled with NVCC when the cuda allocator is not used. The cublas example does not execute device code without it.
What's the reason for the change?

@atrantan

This comment has been minimized.

Copy link
Contributor Author

commented Jan 31, 2017

@biddisco Got the error fatal error: cuda_runtime.h: No such file or directory. To keep it in c++ file, I suggest to call include_directories with CUDA_INCLUDE_DIRS (variable defined after using FindCuda in cmake) and link the executable with linker flags defined in CUDA_LIBRARIES and CUDA_CUBLAS_LIBRARIES (also defined after using FindCuda)

@hkaiser

This comment has been minimized.

Copy link
Member

commented Feb 1, 2017

@biddisco Are you happy with this patch?

@biddisco

This comment has been minimized.

Copy link
Contributor

commented Feb 1, 2017

If you mean the patch from @atrantan, then no not really. I didn't have time to look at what might cause the compilation problem and make the fix suggested, but I don't believe that using nvcc to compile is what we want here (or at least it's not what I wanted).

@atrantan

This comment has been minimized.

Copy link
Contributor Author

commented Feb 2, 2017

@biddisco Is the patch now ok for you?

@atrantan atrantan force-pushed the atrantan:master branch from 9b436e7 to b84e3a0 Feb 2, 2017

@biddisco
Copy link
Contributor

left a comment

That does the right thing now. I think you should remove the name change and the reversion of the name change commits as they just clutter the log for no gain.

@atrantan atrantan force-pushed the atrantan:master branch from b84e3a0 to 4361ba3 Feb 3, 2017

atrantan
@biddisco
Copy link
Contributor

left a comment

LGTM Thanks

@biddisco biddisco merged commit 9420de8 into STEllAR-GROUP:master Feb 4, 2017

1 check passed

ci/circleci Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.