| merge: resolve conflicts with upstream/master
Conflict resolution:
1. super_kernel.h: Keep both EARLY_START(16) and DEBUG_PER_OP_MAX_CORE_NUM(17)
2. sk_options_manager.cpp: Use optimized SetOptOptionValue style (single find), add DEBUG_PER_OP_MAX_CORE_NUM case
3. test_sk_options_manager.cpp: Merge inner option tests with DEBUG_PER_OP_MAX_CORE_NUM tests, fix ToJson size expectation (should include inner_options)
All 823 UT tests passed.
| 11 天前 |