[Nexthop] fix "asic_config_v2" output generation#1149
Open
marif-nexthop wants to merge 5 commits into
Open
Conversation
9ff7d36 to
ebb1a4b
Compare
This was referenced May 14, 2026
ebb1a4b to
b3fca39
Compare
add_fb_thrift_python_executable (and any add_fb_python_executable call with TYPE dir) produces a directory whose cmake target name is suffixed with .GEN_PY_EXE. Strip that suffix when computing the on-disk output path, and invoke directory outputs via python3 so __main__.py runs. Non-python targets (e.g. fboss-bspmapping-gen) continue to exec directly.
cmake/AsicConfigV2ConfigCli.cmake uses add_fb_thrift_python_executable, which registers the cmake target with a .GEN_PY_EXE suffix. Pass the suffixed name so build can find it; run-helper.py strips the suffix when locating the on-disk output.
Callers can now pass a JSON object of additional cmake defines which is
merged over the hardcoded {CMAKE_BUILD_TYPE, CMAKE_CXX_STANDARD} defaults.
Caller keys win on conflict. Existing callers that do not pass the flag
are unaffected.
range-v3's test suite fails to compile under clang's -Werror,-Wnrvo. Disable it at the cmake level via --extra-cmake-defines.
b3fca39 to
fa615d9
Compare
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
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.
Pre-submission checklist
pip install -r requirements-dev.txt && pre-commit installpre-commit runSummary
The
asic_config_v2can generate output files infboss/lib/asic_config_v2/generated_asic_configsby runningfboss/lib/asic_config_v2/run-helper.shbut this is broken in OSS FBOSS currently because of some recent changes related to thrift etc.In this PR,
asic_config_v2output generation is fixed. The following are the main changes:fboss/lib/oss/run-helper.py--extra-cmake-definesand merge with the existing hardcoded valuesfboss/lib/asic_config_v2/run-helper.shto--extra-cmake-definesto disablerange-v3testsNote: Please check individual commits for reviewing each small change separately.
Test Plan
Generated
asic_config_v2output files infboss/lib/asic_config_v2/generated_asic_configsby runningfboss/lib/asic_config_v2/run-helper.sh.