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

On prefetching_test branch : adding prefetching_iterator and related tests used for prefetching containers within lambda functions #2228

Merged
merged 36 commits into from Jun 26, 2016

Conversation

zkhatami88
Copy link
Contributor

Pull request #2179 was created on master branch, which is merged to prefetching_test in this pull request.

zkhatami88 and others added 30 commits May 24, 2016 14:32
@hkaiser
Copy link
Member

hkaiser commented Jun 25, 2016

This supersedes #2179, for all comments please see there.

hpx_add_target_compile_option(--cuda-path=${CUDA_TOOLKIT_ROOT_DIR})
hpx_libraries(cudart)
link_directories(${CUDA_TOOLKIT_ROOT_DIR}/lib64)
endif()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where did the cuda settings go to?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uhh, merge conflict ... - will fix

- removing accidentally committed files
- resolving merge conflicts
- adding test to build system
@hkaiser hkaiser merged commit eab1171 into master Jun 26, 2016
@hkaiser hkaiser deleted the prefetching_test branch June 26, 2016 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants