Fix merge from 24.04 to 24.06 #1965
Merged
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
…VIDIA#1930) * Move device code in get_json_object to cu or cuh (NVIDIA#1915) Signed-off-by: Haoyang Li <haoyangl@nvidia.com> * Refactor/simplify json generator Signed-off-by: Chong Gao <res_life@163.com> * Remove purge non-empty nulls step * Refactor josn parser: remove useless variables * Use 64 bits to store JSON nest depth context to save memory * Refine push/pop/peek logic * Refactor: use less functions; change max path length from 32 to 8 * Fix nvbug: get-json-obj get incorrect result on some GPUs(H100, V100) * Revert "Fix nvbug: get-json-obj get incorrect result on some GPUs(H100, V100)" This reverts commit ff2db7e. * Fix a redefined variable * Update MAX_PATH_DEPTH = 8 in Java to keep consistent * Fix test cases; Change max path depth from 8 to 16 * Minor change: add pragma once in header --------- Signed-off-by: Haoyang Li <haoyangl@nvidia.com> Signed-off-by: Chong Gao <res_life@163.com> Co-authored-by: Haoyang Li <haoyangl@nvidia.com> Co-authored-by: Chong Gao <res_life@163.com>
Signed-off-by: Tim Liu <timl@nvidia.com>
* Move device code in get_json_object to cu or cuh (NVIDIA#1915) Signed-off-by: Haoyang Li <haoyangl@nvidia.com> * Refactor/simplify json generator Signed-off-by: Chong Gao <res_life@163.com> * Remove purge non-empty nulls step * Refactor josn parser: remove useless variables * Use 64 bits to store JSON nest depth context to save memory * Refine push/pop/peek logic * Refactor: use less functions; change max path length from 32 to 8 * Fix nvbug: get-json-obj get incorrect result on some GPUs(H100, V100) * Revert "Fix nvbug: get-json-obj get incorrect result on some GPUs(H100, V100)" This reverts commit ff2db7e. * Fix a redefined variable * Update MAX_PATH_DEPTH = 8 in Java to keep consistent * Fix test cases; Change max path depth from 8 to 16 * Minor change: add pragma once in header * Fix a bug in string_to_float and move it to jni temporarily Signed-off-by: Haoyang Li <haoyangl@nvidia.com> * Address comments Signed-off-by: Haoyang Li <haoyangl@nvidia.com> --------- Signed-off-by: Haoyang Li <haoyangl@nvidia.com> Signed-off-by: Chong Gao <res_life@163.com> Co-authored-by: Chong Gao <res_life@163.com>
|
LGTM for the get-json-object files. |
res-life
approved these changes
Apr 12, 2024
|
build |
It's not enabled because we don't want people accidentally creating them. Almost all commits should be squashed. Anything requiring a merge commit is performed by someone with admin privileges. Thanks for addressing this! |
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.
This PR resolves conflicts from #1953