Skip to content
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

system/flatbuffers: fix patch flow of flatbuffers #2869

Merged
merged 6 commits into from
Dec 1, 2024

Conversation

anchao
Copy link
Contributor

@anchao anchao commented Nov 28, 2024

Summary

system/flatbuffers: fix patch flow of flatbuffers

Applying patch to flatbuffers
patching file '<'
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patching file '<'
Hunk #1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patching file '<'
Hunk #1 FAILED at 495.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patching file '<'
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patch: **** Can't reopen file '<' : No such file or directory
-- Configuring done (12.8s)
-- Generating done (0.3s)

Signed-off-by: chao an [email protected]

Impact

N/A

Testing

sim/nsh and enable CONFIG_SYSTEM_FLATBUFFERS

math/ruy/CMakeLists.txt Outdated Show resolved Hide resolved
math/ruy/CMakeLists.txt Outdated Show resolved Hide resolved
math/ruy/CMakeLists.txt Outdated Show resolved Hide resolved
mlearning/tflite-micro/CMakeLists.txt Outdated Show resolved Hide resolved
Applying patch to flatbuffers
patching file '<'
Hunk apache#1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patching file '<'
Hunk apache#1 FAILED at 39.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patching file '<'
Hunk apache#1 FAILED at 495.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patching file '<'
Hunk apache#1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file '<.rej'
patch: **** Can't reopen file '<' : No such file or directory
-- Configuring done (12.8s)
-- Generating done (0.3s)

Signed-off-by: chao an <[email protected]>
1. correct include patch of support library
2. add flatbuffers include path

Signed-off-by: chao an <[email protected]>
ruy is not really used, tflite just uses the header file

Error log from CMake:
================================================================
-- Configuring done (2.1s)
CMake Error at cmake/nuttx_add_library.cmake:183 (add_library):
  No SOURCES given to target: ruy
Call Stack (most recent call first):
  apps/math/ruy/CMakeLists.txt:57 (nuttx_add_library)

Signed-off-by: chao an <[email protected]>
@anchao
Copy link
Contributor Author

anchao commented Nov 30, 2024

@xiaoxiang781216 done, please review again, ci is broken now

Copy link

@cederom cederom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks and builds fine now, thank you @xiaoxiang781216 for the remarks :-) Thank you @anchao for the updates :-)

@anchao
Copy link
Contributor Author

anchao commented Dec 1, 2024

I have tested this commit locally and found no other problems. Let's merge this commit first to resolve the CI broken.

@anchao anchao merged commit 8b253d6 into apache:master Dec 1, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants