Adopt Python 3.12 #2184
Open
Adopt Python 3.12 #2184
+260
−212
Conversation
This file contains 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
…rpheus into david-25.02-x-25.02
…avid-25.02-x-25.02
…avid-rapids-25.02
…avid-rapids-25.02
…avid-rapids-25.02
…mount for apt, pip and conda
Cleanup DOCA env vars Remove redundant calls to `apt update`, remove call to `apt upgrade`. Fix download location for `doca-host.deb` Consolidate installing of doca packagwes
willkill07
force-pushed
the
david-py-312-2181
branch
from
22a24dc to
1579ee6
Compare
|
/ok to test |
1 similar comment
|
/ok to test |
willkill07
force-pushed
the
david-py-312-2181
branch
from
2fcacaf to
52c41c8
Compare
|
/ok to test |
willkill07
force-pushed
the
david-py-312-2181
branch
from
52c41c8 to
114e147
Compare
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
willkill07
force-pushed
the
david-py-312-2181
branch
from
114e147 to
123a585
Compare
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
|
/ok to test |
1 similar comment
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
willkill07
force-pushed
the
david-py-312-2181
branch
from
bb09517 to
2ca4c64
Compare
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
|
/ok to test |
Signed-off-by: David Gardner <[email protected]>
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
|
/ok to test |
Signed-off-by: Will Killian <[email protected]>
|
/ok to test |
willkill07
reviewed
Mar 6, 2025
| @@ -121,7 +121,6 @@ CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}rapi | |||
| CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia") | |||
| CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/dev") | |||
| CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}pytorch") | |||
| CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}defaults") | |||
There was a problem hiding this comment.
We shouldn't use defaults, which is why I removed it
| @@ -124,7 +124,7 @@ | |||
| "exhaleExecutesDoxygen": | |||
| True, | |||
| "exhaleDoxygenStdin": | |||
| textwrap.dedent(''' | |||
| textwrap.dedent(r''' | |||
There was a problem hiding this comment.
Had to add the r else the asterisks yielded Check failures
| @@ -141,8 +141,7 @@ | |||
| ENABLE_PREPROCESSING = YES | |||
| MACRO_EXPANSION = YES | |||
| EXPAND_ONLY_PREDEF = NO | |||
| PREDEFINED = "MORPHEUS_EXPORT=" \ | |||
| "DOXYGEN_SHOULD_SKIP_THIS=1" | |||
| PREDEFINED += "MORPHEUS_EXPORT=" | |||
There was a problem hiding this comment.
We can use += to append to PREDEFINED rather than overwriting it outright
| @@ -15,6 +15,8 @@ | |||
|
|
|||
| list(APPEND CMAKE_MESSAGE_CONTEXT "python") | |||
|
|
|||
| add_compile_definitions("PYBIND11_NO_ASSERT_GIL_HELD_INCREF_DECREF=1") | |||
There was a problem hiding this comment.
If we don't include this, then we get lots of assertion failures. This check was only enabled by default on a newer pybind11 (which this PR now has)
| @@ -230,7 +230,7 @@ jobs: | |||
| matrix: | |||
| arch: ["amd64", "arm64"] | |||
| include: | |||
| - runner: linux-amd64-gpu-v100-latest-1 | |||
| - runner: linux-amd64-gpu-l4-latest-1 | |||
There was a problem hiding this comment.
This was updated here because I forgot to do it on a prior PR that updated the runners to no longer use the v100
Comment on lines
+124
to
+128
| except Exception as e: | ||
| # if we encounter some exception while loading, then also skip the test | ||
| if fail_missing: | ||
| raise e | ||
| raise pytest.skip.Exception(f"failed to import {modname}: {e}") |
There was a problem hiding this comment.
This was the code added to handle any type of exception being thrown on import for import_or_skip
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
ImportError-derived)faiss-cpuon aarch64 target uses deprecated numpy API #2190 & upstream issuefaissfails to import on python==3.12 because of deprecatednumpy.distutilsfacebookresearch/faiss#3936Closes #2181
By Submitting this PR I confirm: