Move all the Windows dll path logic into the WindowsImportWrapper #3353
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
|
Filed as internal issue #USD-10276 ✅ Signed CLA on file |
Collaborator
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
dgovil
added
the
needs review
Collaborator
|
@sunyab does USD still support Python 3.7 ? If not then perhaps the version check here could be simplified and moved to a build time check for 3.8+? |
tbttfox
force-pushed
the
tbttfox/windows_dll_load
branch
from
b4ec8b4 to
0199e38
Compare
Collaborator
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change(s)
There's already a python context in
pxr/tf/__init__.pythat handles adding and removing dll paths for windows, so I moved the Windows specific import path logic out of thepxr/__init__.pyto there. This way, we don't have to permanently change thePATHI couldn't get the tests to pass locally from the dev build, even without my changes.
And I couldn't get the release branch to build because boost breaks.
Any suggestions how to deal with this?
However, I was able to test that my changes load the correct DLL's on python 3.7, python 3.11, and anaconda 3.12 both with and without the
PXR_USD_WINDOWS_DLL_PATHvariable set. (I just copied my changes directly into different pip installs)Fixes Issue(s)
#3114