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

Replace boost hash usage with TfHash in pxr/usd/usd #2187

Merged
merged 1 commit into from
Apr 3, 2023

Conversation

nvmkuruc
Copy link
Collaborator

@nvmkuruc nvmkuruc commented Jan 21, 2023

Description of Change(s)

Requires #2173
To remove the dependency of pxr/usd/usd on boost's hashing functions

  • boost::hash_combine is replaced with TfHash::Combine, delegating hashing of containers instead of iterating
  • boost::hash is replaced with TfHash
  • Hashing test coverage has been extended to cover UsdStageLoadRules, UsdObject derived classes, and UsdCollectionMembershipQuery.

Fixes Issue(s)

-#2172 (additional PRs forthcoming)

  • I have verified that all unit tests pass with the proposed changes
  • I have submitted a signed Contributor License Agreement

@spiffmon
Copy link
Member

@nvmkuruc , it looks like all the dependent/upstream files got pulled in, indavertently?

@nvmkuruc nvmkuruc changed the title Usdhash Replace boost hash usage with TfHash in pxr/usd/usd Jan 23, 2023
@nvmkuruc
Copy link
Collaborator Author

@nvmkuruc , it looks like all the dependent/upstream files got pulled in, indavertently?

I asked Nick about this and he said that it should be fine and resolve itself as the upstream dependency branches got pulled in, and I should just note in the pull request what the PR was dependent on. If there's a better way to have organized the stacking of PRs to avoid this, happy to reorganize.

@nvmkuruc
Copy link
Collaborator Author

@nvmkuruc , it looks like all the dependent/upstream files got pulled in, indavertently?

I asked Nick about this and he said that it should be fine and resolve itself as the upstream dependency branches got pulled in, and I should just note in the pull request what the PR was dependent on. If there's a better way to have organized the stacking of PRs to avoid this, happy to reorganize.

I think I can take a pass at making most of these PRs dependent on just the pxr/base/tf changes which should hopefully make these easier to look at.

@nvmkuruc
Copy link
Collaborator Author

I think I can take a pass at making most of these PRs dependent on just the pxr/base/tf changes which should hopefully make these easier to look at.

All the pull requests have been updated to be dependent on only either dev or the tfhash pull request.

@spiffmon
Copy link
Member

spiffmon commented Jan 23, 2023 via email

@nvmkuruc nvmkuruc force-pushed the usdhash branch 2 times, most recently from 58e514b to 0baaa36 Compare January 26, 2023 22:58
@sunyab
Copy link
Contributor

sunyab commented Jan 27, 2023

Filed as internal issue #USD-7907

@pixar-oss pixar-oss merged commit f94b6b1 into PixarAnimationStudios:dev Apr 3, 2023
@nvmkuruc nvmkuruc deleted the usdhash branch December 29, 2023 03:10
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.

4 participants