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

Add Scalar backend #306

Open
wants to merge 7 commits into
base: dev-master
Choose a base branch
from
Open

Add Scalar backend #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1ddf0c
broken Scalar
jeffry1829 Oct 2, 2023
f649a54
update sclar
jeffry1829 Oct 5, 2023
8e22994
first Scalar impl
jeffry1829 Oct 5, 2023
420d04d
remain Sproxy unimpled
jeffry1829 Oct 6, 2023
6998bb4
add torch Scalar
jeffry1829 Oct 14, 2023
9895600
change Install.sh
jeffry1829 Oct 14, 2023
230a6b8
change Install.sh
jeffry1829 Oct 14, 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
63 changes: 31 additions & 32 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,37 @@ add_library(cytnx STATIC)
set_property(TARGET cytnx PROPERTY C_VISIBILITY_PRESET hidden)
set_property(TARGET cytnx PROPERTY VISIBILITY_INLINES_HIDDEN ON)

if(BACKEND_TORCH)
message(STATUS "backend = pytorch")
target_compile_definitions(cytnx PUBLIC BACKEND_TORCH)

# let torch python expose where pytorch.cmake is installed
execute_process(
COMMAND bash -c "python -c 'import torch;print(torch.utils.cmake_prefix_path)'"
OUTPUT_VARIABLE TORCH_CMAKE_PATH_C
)
string(REGEX REPLACE "\n$" "" TORCH_CMAKE_PATH_C "${TORCH_CMAKE_PATH_C}")
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${TORCH_CMAKE_PATH_C})
message(STATUS ${CMAKE_PREFIX_PATH})

find_package(Torch REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
message(STATUS "pytorch: ${TORCH_INSTALL_PREFIX}")
message(STATUS "pytorch libs: ${TORCH_LIBRARIES}")

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
target_link_libraries(cytnx PUBLIC ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.dylib)
else()
target_link_libraries(cytnx PUBLIC ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so)
target_link_libraries(cytnx PRIVATE ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so)
target_link_libraries(cytnx INTERFACE ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so)
endif()

else()
message(STATUS "backend = cytnx")
include(CytnxBKNDCMakeLists.cmake)
endif() # Backend torch

target_include_directories(cytnx
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src
Expand Down Expand Up @@ -160,38 +191,6 @@ target_include_directories(cytnx SYSTEM
target_link_libraries(cytnx PUBLIC Boost::boost ${LAPACK_LIBRARIES})
FILE(APPEND "${CMAKE_BINARY_DIR}/cxxflags.tmp" "-I${Boost_INCLUDE_DIRS}\n" "")

# ###
if(BACKEND_TORCH)
message(STATUS "backend = pytorch")
target_compile_definitions(cytnx PUBLIC BACKEND_TORCH)

# let torch python expose where pytorch.cmake is installed
execute_process(
COMMAND bash -c "python -c 'import torch;print(torch.utils.cmake_prefix_path)'"
OUTPUT_VARIABLE TORCH_CMAKE_PATH_C
)
string(REGEX REPLACE "\n$" "" TORCH_CMAKE_PATH_C "${TORCH_CMAKE_PATH_C}")
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${TORCH_CMAKE_PATH_C})
message(STATUS ${CMAKE_PREFIX_PATH})

find_package(Torch REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
message(STATUS "pytorch: ${TORCH_INSTALL_PREFIX}")
message(STATUS "pytorch libs: ${TORCH_LIBRARIES}")

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
target_link_libraries(cytnx PUBLIC ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.dylib)
else()
target_link_libraries(cytnx PUBLIC ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so)
target_link_libraries(cytnx PRIVATE ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so)
target_link_libraries(cytnx INTERFACE ${TORCH_LIBRARIES} ${TORCH_INSTALL_PREFIX}/lib/libtorch_python.so)
endif()

else()
message(STATUS "backend = cytnx")
include(CytnxBKNDCMakeLists.cmake)
endif() # Backend torch

# #####################################################################
# ## Get Gtest & benchmark
# #####################################################################
Expand Down
8 changes: 4 additions & 4 deletions Install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ echo ${FLAG}
mkdir build
cd build
cmake ../ ${FLAG} -DDEV_MODE=on
# cmake ../ ${FLAG}
make -j`nproc`
# make install
# ctest -j`nproc`
make -j4
make install
ctest
gcovr -r ../ . --html-details cov.html
Loading