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

Merge pull request #1171 from lucbv/Fix_using_namespace #1173

Closed
wants to merge 1 commit into from

Conversation

ndellingwood
Copy link
Contributor

using namespace should be scoped to prevent name clashes, see issue #1170

(cherry picked from commit e9496bb)

@ndellingwood
Copy link
Contributor Author

I had to resolve conflicts with the cherry-pick, hoping I didn't make a mistake but please review carefully

Copy link
Contributor

@lucbv lucbv left a comment

Choose a reason for hiding this comment

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

@ndellingwood this looks good and as long as you remove the three using namespace KokkosBatched we are fine since missing another change will lead to build failure which is easy to detect : )

@ndellingwood
Copy link
Contributor Author

this looks good and as long as you remove the three using namespace KokkosBatched

Yuck, thanks for the catch! I don't understand why that change didn't carry over with the cherry-pick, will need to better understand that

@ndellingwood
Copy link
Contributor Author

Oop, I misinterpreted as a change request my mistake. I looked over the files changed diff and confirm the three culprit using namespace lines have been removed

Copy link
Contributor

@e10harvey e10harvey left a comment

Choose a reason for hiding this comment

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

Thank you, @lucbv and @ndellingwood !

using namespace should be scoped to prevent name clashes, see issue kokkos#1170

(cherry picked from commit e9496bb)
@ndellingwood
Copy link
Contributor Author

@lucbv @e10harvey I force pushed an update to fix an error during testing (some funky duplication during cherry-pick, maybe I made a mistake resolving conflicts). The change resolved the error picked up in a Cuda_Serial build but have a failing cuda.trsm_complex_double test. I think I'm going to close this and try again tomorrow

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.

3 participants