Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 1e4c7e2b authored by Adrien Leman's avatar Adrien Leman Committed by hhakim
Browse files

cmakelist modif name

parent 9534a0a2
Branches
Tags
No related merge requests found
......@@ -30,6 +30,7 @@ set(FAUST_VERSION 2.0)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/build/FAuST_OUTPUT" CACHE STRING "default install path" FORCE )
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
if(UNIX)
message(STATUS "UNIX OPERATING SYSTEM")
#if(LINUX) DON'T WORK SO AN UNIX OS WHICH IS NOT APPLE IS ASSUMED TO BE LINUX OS
......@@ -126,149 +127,122 @@ set(FAUST_ALGORITHM_FACTORIZATION_BIN_DIR ${FAUST_ALGORITHM_BIN_DIR}/factorizati
############## INSTALL DIRECTORIES #############################
set(FAUST_INSTALL_LIB ${CMAKE_INSTALL_PREFIX}/lib)
set(FAUST_INSTALL_TESTING_BIN ${CMAKE_INSTALL_PREFIX}/bin)
set(FAUST_INSTALL_TESTRUNCOMP ${CMAKE_INSTALL_PREFIX}/bin/runtime_comparison)
set(FAUST_INSTALL_DOC ${CMAKE_INSTALL_PREFIX}/doc)
set(FAUST_INSTALL_LIB ${CMAKE_INSTALL_PREFIX}/lib)
set(FAUST_INSTALL_BIN ${CMAKE_INSTALL_PREFIX}/bin)
set(FAUST_INSTALL_BIN_TIME_COMP ${CMAKE_INSTALL_PREFIX}/bin/runtime_comparison)
set(FAUST_INSTALL_DOC ${CMAKE_INSTALL_PREFIX}/doc)
set(FAUST_INSTALL_CMDLINE ${CMAKE_INSTALL_PREFIX}/CmdLine)
set(FAUST_INSTALL_TESTING_DATA ${CMAKE_INSTALL_PREFIX}/testing/data)
set(FAUST_INSTALL_CMDLINE ${CMAKE_INSTALL_PREFIX}/CmdLine)
set(FAUST_INSTALL_TESTING_DATA ${CMAKE_INSTALL_PREFIX}/testing/data)
##################################################################
###### WRAPPER DIRECTORIES ######
set(FAUST_WRAPPER_DIR ${PROJECT_SOURCE_DIR}/wrapper CACHE INTERNAL "")
set(FAUST_WRAPPER_BIN_DIR ${PROJECT_BINARY_DIR}/wrapper CACHE INTERNAL "")
set(FAUST_SRC_WRAPPER_DIR ${PROJECT_SOURCE_DIR}/wrapper CACHE INTERNAL "")
set(FAUST_BIN_WRAPPER_DIR ${PROJECT_BINARY_DIR}/wrapper CACHE INTERNAL "")
###### WRAPPER CMDLINE SRC DIRECTORIES ######
set(FAUST_CMDLINE_SRC_DIR ${FAUST_WRAPPER_DIR}/cmd_line CACHE INTERNAL "")
set(FAUST_CMDLINE_FUNC_SRC_DIR ${FAUST_CMDLINE_SRC_DIR}/src CACHE INTERNAL "")
set(FAUST_CMDLINE_TYPE_FORMAT_DIR ${FAUST_CMDLINE_SRC_DIR}/type_format CACHE INTERNAL "")
set(FAUST_SRC_CMDLINE_DIR ${FAUST_SRC_WRAPPER_DIR}/cmd_line CACHE INTERNAL "")
set(FAUST_CMDLINE_FUNC_SRC_DIR ${FAUST_SRC_WRAPPER_DIR}/cmd_line/src CACHE INTERNAL "")
set(FAUST_CMDLINE_TYPE_FORMAT_DIR ${FAUST_SRC_WRAPPER_DIR}/cmd_line/type_format CACHE INTERNAL "")
set(FAUST_CMDLINE_TYPE_FORMAT_XML_SRC_DIR ${FAUST_CMDLINE_TYPE_FORMAT_DIR}/xml CACHE INTERNAL "")
set(FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR ${FAUST_CMDLINE_TYPE_FORMAT_DIR}/mat CACHE INTERNAL "")
###### WRAPPER CMDLINE BUILD DIRECTORIES ######
set(FAUST_CMDLINE_BIN_DIR ${FAUST_WRAPPER_BIN_DIR}/cmd_line CACHE INTERNAL "")
set(FAUST_CMDLINE_BIN_SRC_DIR ${FAUST_WRAPPER_BIN_DIR}/cmd_line/src CACHE INTERNAL "")
set(FAUST_CMDLINE_BIN_DIR ${FAUST_WRAPPER_BIN_DIR}/cmd_line/bin CACHE INTERNAL "")
set(FAUST_BIN_CMDLINE_DIR ${FAUST_BIN_WRAPPER_DIR}/cmd_line CACHE INTERNAL "")
set(FAUST_BIN_CMDLINE_SRC_DIR ${FAUST_BIN_WRAPPER_DIR}/cmd_line/src CACHE INTERNAL "")
set(FAUST_BIN_CMDLINE_BIN_DIR ${FAUST_BIN_WRAPPER_DIR}/cmd_line/bin CACHE INTERNAL "")
##################################################################
## fichier d'entrée doivent être renseigné dans l'executable
###### WRAPPER CMDLINE DATA DIRECTORIES ######
set(FAUST_MISC_DIR ${PROJECT_SOURCE_DIR}/misc CACHE INTERNAL "")
set(FAUST_MISC_DATA_DIR ${FAUST_MISC_DIR}/data CACHE INTERNAL "")
set(FAUST_CMDLINE_SRC_DATA_DIR ${FAUST_MISC_DATA_DIR}/txt CACHE INTERNAL "")
set(FAUST_MISC_CONFIG_DIR ${FAUST_MISC_DIR}/config_file CACHE INTERNAL "")
set(FAUST_CMDLINE_SRC_CONFIGFILE_DIR ${FAUST_MISC_CONFIG_DIR}/xml CACHE INTERNAL "")
set(FAUST_DATA_DIR ${FAUST_MISC_DIR}/data CACHE INTERNAL "")
set(FAUST_DATA_TXT_DIR ${FAUST_MISC_DIR}/data/txt CACHE INTERNAL "")
set(FAUST_CONFIG_DIR ${FAUST_MISC_DIR}/config_file CACHE INTERNAL "")
set(FAUST_CONFIG_XML_DIR ${FAUST_MISC_DIR}/config_file/xml CACHE INTERNAL "")
###### MISC DIRECTORIES ######
set(FAUST_TEST_SRC_DIR ${FAUST_MISC_DIR}/test CACHE INTERNAL "")
set(FAUST_TESTRUNCOMP_SRC_DIR ${FAUST_TEST_SRC_DIR}/runtime_comparison CACHE INTERNAL "")
set(FAUST_TEST_SRC_TOOL_DIR ${FAUST_TEST_SRC_DIR}/tools CACHE INTERNAL "")
set(FAUST_TESTSRC_SRC_DIR ${FAUST_TEST_SRC_DIR}/src CACHE INTERNAL "")
set(FAUST_TESTDATA_SRC_DIR ${FAUST_MISC_DIR}/data/mat CACHE INTERNAL "")
set(FAUST_SRC_TEST_DIR ${FAUST_MISC_DIR}/test CACHE INTERNAL "")
set(FAUST_DATA_MAT_DIR ${FAUST_MISC_DIR}/data/mat CACHE INTERNAL "")
set(FAUST_SRC_TEST_TIME_COMP_DIR ${FAUST_SRC_TEST_DIR}/runtime_comparison CACHE INTERNAL "")
set(FAUST_SRC_TEST_TOOL_DIR ${FAUST_SRC_TEST_DIR}/tools CACHE INTERNAL "")
set(FAUST_SRC_TEST_SRC_DIR ${FAUST_SRC_TEST_DIR}/src CACHE INTERNAL "")
###### WRAPPER MATLAB DIRECTORIES ######
if (FAUST_USE_MEX)
###### SRC DIRECTORY #####
set(FAUST_MATLAB_SRC_DIR ${FAUST_WRAPPER_DIR}/matlab CACHE INTERNAL "")
set(FAUST_MATLAB_TOOLS_SRC_DIR ${FAUST_MATLAB_SRC_DIR}/tools CACHE INTERNAL "")
set(FAUST_MATLAB_MEX_SRC_DIR ${FAUST_MATLAB_SRC_DIR}/src CACHE INTERNAL "")
set(FAUST_MATLAB_DOC_SRC_DIR ${FAUST_MATLAB_SRC_DIR}/doc CACHE INTERNAL "")
set(FAUST_MATLAB_SRC_DIR ${FAUST_SRC_WRAPPER_DIR}/matlab CACHE INTERNAL "")
set(FAUST_MATLAB_TOOLS_SRC_DIR ${FAUST_MATLAB_SRC_DIR}/tools CACHE INTERNAL "")
set(FAUST_MATLAB_MEX_SRC_DIR ${FAUST_MATLAB_SRC_DIR}/src CACHE INTERNAL "")
set(FAUST_MATLAB_DOC_SRC_DIR ${FAUST_MATLAB_SRC_DIR}/doc CACHE INTERNAL "")
###### BIN DIRECTORY ######
set(FAUST_MATLAB_BIN_DIR ${FAUST_WRAPPER_BIN_DIR}/matlab CACHE INTERNAL "")
set(FAUST_MATLAB_MEX_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/mex CACHE INTERNAL "")
set(FAUST_MATLAB_TOOLS_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/tools CACHE INTERNAL "")
set(FAUST_MATLAB_BIN_DIR ${FAUST_BIN_WRAPPER_DIR}/matlab CACHE INTERNAL "")
set(FAUST_MATLAB_MEX_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/mex CACHE INTERNAL "")
set(FAUST_MATLAB_TOOLS_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/tools CACHE INTERNAL "")
#### INSTALL DIRECTORY ####
set(FAUST_MATLAB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/matlab)
set(FAUST_MATLAB_MEX_INSTALL_DIR ${FAUST_MATLAB_INSTALL_DIR}/mex)
set(FAUST_MATLAB_TOOLS_INSTALL_DIR ${FAUST_MATLAB_INSTALL_DIR}/tools CACHE INTERNAL "")
set(FAUST_MATLAB_MEX_INSTALL_DIR ${FAUST_MATLAB_INSTALL_DIR}/mex)
set(FAUST_MATLAB_TOOLS_INSTALL_DIR ${FAUST_MATLAB_INSTALL_DIR}/tools CACHE INTERNAL "")
endif(FAUST_USE_MEX)
########## DEMO DIRECTORIES #############
###### SRC DIRECTORY #####
set(FAUST_DEMO_SRC_DIR ${FAUST_MISC_DIR}/demo CACHE INTERNAL "")
set(FAUST_DEMO_BSL_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Brain_source_localization CACHE INTERNAL "")
set(FAUST_DEMO_TOOLS_SRC_DIR ${FAUST_DEMO_SRC_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_SRC_DIR ${FAUST_DEMO_BSL_SRC_DIR}/data/ CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Hadamard_factorization CACHE INTERNAL "")
###### BIN DIRECTORY ######
set(FAUST_DEMO_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/demo CACHE INTERNAL "")
set(FAUST_DEMO_BSL_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Brain_source_localization CACHE INTERNAL "")
set(FAUST_DEMO_TOOLS_BIN_DIR ${FAUST_DEMO_BIN_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_BIN_DIR ${FAUST_DEMO_BSL_BIN_DIR}/data/ CACHE INTERNAL "")
set(FAUST_DEMO_BSL_OUTPUT_BIN_DIR ${FAUST_DEMO_BSL_BIN_DIR}/output/ CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Hadamard_factorization CACHE INTERNAL "")
#### INSTALL DIRECTORY ####
set(FAUST_DEMO_INSTALL_DIR ${FAUST_MATLAB_INSTALL_DIR}/demo CACHE INTERNAL "")
set(FAUST_DEMO_BSL_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Brain_source_localization CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/data CACHE INTERNAL "")
set(FAUST_DEMO_TOOLS_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/data CACHE INTERNAL "")
set(FAUST_DEMO_BSL_OUTPUT_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/output CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Hadamard_factorization CACHE INTERNAL "")
## examples directories including some examples of the use of the library FAuST
set(FAUST_TEST_DIR ${PROJECT_BINARY_DIR}/run_test CACHE INTERNAL "")
set(FAUST_TEST_BIN_DIR ${FAUST_TEST_DIR}/bin CACHE INTERNAL "")
set(FAUST_TESTSRC_BIN_DIR ${FAUST_TEST_DIR}/src CACHE INTERNAL "")
set(FAUST_TESTTMP_BIN_DIR ${FAUST_TEST_DIR}/tmp CACHE INTERNAL "")
set(FAUST_TESTOUTPUT_BIN_DIR ${FAUST_TEST_DIR}/output CACHE INTERNAL "")
set(FAUST_TESTFIG_BIN_DIR ${FAUST_TEST_DIR}/fig CACHE INTERNAL "")
set(FAUST_TESTRUNCOMP_BIN_DIR ${FAUST_TEST_DIR}/runtime_comparison CACHE INTERNAL "")
set(FAUST_TESTTOOLS_BIN_DIR ${FAUST_TEST_DIR}/tools CACHE INTERNAL "")
###### SRC DIRECTORY #####
set(FAUST_DEMO_SRC_DIR ${FAUST_MISC_DIR}/demo CACHE INTERNAL "")
set(FAUST_DEMO_BSL_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Brain_source_localization CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Brain_source_localization/data/ CACHE INTERNAL "")
set(FAUST_DEMO_TOOLS_SRC_DIR ${FAUST_DEMO_SRC_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Hadamard_factorization CACHE INTERNAL "")
###### BIN DIRECTORY ######
set(FAUST_DEMO_BIN_DIR ${FAUST_MATLAB_BIN_DIR}/demo CACHE INTERNAL "")
set(FAUST_DEMO_BSL_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Brain_source_localization CACHE INTERNAL "")
set(FAUST_DEMO_TOOLS_BIN_DIR ${FAUST_DEMO_BIN_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_BIN_DIR ${FAUST_DEMO_BIN_DIR}/Hadamard_factorization CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_BIN_DIR ${FAUST_DEMO_BSL_BIN_DIR}/data/ CACHE INTERNAL "")
set(FAUST_DEMO_BSL_OUTPUT_BIN_DIR ${FAUST_DEMO_BSL_BIN_DIR}/output/ CACHE INTERNAL "")
#### INSTALL DIRECTORY ####
set(FAUST_DEMO_INSTALL_DIR ${FAUST_MATLAB_INSTALL_DIR}/demo CACHE INTERNAL "")
set(FAUST_DEMO_BSL_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Brain_source_localization CACHE INTERNAL "")
set(FAUST_DEMO_TOOLS_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Hadamard_factorization CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/data CACHE INTERNAL "")
set(FAUST_DEMO_BSL_DATA_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/data CACHE INTERNAL "")
set(FAUST_DEMO_BSL_OUTPUT_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/output CACHE INTERNAL "")
## examples directories including some examples of the use of the library FAuST
set(FAUST_TEST_DIR ${PROJECT_BINARY_DIR}/run_test CACHE INTERNAL "")
set(FAUST_TEST_BIN_DIR ${FAUST_TEST_DIR}/bin CACHE INTERNAL "")
set(FAUST_TESTSRC_BIN_DIR ${FAUST_TEST_DIR}/src CACHE INTERNAL "")
set(FAUST_TESTTMP_BIN_DIR ${FAUST_TEST_DIR}/tmp CACHE INTERNAL "")
set(FAUST_TESTOUTPUT_BIN_DIR ${FAUST_TEST_DIR}/output CACHE INTERNAL "")
set(FAUST_TESTFIG_BIN_DIR ${FAUST_TEST_DIR}/fig CACHE INTERNAL "")
set(FAUST_TESTRUNCOMP_BIN_DIR ${FAUST_TEST_DIR}/runtime_comparison CACHE INTERNAL "")
set(FAUST_TESTTOOLS_BIN_DIR ${FAUST_TEST_DIR}/tools CACHE INTERNAL "")
##################################################################
### pour le GPU
if (FAUST_USE_GPU)
#set(FAUST_MATRIX_CU_SRC_DIR ${FAUST_SRC_DIR}/faust_linear_operator/matrix_cu CACHE INTERNAL "")
#set(FAUST_FAUSTCORE_CU_SRC_DIR ${FAUST_SRC_DIR}/faust_linear_operator/faust_core_cu CACHE INTERNAL "")
set(FAUST_LINEAR_OPERATOR_GPU_SRC_DIR ${FAUST_LINEAR_OPERATOR_SRC_DIR}/GPU CACHE INTERNAL "")
# set(FAUST_ALGORITHM_CU_SRC_DIR ${FAUST_SRC_DIR}/algorithm/palm4MSA_cu CACHE INTERNAL "")
# set(FAUST_ALGORITHM_CU_SRC_DIR ${FAUST_SRC_DIR}/algorithm CACHE INTERNAL "")
set(FAUST_TEST_GPU_SRC_DIR ${FAUST_MISC_DIR}/test/GPU_test CACHE INTERNAL "")
#set(FAUST_MATRIX_CU_BIN_DIR ${FAUST_LINEAR_OPERATOR_BIN_DIR}/matrix_cu CACHE INTERNAL "")
#set(FAUST_FAUSTCORE_CU_BIN_DIR ${FAUST_LINEAR_OPERATOR_BIN_DIR}/faust_core_cu CACHE INTERNAL "")
set(FAUST_LINEAR_OPERATOR_GPU_BIN_DIR ${FAUST_LINEAR_OPERATOR_BIN_DIR}/GPU CACHE INTERNAL "")
# set(FAUST_ALGORITHM_CU_BIN_DIR ${FAUST_ALGORITHM_BIN_DIR}/palm4MSA_cu CACHE INTERNAL "")
set(FAUST_TEST_GPU_SRC_DIR ${FAUST_MISC_DIR}/test/GPU_test CACHE INTERNAL "")
set(FAUST_TEST_GPU_BIN_DIR ${FAUST_TEST_DIR}/binGPU CACHE INTERNAL "")
endif(FAUST_USE_GPU)
###### DOCUMENTATION DIRECTORIES ######
if (FAUST_GEN_DOC)
set(FAUST_DOC_SRC_DIR ${PROJECT_SOURCE_DIR}/gen_doc CACHE INTERNAL "")
......@@ -292,13 +266,12 @@ install(DIRECTORY ${FAUST_DEMO_BSL_OUTPUT_BIN_DIR} DESTINATION ${FAUST_DEMO_BSL_
#set(FAUST_INSTALL_MEX ${CMAKE_INSTALL_PREFIX}/mex)
#set(FAUST_INSTALL_LIB ${CMAKE_INSTALL_PREFIX}/lib)
#set(FAUST_INSTALL_CMDLINE ${CMAKE_INSTALL_PREFIX}/CmdLine)
#set(FAUST_INSTALL_TESTING_BIN ${CMAKE_INSTALL_PREFIX}/testing/bin)
#set(FAUST_INSTALL_BIN ${CMAKE_INSTALL_PREFIX}/testing/bin)
#set(FAUST_INSTALL_TESTING_DATA ${CMAKE_INSTALL_PREFIX}/testing/data)
#set(FAUST_INSTALL_TESTRUNCOMP ${CMAKE_INSTALL_PREFIX}/testing/runtime_comparison CACHE INTERNAL "")
#set(FAUST_INSTALL_BIN_TIME_COMP ${CMAKE_INSTALL_PREFIX}/testing/runtime_comparison CACHE INTERNAL "")
#message(STATUS "ALALALLLLLLLLLLL CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
#message(STATUS "ALALALLLLLLLLLLL FAUST_INSTALL_TESTING_BIN=${FAUST_INSTALL_TESTING_BIN}")
#message(STATUS "ALALALLLLLLLLLLL FAUST_INSTALL_BIN=${FAUST_INSTALL_BIN}")
#message(STATUS "ALALALLLLLLLLLLL FAUST_INSTALL_LIB=${FAUST_INSTALL_LIB}")
......@@ -523,11 +496,11 @@ endif(FAUST_USE_MEX)
###### TARGET GENERATION ######
add_subdirectory(${FAUST_LINEAR_OPERATOR_SRC_DIR} ${FAUST_LINEAR_OPERATOR_BIN_DIR})
add_subdirectory(${FAUST_ALGORITHM_SRC_DIR} ${FAUST_ALGORITHM_BIN_DIR})
add_subdirectory(${FAUST_TEST_SRC_DIR} ${FAUST_TEST_BIN_DIR})
add_subdirectory(${FAUST_SRC_TEST_DIR} ${FAUST_TEST_BIN_DIR})
if (FAUST_GEN_DOC)
add_subdirectory(${FAUST_DOC_SRC_DIR} ${FAUST_DOC_BIN_DIR})
endif ()
add_subdirectory(${FAUST_CMDLINE_SRC_DIR} ${FAUST_CMDLINE_BIN_DIR})
add_subdirectory(${FAUST_SRC_CMDLINE_DIR} ${FAUST_BIN_CMDLINE_BIN_DIR})
if (FAUST_USE_GPU)
add_subdirectory(${FAUST_LINEAR_OPERATOR_GPU_SRC_DIR} ${FAUST_LINEAR_OPERATOR_GPU_BIN_DIR})
#add_subdirectory(${FAUST_FAUSTCORE_CU_SRC_DIR} ${FAUST_FAUSTCORE_CU_BIN_DIR})
......
......@@ -460,14 +460,14 @@ INPUT = "@FAUST_DOC_SRC_DIR@/mainpage.md" \
"@FAUST_LINEAR_OPERATOR_SRC_DIR@" \
"@FAUST_ALGORITHM_CONSTRAINT_SRC_DIR@" \
"@FAUST_ALGORITHM_FACTORIZATION_SRC_DIR@" \
"@FAUST_CMDLINE_BIN_SRC_DIR@" \
"@FAUST_BIN_CMDLINE_SRC_DIR@" \
"@FAUST_TESTSRC_BIN_DIR@"
USE_MDFILE_AS_MAINPAGE = mainpage
INPUT_ENCODING = UTF-8
#"@FAUST_WRAPPER_BIN_DIR@" \
#"@FAUST_BIN_WRAPPER_DIR@" \
# "@FAUST_PALM4MSA_SRC_DIR@" \
# "@FAUST_FAUSTCORE_SRC_DIR@" \
# "@FAUST_MATIO_SRC_DIR@" \
......@@ -476,9 +476,9 @@ INPUT_ENCODING = UTF-8
# "@FAUST_EXCEPTION_SRC_DIR@" \
# "@FAUST_MEXINTERFACE_SRC_DIR@" \
# "@FAUST_CMDLINE_SRC_DIR@" \
# "@FAUST_SRC_CMDLINE_DIR@" \
# "@FAUST_DEMO_SRC_DIR@" \
# "@FAUST_TEST_SRC_DIR@" \
# "@FAUST_SRC_TEST_DIR@" \
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
......@@ -1407,7 +1407,7 @@ SEARCHENGINE = YES
## "@PROJECT_BINARY_DIR@/wrapper/cmd_line/src"
#INPUT = "@FAUST_DOC_SRC_DIR@/mainpage.md" \
# "@FAUST_WRAPPER_BIN_DIR@" \
# "@FAUST_BIN_WRAPPER_DIR@" \
# "@FAUST_PALM4MSA_SRC_DIR@" \
# "@FAUST_FAUSTCORE_SRC_DIR@" \
# "@FAUST_MATIO_SRC_DIR@" \
......@@ -1415,9 +1415,9 @@ SEARCHENGINE = YES
## "@FAUST_EXCEPTION_SRC_DIR@" \
## "@FAUST_MEXINTERFACE_SRC_DIR@" \
## "@FAUST_CMDLINE_SRC_DIR@" \
## "@FAUST_SRC_CMDLINE_DIR@" \
## "@FAUST_DEMO_SRC_DIR@" \
## "@FAUST_TEST_SRC_DIR@" \
## "@FAUST_SRC_TEST_DIR@" \
#
## "../../../cmd_line/xml_tools/xml_utils.cpp" \
......
......@@ -26,7 +26,7 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO AND HDF5_LIB_FILE)
foreach(TEST_FPP float double)
foreach(testin hierarchicalFactorization test_palm4MSA multiply_compare_time)
# copy CPU files cpp.in to the user's ./src/ directory in float et double precision
configure_file(${FAUST_TESTSRC_SRC_DIR}/${testin}.cpp.in ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
configure_file(${FAUST_SRC_TEST_SRC_DIR}/${testin}.cpp.in ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
# Generation of the binary files in double and float precision
add_executable(${testin}_${TEST_FPP} ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp ${FAUST_TESTSRC_BIN_DIR}/ ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio.cpp ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio_mat.cpp)
......@@ -38,14 +38,14 @@ if(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO AND HDF5_LIB_FILE)
endforeach()
endforeach()
#message(STATUS "ALALALLLLLLLLLLL FAUST_INSTALL_TESTING_BIN=${FAUST_INSTALL_TESTING_BIN}")
#message(STATUS "ALALALLLLLLLLLLL FAUST_INSTALL_BIN=${FAUST_INSTALL_BIN}")
install(TARGETS hierarchicalFactorization_double hierarchicalFactorization_float test_palm4MSA_double test_palm4MSA_float multiply_compare_time_double multiply_compare_time_float DESTINATION ${FAUST_INSTALL_TESTING_BIN})
install(TARGETS hierarchicalFactorization_double hierarchicalFactorization_float test_palm4MSA_double test_palm4MSA_float multiply_compare_time_double multiply_compare_time_float DESTINATION ${FAUST_INSTALL_BIN})
# matlab script useful for displaying the result of the multiply_compare_time executable (
configure_file(${FAUST_TESTRUNCOMP_SRC_DIR}/display_multiply_comptime.m.in ${FAUST_TESTRUNCOMP_BIN_DIR}/display_multiply_comptime.m @ONLY)
install(FILES ${FAUST_TESTRUNCOMP_BIN_DIR}/display_multiply_comptime.m DESTINATION ${FAUST_INSTALL_TESTRUNCOMP})
configure_file(${FAUST_SRC_TEST_TIME_COMP_DIR}/display_multiply_comptime.m.in ${FAUST_TESTRUNCOMP_BIN_DIR}/display_multiply_comptime.m @ONLY)
install(FILES ${FAUST_TESTRUNCOMP_BIN_DIR}/display_multiply_comptime.m DESTINATION ${FAUST_INSTALL_BIN_TIME_COMP})
###### IN CASE MATIO IS NOT AVAILABLE YOU CAN RUN THE TEST ######
......@@ -56,11 +56,11 @@ endif(MATIO_LIB_FILE AND MATIO_INC_DIR AND FAUST_USE_MATIO AND HDF5_LIB_FILE)
if (FAUST_USE_MEX)
configure_file(${FAUST_TEST_SRC_TOOL_DIR}/set_path.m.in ${FAUST_TESTTOOLS_BIN_DIR}/set_path.m @ONLY)
configure_file(${FAUST_TEST_SRC_TOOL_DIR}/launch_hierarchical_fact.m ${FAUST_TESTTOOLS_BIN_DIR}/launch_hierarchical_fact.m COPYONLY)
configure_file(${FAUST_SRC_TEST_TOOL_DIR}/set_path.m.in ${FAUST_TESTTOOLS_BIN_DIR}/set_path.m @ONLY)
configure_file(${FAUST_SRC_TEST_TOOL_DIR}/launch_hierarchical_fact.m ${FAUST_TESTTOOLS_BIN_DIR}/launch_hierarchical_fact.m COPYONLY)
foreach(matlabtest hier_fact.m MEG_fact.m)
configure_file(${FAUST_TESTSRC_SRC_DIR}/${matlabtest} ${FAUST_TEST_BIN_DIR}/${matlabtest} COPYONLY)
configure_file(${FAUST_SRC_TEST_SRC_DIR}/${matlabtest} ${FAUST_TEST_BIN_DIR}/${matlabtest} COPYONLY)
endforeach()
endif(FAUST_USE_MEX)
......@@ -80,11 +80,11 @@ set(TIMEOUT_COMP 3000)
if (FAUST_USE_MATIO)
# test for the algorithm (palm4MSA and hierarchical_fact) for different configuration (MEG, Hadamard,...)
add_test(NAME HADAMARD_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_double ${FAUST_TESTDATA_SRC_DIR}/config_HADAMARD.mat)
add_test(NAME FAUST_HIER_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_double ${FAUST_TESTDATA_SRC_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME FAUST_HIER_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_float ${FAUST_TESTDATA_SRC_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME MEG_FACT_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_float ${FAUST_TESTDATA_SRC_DIR}/config_MEG.mat 22332 1)
add_test(NAME MEG_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_double ${FAUST_TESTDATA_SRC_DIR}/config_MEG.mat 22480 1)
add_test(NAME HADAMARD_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_double ${FAUST_DATA_MAT_DIR}/config_HADAMARD.mat)
add_test(NAME FAUST_HIER_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_double ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME FAUST_HIER_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_float ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME MEG_FACT_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_float ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22332 1)
add_test(NAME MEG_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchicalFactorization_double ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22480 1)
add_test(NAME PALM4MSA_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/test_palm4MSA_double )
add_test(NAME PALM4MSA_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/test_palm4MSA_float )
......@@ -109,11 +109,11 @@ endif (FAUST_USE_MATIO)
# XML input format
if (FAUST_USE_XML)
add_test(NAME FAUST_HIER_CMDLINE COMMAND ${FAUST_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CMDLINE_SRC_CONFIGFILE_DIR}/hier_fact_config.xml ${FAUST_CMDLINE_SRC_DATA_DIR}/hier_fact_data.txt )
add_test(NAME FAUST_HIER_CMDLINE COMMAND ${FAUST_BIN_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CONFIG_XML_DIR}/hier_fact_config.xml ${FAUST_DATA_TXT_DIR}/hier_fact_data.txt )
add_test(NAME FAUST_HIER_TRANSPOSE_CMDLINE COMMAND ${FAUST_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CMDLINE_SRC_CONFIGFILE_DIR}/trans_hier_fact_config.xml ${FAUST_CMDLINE_SRC_DATA_DIR}/hier_fact_data.txt T)
add_test(NAME FAUST_HIER_TRANSPOSE_CMDLINE COMMAND ${FAUST_BIN_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CONFIG_XML_DIR}/trans_hier_fact_config.xml ${FAUST_DATA_TXT_DIR}/hier_fact_data.txt T)
add_test(NAME MEG_FACT_CMDLINE COMMAND ${FAUST_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CMDLINE_SRC_CONFIGFILE_DIR}/MEG_config.xml ${FAUST_CMDLINE_SRC_DATA_DIR}/MEG_data.txt )
add_test(NAME MEG_FACT_CMDLINE COMMAND ${FAUST_BIN_CMDLINE_BIN_DIR}/launch_hierarchical_fact ${FAUST_CONFIG_XML_DIR}/MEG_config.xml ${FAUST_DATA_TXT_DIR}/MEG_data.txt )
# limit the time of the process in case of bug...
set_tests_properties(FAUST_HIER_CMDLINE FAUST_HIER_TRANSPOSE_CMDLINE PROPERTIES TIMEOUT ${TIMEOUT_COMP})
set_tests_properties(MEG_FACT_CMDLINE PROPERTIES TIMEOUT ${TIMEOUT_MEG})
......@@ -157,21 +157,21 @@ endif()
# foreach(TEST_FPP float double)
# foreach(testin hierarchical_fact_cu)
# # copy CPU files cpp.in to the user's ./src/ directory en float et double precision
# configure_file(${FAUST_TESTSRC_SRC_DIR}/${testin}.cpp.in ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
# configure_file(${FAUST_SRC_TEST_SRC_DIR}/${testin}.cpp.in ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
# # Creation des executable en double et en float
# add_executable(${testin}_${TEST_FPP} ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp ${FAUST_TESTSRC_BIN_DIR}/ ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio.cpp ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio_mat.cpp)
# target_link_libraries(${testin}_${TEST_FPP} ${FAUST_TARGET} ${MATIO_LIB_FILE} ${HDF5_LIB_FILE} ${CUBLAS_LIB_FILE} ${CUDART_LIB_FILE} ${CUSPARSE_LIB_FILE})
# install(TARGETS ${testin}_${TEST_FPP} DESTINATION ${FAUST_INSTALL_TESTING_BIN})
# install(TARGETS ${testin}_${TEST_FPP} DESTINATION ${FAUST_INSTALL_BIN})
# endforeach()
# endforeach()
# # test GPU
# add_test(NAME HADAMARD_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_TESTDATA_SRC_DIR}/config_HADAMARD.mat)
# add_test(NAME FAUST_HIER_GPU_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_TESTDATA_SRC_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
# add_test(NAME FAUST_HIER_GPU_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_float ${FAUST_TESTDATA_SRC_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
# add_test(NAME MEG_GPU_FACT_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_float ${FAUST_TESTDATA_SRC_DIR}/config_MEG.mat 22332 1)
# add_test(NAME MEG_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_TESTDATA_SRC_DIR}/config_MEG.mat 22480 1)
# add_test(NAME HADAMARD_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_DATA_MAT_DIR}/config_HADAMARD.mat)
# add_test(NAME FAUST_HIER_GPU_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
# add_test(NAME FAUST_HIER_GPU_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_float ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
# add_test(NAME MEG_GPU_FACT_FLOAT COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_float ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22332 1)
# add_test(NAME MEG_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_BIN_DIR}/hierarchical_fact_cu_double ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22480 1)
# set(TIMEOUT_MEG 14000)
# set_tests_properties(MEG_GPU_FACT_FLOAT MEG_GPU_FACT_DOUBLE PROPERTIES TIMEOUT ${TIMEOUT_MEG})
#endif(FAUST_USE_GPU)
......
......@@ -13,21 +13,21 @@ add_definitions(-DCOMPILE_GPU)
foreach(TEST_FPP float double)
foreach(testin hierarchicalFactorization_gpu)
# copy CPU files cpp.in to the user's ./src/ directory en float et double precision
configure_file(${FAUST_TESTSRC_SRC_DIR}/${testin}.cpp.in ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
configure_file(${FAUST_SRC_TEST_SRC_DIR}/${testin}.cpp.in ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp @ONLY)
# Creation des executable en double et en float
add_executable(${testin}_${TEST_FPP} ${FAUST_TESTSRC_BIN_DIR}/${testin}_${TEST_FPP}.cpp ${FAUST_TESTSRC_BIN_DIR}/ ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio.cpp ${FAUST_CMDLINE_TYPE_FORMAT_MAT_SRC_DIR}/faust_init_from_matio_mat.cpp)
target_link_libraries(${testin}_${TEST_FPP} ${FAUST_TARGET} ${MATIO_LIB_FILE} ${HDF5_LIB_FILE} ${CUBLAS_LIB_FILE} ${CUDART_LIB_FILE} ${CUSPARSE_LIB_FILE})
install(TARGETS ${testin}_${TEST_FPP} DESTINATION ${FAUST_INSTALL_TESTING_BIN})
install(TARGETS ${testin}_${TEST_FPP} DESTINATION ${FAUST_INSTALL_BIN})
endforeach()
endforeach()
# test GPU
add_test(NAME HADAMARD_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_double ${FAUST_TESTDATA_SRC_DIR}/config_HADAMARD.mat)
add_test(NAME FAUST_HIER_GPU_DOUBLE COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_double ${FAUST_TESTDATA_SRC_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME FAUST_HIER_GPU_FLOAT COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_float ${FAUST_TESTDATA_SRC_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME MEG_GPU_FACT_FLOAT COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_float ${FAUST_TESTDATA_SRC_DIR}/config_MEG.mat 22332 1)
add_test(NAME MEG_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_double ${FAUST_TESTDATA_SRC_DIR}/config_MEG.mat 22480 1)
add_test(NAME HADAMARD_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_double ${FAUST_DATA_MAT_DIR}/config_HADAMARD.mat)
add_test(NAME FAUST_HIER_GPU_DOUBLE COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_double ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME FAUST_HIER_GPU_FLOAT COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_float ${FAUST_DATA_MAT_DIR}/config_compared_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME MEG_GPU_FACT_FLOAT COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_float ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22332 1)
add_test(NAME MEG_GPU_FACT_DOUBLE COMMAND ${FAUST_TEST_GPU_BIN_DIR}/hierarchicalFactorization_gpu_double ${FAUST_DATA_MAT_DIR}/config_MEG.mat 22480 1)
set(TIMEOUT_MEG 14000)
set_tests_properties(MEG_GPU_FACT_FLOAT MEG_GPU_FACT_DOUBLE PROPERTIES TIMEOUT ${TIMEOUT_MEG})
......
%% this function displays the resulting C++ computed times between the 2 different
% multiplication (faust vs dense matrix) for different RCG, dimension and
% matrix
%% WARNING this script must be run after @FAUST_TEST_SRC_DIR@/gen_artificial_faust.m
%% WARNING this script must be run after @FAUST_SRC_TEST_DIR@/gen_artificial_faust.m
% which store some Faust::Transform example with different dimensions RCG and
% number of factors in
% after run the executable
......
......@@ -14,7 +14,7 @@
#include <iomanip>
/** \brief An example of using the hierarchical factorization of a dense matrix. from .mat file.
* An dense matrix is loaded from "@FAUST_TESTDATA_SRC_DIR@
* An dense matrix is loaded from "@FAUST_DATA_MAT_DIR@
* \param configFilename : a .mat (MATLAB file) configuration file which contains the parameter of the hierarchical algorithm (default launch with a predefined configuration called hierFact)
* \param expectedLambda (optionnal) : compared the expected scalar of the factorisation with the computed one in the precision defined with epsilon
*\param epsilon : precision for the test of equality (default value 0.0001)
......@@ -35,7 +35,7 @@ int main(int argc, char* argv[])
}
string configFilename = "@FAUST_TESTDATA_SRC_DIR@/config_compared_hierarchical_fact.mat";
string configFilename = "@FAUST_DATA_MAT_DIR@/config_compared_hierarchical_fact.mat";
......
......@@ -34,7 +34,7 @@ int main(int argc, char* argv[])
}
string configFilename = "@FAUST_TESTDATA_SRC_DIR@/config_compared_hierarchical_fact.mat";
string configFilename = "@FAUST_DATA_MAT_DIR@/config_compared_hierarchical_fact.mat";
if (argc >= 2)
configFilename = argv[1];
......
......@@ -14,7 +14,7 @@
/** \brief Use this script to make runtime comparison between Faust-vector product and Dense matrix-vector product , this script takes to arguments :
\param inputfile Faust_example.mat where all the Fausts with different Density, Dimensions and number of factor are stored. This input file is generated by test/gen_artificial_faust.m (default input file @FAUST_TESTDATA_SRC_DIR@/Faust_example.mat)
\param inputfile Faust_example.mat where all the Fausts with different Density, Dimensions and number of factor are stored. This input file is generated by test/gen_artificial_faust.m (default input file @FAUST_DATA_MAT_DIR@/Faust_example.mat)
\param NB_run the number multiplication made per given configuration (dimension, number of factor, RCG) (default value 100)
The different computed times are stored in a single mat file :
......@@ -39,7 +39,7 @@ int main(int argc, char* argv[])
string mat_file = "@FAUST_TESTDATA_SRC_DIR@/Faust_example.mat";// default file input where the faust and the dense matrix are stored
string mat_file = "@FAUST_DATA_MAT_DIR@/Faust_example.mat";// default file input where the faust and the dense matrix are stored
int nb_run_tmp = 200;// default number of multiplication per configuration of faust
......
......@@ -26,9 +26,9 @@ int main()
faust_params<FPP> params;
if (testMEG)
init_params_from_matiofile(params, "@FAUST_TESTDATA_SRC_DIR@/config_MEG.mat", "params");
init_params_from_matiofile(params, "@FAUST_DATA_MAT_DIR@/config_MEG.mat", "params");
else
init_params_from_matiofile(params, "@FAUST_TESTDATA_SRC_DIR@/config_compared_hierarchical_fact.mat", "params");
init_params_from_matiofile(params, "@FAUST_DATA_MAT_DIR@/config_compared_hierarchical_fact.mat", "params");
//cout << "update_way=" << params.isUpdateWayR2L << endl;
......@@ -59,9 +59,9 @@ int main()
for (int i=0 ; i<facts.size() ; i++)
{
if (testMEG)
sprintf(filename, "@FAUST_TESTDATA_SRC_DIR@/facts_MEG%d.txt", i);
sprintf(filename, "@FAUST_DATA_MAT_DIR@/facts_MEG%d.txt", i);
else
sprintf(filename, "@FAUST_TESTDATA_SRC_DIR@/learning_compared_fact%d.txt", i);
sprintf(filename, "@FAUST_DATA_MAT_DIR@/learning_compared_fact%d.txt", i);
facts[i].init_from_file(filename);
}
faust_core<FPP> faust(facts, (FFPP)1.0);
......
......@@ -21,7 +21,7 @@ int main()
{
Faust::MatDense<FPP,Cpu> data, initFacts1, initFacts2;
char configPalm2Filename[] = "@FAUST_TESTDATA_SRC_DIR@/config_compared_palm2.mat";
char configPalm2Filename[] = "@FAUST_DATA_MAT_DIR@/config_compared_palm2.mat";
init_faust_mat_from_matio(data, configPalm2Filename, "data");
init_faust_mat_from_matio(initFacts1, configPalm2Filename, "init_facts1");
......
addpath('@FAUST_MATLAB_MEX_BIN_DIR@');%% access to the mexfunction
addpath('@FAUST_TESTDATA_SRC_DIR@');%% access to the data (meg and faust_hier configuration)
addpath('@FAUST_DATA_MAT_DIR@');%% access to the data (meg and faust_hier configuration)
addpath('@FAUST_MATLAB_TOOLS_BIN_DIR@');%% access to matlab_faust.m (interface betwwen faust_core C++ class and matlab class)
......@@ -9,8 +9,8 @@ if (FAUST_USE_OPENBLAS)
endif(FAUST_USE_OPENBLAS)
foreach(algofile launch_hierarchical_fact launch_palm4MSA)
configure_file(${FAUST_CMDLINE_FUNC_SRC_DIR}/${algofile}.cpp ${FAUST_CMDLINE_BIN_SRC_DIR}/${algofile}.cpp COPYONLY)
add_executable(${algofile} ${FAUST_CMDLINE_BIN_SRC_DIR}/${algofile}.cpp ${FAUST_CMDLINE_TYPE_FORMAT_XML_SRC_DIR}/xml_utils.cpp)
configure_file(${FAUST_CMDLINE_FUNC_SRC_DIR}/${algofile}.cpp ${FAUST_BIN_CMDLINE_SRC_DIR}/${algofile}.cpp COPYONLY)
add_executable(${algofile} ${FAUST_BIN_CMDLINE_SRC_DIR}/${algofile}.cpp ${FAUST_CMDLINE_TYPE_FORMAT_XML_SRC_DIR}/xml_utils.cpp)
if(FAUST_USE_OPENBLAS)
target_link_libraries(${algofile} ${FAUST_TARGET} ${OPENBLAS_LIB_FILE} ${XML2_LIB_FILE})
else()
......@@ -18,6 +18,6 @@ endif(FAUST_USE_OPENBLAS)
endif()
endforeach()
#install(TARGETS launch_hierarchical_fact launch_palm4MSA DESTINATION ${FAUST_CMDLINE_BIN_DIR})
#install(TARGETS launch_hierarchical_fact launch_palm4MSA DESTINATION ${FAUST_BIN_CMDLINE_BIN_DIR})
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment