-
Notifications
You must be signed in to change notification settings - Fork 6
refactor InfiniOps cpu runtime through InfiniRT #644
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
Draft
spike-zhu
wants to merge
1
commit into
master
Choose a base branch
from
feat/infinirt_runtime
base: master
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.
Draft
Changes from all commits
Commits
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 |
|---|---|---|
|
|
@@ -3,8 +3,16 @@ add_library(infiniops SHARED) | |
| include(GNUInstallDirs) | ||
|
|
||
| file(GLOB BASE_SRCS CONFIGURE_DEPENDS "*.cc") | ||
| list(FILTER BASE_SRCS EXCLUDE REGEX ".*tensor\\.cc$") | ||
| target_sources(infiniops PRIVATE ${BASE_SRCS}) | ||
|
|
||
| set(INFINIOPS_EMPTY_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/infiniops_empty.cc") | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个 |
||
| file(WRITE "${INFINIOPS_EMPTY_SOURCE}" | ||
| "namespace infini::ops { void infiniops_link_anchor() {} }\n") | ||
| target_sources(infiniops PRIVATE "${INFINIOPS_EMPTY_SOURCE}") | ||
|
|
||
| target_link_libraries(infiniops PUBLIC infinirt) | ||
|
|
||
| set(DEVICE_LIST "") | ||
|
|
||
| if(WITH_CPU) | ||
|
|
@@ -15,6 +23,7 @@ if(WITH_CPU) | |
|
|
||
| file(GLOB_RECURSE CPU_SOURCES CONFIGURE_DEPENDS ${CPU_PATTERNS}) | ||
| list(APPEND CORE_SOURCES ${CPU_SOURCES}) | ||
| target_sources(infiniops PRIVATE ${CPU_SOURCES}) | ||
|
|
||
| target_compile_definitions(infiniops PUBLIC WITH_CPU=1) | ||
|
|
||
|
|
@@ -526,7 +535,11 @@ if(GENERATE_OPERATOR_CALL_INSTANTIATIONS OR GENERATE_PYTHON_BINDINGS) | |
| endif() | ||
|
|
||
| execute_process( | ||
| COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/generate_wrappers.py ${GENERATOR_ARGS} | ||
| COMMAND ${CMAKE_COMMAND} -E env | ||
| INFINIRT_SOURCE_DIR=${INFINIRT_SOURCE_DIR} | ||
| ${Python_EXECUTABLE} | ||
| ${PROJECT_SOURCE_DIR}/scripts/generate_wrappers.py | ||
| ${GENERATOR_ARGS} | ||
| WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} | ||
| RESULT_VARIABLE script_result | ||
| ) | ||
|
|
@@ -792,7 +805,7 @@ if(GENERATE_PYTHON_BINDINGS) | |
| set_target_properties(infiniops PROPERTIES INSTALL_RPATH "${_INFINIOPS_INSTALL_RPATH}") | ||
| set_target_properties(ops PROPERTIES INSTALL_RPATH "${_INFINIOPS_INSTALL_RPATH}") | ||
|
|
||
| install(TARGETS infiniops ops DESTINATION .) | ||
| install(TARGETS infinirt infiniops ops DESTINATION .) | ||
|
|
||
| file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" "") | ||
| install(FILES "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" DESTINATION .) | ||
|
|
@@ -811,6 +824,12 @@ install(TARGETS infiniops | |
| RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| ) | ||
|
|
||
| install(TARGETS infinirt | ||
| LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| ) | ||
|
|
||
| install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ | ||
| DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
| ) | ||
|
|
||
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.
需要注意核对
CONTRIBUTING.md,比如这里return上面应该空一行。