Skip to content

patching ABI compatibility #112

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

Merged
jjsjann123 merged 2 commits into from
Apr 3, 2023
Merged

patching ABI compatibility #112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c295c
patching ABI compatibility against pip installed pytorch and local gt…
jjsjann123 Apr 1, 2023
2ff6566
Merge branch 'main' into pip_pytorch_patch
jjsjann123 Apr 3, 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
7 changes: 2 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ endif ()
set(NVFUSER_ROOT ${PROJECT_SOURCE_DIR})
set(NVFUSER_SRCS_DIR "${NVFUSER_ROOT}/csrc")
if (PROJECT_IS_TOP_LEVEL)
message(STATUS "top-level build")
find_package(Torch REQUIRED)
find_package(Python REQUIRED Development Interpreter)
find_package(pybind11 REQUIRED)
# need this since the pytorch execution uses a different name
set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
set(ATEN_CUDA_ROOT "${TORCH_INSTALL_PREFIX}/include/ATen")
# CXX flags is necessary since https://github.com/pytorch/pytorch/issues/98093
string(APPEND CMAKE_CXX_FLAGS ${TORCH_CXX_FLAGS})
if(BUILD_NVFUSER_BENCHMARK)
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest)
add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/benchmark)
Expand Down Expand Up @@ -198,8 +199,6 @@ target_include_directories(${NVFUSER_CODEGEN} PUBLIC
)
set_property(TARGET ${NVFUSER_CODEGEN} PROPERTY CXX_STANDARD 17)

message(STATUS "install_lib_dir: ${TORCH_INSTALL_LIB_DIR}")
message(STATUS "cmake_install_includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
if (PROJECT_IS_TOP_LEVEL)
target_link_libraries(${NVFUSER_CODEGEN} PRIVATE torch ${TORCH_LIBRARIES})
# TODO: setup header and lib installation
Expand Down Expand Up @@ -272,7 +271,6 @@ if(BUILD_PYTHON)
target_compile_definitions(${NVFUSER} PRIVATE EXTENSION_NAME=_C)

if (PROJECT_IS_TOP_LEVEL)
message(STATUS "skipping the rest of the libs")
target_compile_options(${NVFUSER} PRIVATE -Wall -Wno-unused-function)
target_link_libraries(${NVFUSER} PRIVATE ${TORCH_LIBRARIES})
target_link_libraries(${NVFUSER} PRIVATE "${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so")
Expand Down Expand Up @@ -359,7 +357,6 @@ if(BUILD_TEST)
target_include_directories(${NVFUSER_TESTS} PRIVATE "${NVFUSER_ROOT}")

if (PROJECT_IS_TOP_LEVEL)
message(STATUS "skipping the rest of the libs")
target_compile_options(${NVFUSER_TESTS} PRIVATE -Wall -Wno-unused-function)
target_link_libraries(${NVFUSER_TESTS} PRIVATE ${TORCH_LIBRARIES})
else() # PROJECT_IS_TOP_LEVEL
Expand Down