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.

Sign up for GitHub

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

Jump to bottom

Let SYCL USMObjectMem use SharedAllocationRecord #3898

Merged
merged 4 commits into from
Apr 7, 2021
Merged

Let SYCL USMObjectMem use SharedAllocationRecord #3898

merged 4 commits into from
Apr 7, 2021

Conversation

masterleinad
Copy link
Contributor

@masterleinad masterleinad commented Mar 29, 2021 •
edited

Based on top of #3873.
To avoid circular dependencies I needed to move the definitions using SharedAllocationRecord to the *.cpp file. After moving, this pull request only replaces sycl::malloc with Record::allocate and sycl::free with Record::decfement.

@masterleinad masterleinad force-pushed the usm_object_tracking branch 2 times, most recently from 760f270 to 7e596e7 Compare March 31, 2021 18:22
@masterleinad masterleinad marked this pull request as ready for review March 31, 2021 18:22
@masterleinad
Copy link
Contributor Author

Retest this please.

nliber
nliber approved these changes Apr 2, 2021
View reviewed changes
Copy link
Contributor

@nliber nliber left a comment

Choose a reason for hiding this comment

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

While I'm never thrilled with moving template definitions to .cpp files and explicit instantiations, it makes sense here.

dalg24
dalg24 reviewed Apr 6, 2021
View reviewed changes
core/src/SYCL/Kokkos_SYCL_Instance.cpp Outdated Show resolved Hide resolved
core/src/SYCL/Kokkos_SYCL_Instance.cpp Outdated Show resolved Hide resolved
core/src/SYCL/Kokkos_SYCL_Instance.cpp Outdated Show resolved Hide resolved
masterleinad
masterleinad commented Apr 6, 2021
View reviewed changes
Copy link
Contributor Author

@masterleinad masterleinad left a comment

Choose a reason for hiding this comment

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

@dalg24 I addressed your comments (and rebased).

core/src/SYCL/Kokkos_SYCL_Instance.cpp Outdated Show resolved Hide resolved
core/src/SYCL/Kokkos_SYCL_Instance.cpp Outdated Show resolved Hide resolved
core/src/SYCL/Kokkos_SYCL_Instance.cpp Outdated Show resolved Hide resolved
@dalg24 dalg24 merged commit fb90da2 into kokkos:develop Apr 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalg24 dalg24 dalg24 approved these changes

@nliber nliber nliber approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@masterleinad @dalg24 @nliber