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.

Sign up for GitHub

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

changing Cmake #344

Merged
merged 6 commits into from
Oct 19, 2023
Merged

changing Cmake #344

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
041f6cc
changing Cmake
Oct 17, 2023
db30846
change cmake
Oct 18, 2023
f12d646
changing cmake1016
Oct 18, 2023
73a01ec
changing cmake1016
Oct 18, 2023
2b298cc
changing cmake1425
Oct 18, 2023
e88e1e2
changing cmake1510
Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions dipu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,14 @@ include_directories(${TORCH_INCLUDE_DIRS})
message(STATUS "Torch TORCH_INCLUDE_DIRS: ${TORCH_INCLUDE_DIRS}")

# diopi
set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto")
include_directories(${DIOPI_PROTO_PATH}/include)
if (EXISTS $ENV{DIOPI_PATH})
message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}")
set(DIOPI_PROTO_PATH $ENV{DIOPI_PATH})
include_directories($ENV{DIOPI_PATH}/include)
else()
set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto")
include_directories(${DIOPI_PROTO_PATH}/include)
Copy link
Collaborator

Choose a reason for hiding this comment

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

既然 set了 DIOPI_PROTO_PATH 为什么 不把 include_directories(${DIOPI_PROTO_PATH}/include) 挪到 if else 外面 分支里面少留点东西

Copy link
Collaborator

Choose a reason for hiding this comment

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

是的，先这样吧。等后面你们还要重构。

Comment on lines +113 to +119
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
if (EXISTS $ENV{DIOPI_PATH})
message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}")
set(DIOPI_PROTO_PATH $ENV{DIOPI_PATH})
include_directories($ENV{DIOPI_PATH}/include)
else()
set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto")
include_directories(${DIOPI_PROTO_PATH}/include)
if (EXISTS $ENV{DIOPI_PATH})
message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}")
set(DIOPI_PROTO_PATH $ENV{DIOPI_PATH})
else()
set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto")
include_directories(${DIOPI_PROTO_PATH}/include)

endif()
add_definitions(-DDIOPI_ATTR_WEAK)

if (LIBS)
Expand Down