Mentions légales du service

Skip to content
Snippets Groups Projects
Commit aeb159e6 authored by hhakim's avatar hhakim
Browse files

Add pathlib pip dependency which is only useful when FAUST_TORCH is true.

parent 199ea74b
Branches
Tags 2.5.59
No related merge requests found
Pipeline #833934 skipped
......@@ -639,14 +639,6 @@ if(FAUST_TORCH)
find_package(Torch REQUIRED)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS} -DFAUST_TORCH") #-D_GLIBCXX_USE_CXX11_ABI=0")
message(STATUS TORCH_LIBRARY=${TORCH_LIBRARY})
target_compile_definitions(${FAUST_TARGET} PUBLIC FAUST_TORCH -D_GLIBCXX_USE_CXX11_ABI=1)
#target_compile_options(${FAUST_TARGET} PUBLIC ${TORCH_CXX_FLAGS})
#message(STATUS "TORCH_CXX_FLAGS=" ${TORCH_CXX_FLAGS)
get_filename_component(Torch_DIR ${TORCH_LIBRARY} DIRECTORY)
message(STATUS TORCH_DIR=${Torch_DIR})
include_directories(${FAUST_TARGET} ${Torch_DIR}/../include ${Torch_DIR}/../include/torch/csrc/api/include)
# target_link_libraries(${FAUST_TARGET} torch c10)
target_include_directories(${FAUST_TARGET} PUBLIC ${Torch_DIR}/../include ${Torch_DIR}/../include/torch/csrc/api/include)
endif()
......@@ -715,6 +707,16 @@ else (BUILD_USE_GPU)
endif(BUILD_WRAPPER_MATLAB)
endif (BUILD_USE_GPU)
if(FAUST_TORCH)
target_compile_definitions(${FAUST_TARGET} PUBLIC FAUST_TORCH -D_GLIBCXX_USE_CXX11_ABI=1)
#target_compile_options(${FAUST_TARGET} PUBLIC ${TORCH_CXX_FLAGS})
#message(STATUS "TORCH_CXX_FLAGS=" ${TORCH_CXX_FLAGS)
get_filename_component(Torch_DIR ${TORCH_LIBRARY} DIRECTORY)
message(STATUS TORCH_DIR=${Torch_DIR})
include_directories(${FAUST_TARGET} ${Torch_DIR}/../include ${Torch_DIR}/../include/torch/csrc/api/include)
# target_link_libraries(${FAUST_TARGET} torch c10)
target_include_directories(${FAUST_TARGET} PUBLIC ${Torch_DIR}/../include ${Torch_DIR}/../include/torch/csrc/api/include)
endif()
if(USE_GPU_MOD)
include_directories(${FAUST_TARGET} ${GPU_MOD_INCLUDE_DIR} ${GPU_MOD_INCLUDE_DIR}/../build)
......
......@@ -53,7 +53,8 @@ setup(
description = 'TODO',
long_description = 'TODO',
classifiers = [ 'TODO' ],
install_requires = [ 'pygsp', 'scipy', 'numpy', 'matplotlib>=2.0.0' ], #ENOTE: order matters (last pkg installed first)
install_requires = [ 'pygsp', 'scipy', 'numpy', 'matplotlib>=2.0.0',
'pathlib'], #ENOTE: order matters (last pkg installed first)
license = "INRIA",
package_data = {
'pyfaust': [ 'data/*.mat', 'license*.txt', '@GPU_MOD_LIB_PATH@']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment