Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

rework rccl BUILD rules to match more closely with upstream #572

Merged
merged 2 commits into from
Jul 22, 2019

Conversation

jeffdaily
Copy link

  • remove nccl_config
  • use if_cuda_or_rocm in place of if_cuda, not if_nccl
  • use if_cuda/if_rocm, not if_cuda/rocm_is_configured
  • misc changes to match upstream files

- remove `nccl_config`
- use `if_cuda_or_rocm` in place of `if_cuda`, not `if_nccl`
- use `if_cuda`/`if_rocm`, not if_cuda/rocm_is_configured
Copy link
Collaborator

@whchung whchung left a comment

Choose a reason for hiding this comment

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

editorial change required to ease future upstreaming.

This partially reverts a whitespace change made by
471af21.
@jeffdaily
Copy link
Author

jeffdaily commented Jul 19, 2019

@whchung If the previous CI run completes, I would be okay with not needing the next commit's CI run since it was a whitespace change and I verified it locally. I'll leave it up to you. Depends how busy our CI is I suppose.

@whchung whchung merged commit aa50da8 into ROCm:develop-upstream Jul 22, 2019
jeffdaily added a commit that referenced this pull request Jul 24, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants