-
Notifications
You must be signed in to change notification settings - Fork 166
add code generation for grpc boilerplate conversions #1107
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
Open
tmckayus
wants to merge
5
commits into
NVIDIA:main
Choose a base branch
from
tmckayus:grpc-codegen-v2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b71a811
add code generation for grpc boilerplate conversions
tmckayus 4b172d0
coderabbit feedback on grpc code generator
tmckayus 295fb8f
add missing verify_grpc_codegen.sh test script
tmckayus df4d6d4
address coderabbit feedback on grpc code generator files
tmckayus 7e2d4d7
Merge remote-tracking branch 'upstream/main' into grpc-codegen-v2
tmckayus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| #!/bin/bash | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # Verify that committed codegen output matches what generate_conversions.py produces. | ||
| # Fails if a developer edited field_registry.yaml without re-running ./build.sh codegen. | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" | ||
| REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" | ||
| CODEGEN_DIR="${REPO_DIR}/cpp/src/grpc/codegen" | ||
| GENERATED_DIR="${CODEGEN_DIR}/generated" | ||
| PROTO_DEST="${REPO_DIR}/cpp/src/grpc/cuopt_remote_data.proto" | ||
|
|
||
| TMPDIR=$(mktemp -d) | ||
| trap 'rm -rf ${TMPDIR}' EXIT | ||
|
|
||
| echo "Running code generator into temp directory..." | ||
| python "${CODEGEN_DIR}/generate_conversions.py" \ | ||
| --registry "${CODEGEN_DIR}/field_registry.yaml" \ | ||
| --output-dir "${TMPDIR}" | ||
|
|
||
| echo "Comparing generated output with committed files..." | ||
|
|
||
| FAILED=0 | ||
|
|
||
| for f in "${TMPDIR}"/*; do | ||
| fname=$(basename "$f") | ||
| committed="${GENERATED_DIR}/${fname}" | ||
| if [ ! -f "${committed}" ]; then | ||
| echo "MISSING: ${committed} (new generated file not committed)" | ||
| FAILED=1 | ||
| continue | ||
| fi | ||
| if ! diff -q "$f" "${committed}" > /dev/null 2>&1; then | ||
| echo "MISMATCH: cpp/src/grpc/codegen/generated/${fname}" | ||
| diff -u "${committed}" "$f" | head -30 | ||
| FAILED=1 | ||
| fi | ||
| done | ||
|
|
||
| for committed in "${GENERATED_DIR}"/*; do | ||
| [ -f "${committed}" ] || continue | ||
| fname=$(basename "${committed}") | ||
| if [ ! -f "${TMPDIR}/${fname}" ]; then | ||
| echo "ORPHANED: cpp/src/grpc/codegen/generated/${fname} (no longer generated)" | ||
| FAILED=1 | ||
| fi | ||
| done | ||
|
|
||
| if [ -f "${TMPDIR}/cuopt_remote_data.proto" ] && [ -f "${PROTO_DEST}" ]; then | ||
| if ! diff -q "${TMPDIR}/cuopt_remote_data.proto" "${PROTO_DEST}" > /dev/null 2>&1; then | ||
| echo "MISMATCH: cpp/src/grpc/cuopt_remote_data.proto (not copied from codegen/generated)" | ||
| FAILED=1 | ||
| fi | ||
| fi | ||
|
|
||
| if [ ${FAILED} -ne 0 ]; then | ||
| echo "" | ||
| echo "ERROR: Committed generated files are out of sync with field_registry.yaml." | ||
| echo "Run './build.sh codegen' and commit the results." | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "OK: All generated files match field_registry.yaml." |
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clear orphaned generated files before regenerating.
This target writes into the existing
cpp/src/grpc/codegen/generatedtree but never removes files the generator no longer emits. When the registry drops an artifact,./build.sh codegenleaves the stale file behind andci/verify_grpc_codegen.shwill still fail on the orphan, so the documented regen flow does not fully converge.Possible fix
if hasArg codegen; then echo "Regenerating codegen .inc files from field_registry.yaml..." + if [ -d "${REPODIR}"/cpp/src/grpc/codegen/generated ]; then + find "${REPODIR}"/cpp/src/grpc/codegen/generated -mindepth 1 -maxdepth 1 -type f -delete + fi python "${REPODIR}"/cpp/src/grpc/codegen/generate_conversions.py \ --registry "${REPODIR}"/cpp/src/grpc/codegen/field_registry.yaml \ --output-dir "${REPODIR}"/cpp/src/grpc/codegen/generated📝 Committable suggestion
🤖 Prompt for AI Agents