Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6cb5a9d6 authored by Nicolas Bellot's avatar Nicolas Bellot Committed by hhakim
Browse files

migration de data misc/demo/BSL vers misc/data

parent 8c3ace1f
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ 6cb5a9d6
...@@ -341,7 +341,7 @@ if (BUILD_MATLAB_MEX_FILES) ...@@ -341,7 +341,7 @@ if (BUILD_MATLAB_MEX_FILES)
###### SRC DIRECTORY ##### ###### SRC DIRECTORY #####
set(FAUST_DEMO_SRC_DIR ${FAUST_MISC_DIR}/demo CACHE INTERNAL "") 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_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_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_TOOLS_SRC_DIR ${FAUST_DEMO_SRC_DIR}/tools CACHE INTERNAL "")
set(FAUST_DEMO_HADAMARD_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Hadamard_factorization CACHE INTERNAL "") set(FAUST_DEMO_HADAMARD_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Hadamard_factorization CACHE INTERNAL "")
set(FAUST_DEMO_TIMECOMP_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Runtime_comparison CACHE INTERNAL "") set(FAUST_DEMO_TIMECOMP_SRC_DIR ${FAUST_DEMO_SRC_DIR}/Runtime_comparison CACHE INTERNAL "")
......
misc/config_file/mat/config_MEG.mat
+ 0
− 0
View file @ 6cb5a9d6
No preview for this file type
misc/demo/Brain_source_localization/BSL.m
+ 4
− 4
View file @ 6cb5a9d6
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
% DURATION: Computations should take around 3 minutes. % DURATION: Computations should take around 3 minutes.
% %
% The MEG gain matrices used are % The MEG gain matrices used are
% the precomputed ones in "./data/M_X.mat" % the precomputed ones in "./data/faust_MEG_rcg_X.mat"
% %
% For more information on the FAuST Project, please visit the website of % For more information on the FAuST Project, please visit the website of
% the project : <http://faust.gforge.inria.fr> % the project : <http://faust.gforge.inria.fr>
...@@ -66,7 +66,7 @@ BSL_data_pathName=[pathname filesep 'data']; ...@@ -66,7 +66,7 @@ BSL_data_pathName=[pathname filesep 'data'];
% files where a precomputed FauST approximation of MEG matrix are stored % files where a precomputed FauST approximation of MEG matrix are stored
MEG_FAuST_list_filename={'M_6.mat','M_8.mat','M_16.mat','M_25.mat'}; MEG_FAuST_list_filename={'faust_MEG_rcg_6.mat','faust_MEG_rcg_8.mat','faust_MEG_rcg_16.mat','faust_MEG_rcg_25.mat'};
nb_FAuST_MEG = length(MEG_FAuST_list_filename); nb_FAuST_MEG = length(MEG_FAuST_list_filename);
...@@ -75,8 +75,8 @@ MEG_list = cell(1,nb_FAuST_MEG+1); ...@@ -75,8 +75,8 @@ MEG_list = cell(1,nb_FAuST_MEG+1);
nb_MEG_matrix = length(MEG_list); nb_MEG_matrix = length(MEG_list);
%% Loading the MEG matrix and the points in the brain %% Loading the MEG matrix and the points in the brain
load([BSL_data_pathName filesep 'X_meg.mat' ]); load([BSL_data_pathName filesep 'matrix_MEG.mat' ]);
MEG_matrix = normalizeCol(X_fixed);% normalization of the columns of the MEG matrix MEG_matrix = normalizeCol(matrix);% normalization of the columns of the MEG matrix
MEG_list{1}=MEG_matrix; MEG_list{1}=MEG_matrix;
......
misc/demo/CMakeLists.txt
+ 2
− 2
View file @ 6cb5a9d6
...@@ -20,9 +20,9 @@ if(BUILD_MATLAB_MEX_FILES) ...@@ -20,9 +20,9 @@ if(BUILD_MATLAB_MEX_FILES)
install(FILES ${FAUST_DEMO_BSL_BIN_DIR}/${matlab_script} DESTINATION ${FAUST_DEMO_BSL_INSTALL_DIR}) install(FILES ${FAUST_DEMO_BSL_BIN_DIR}/${matlab_script} DESTINATION ${FAUST_DEMO_BSL_INSTALL_DIR})
endforeach() endforeach()
file(GLOB BSL_DATA_FILE RELATIVE ${FAUST_DEMO_BSL_DATA_SRC_DIR} "${FAUST_DEMO_BSL_DATA_SRC_DIR}/*.mat") file(GLOB BSL_DATA_FILE RELATIVE ${FAUST_DATA_MAT_DIR} "${FAUST_DATA_MAT_DIR}/*MEG*.mat")
foreach(data_BSL ${BSL_DATA_FILE}) foreach(data_BSL ${BSL_DATA_FILE})
configure_file(${FAUST_DEMO_BSL_DATA_SRC_DIR}/${data_BSL} ${FAUST_DEMO_BSL_DATA_BIN_DIR}/${data_BSL} COPYONLY) configure_file(${FAUST_DATA_MAT_DIR}/${data_BSL} ${FAUST_DEMO_BSL_DATA_BIN_DIR}/${data_BSL} COPYONLY)
install(FILES ${FAUST_DEMO_BSL_DATA_BIN_DIR}/${data_BSL} DESTINATION ${FAUST_DEMO_BSL_DATA_INSTALL_DIR}) install(FILES ${FAUST_DEMO_BSL_DATA_BIN_DIR}/${data_BSL} DESTINATION ${FAUST_DEMO_BSL_DATA_INSTALL_DIR})
endforeach() endforeach()
......
misc/test/CMakeLists.txt
+ 1
− 1
View file @ 6cb5a9d6
...@@ -150,7 +150,7 @@ if (BUILD_READ_MAT_FILE) ...@@ -150,7 +150,7 @@ if (BUILD_READ_MAT_FILE)
add_test(NAME MATFILE_FACT_HADAMARD_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchicalFactorization_${TEST_FPP} ${FAUST_DATA_MAT_DIR}/matrix_HADAMARD_32.mat ${FAUST_CONFIG_MAT_DIR}/config_HADAMARD_32.mat 5930 30) add_test(NAME MATFILE_FACT_HADAMARD_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchicalFactorization_${TEST_FPP} ${FAUST_DATA_MAT_DIR}/matrix_HADAMARD_32.mat ${FAUST_CONFIG_MAT_DIR}/config_HADAMARD_32.mat 5930 30)
add_test(NAME MATFILE_FACT_HIER_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchicalFactorization_${TEST_FPP} ${FAUST_DATA_MAT_DIR}/matrix_hierarchical_fact.mat ${FAUST_CONFIG_MAT_DIR}/config_hierarchical_fact.mat 9401.5 0.1) add_test(NAME MATFILE_FACT_HIER_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/hierarchicalFactorization_${TEST_FPP} ${FAUST_DATA_MAT_DIR}/matrix_hierarchical_fact.mat ${FAUST_CONFIG_MAT_DIR}/config_hierarchical_fact.mat 9401.5 0.1)
add_test(NAME MATFILE_MULTIPLICATION_MEG_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/faust_multiplication_${TEST_FPP} ${FAUST_DEMO_BSL_DATA_SRC_DIR}X_meg.mat ${FAUST_DEMO_BSL_DATA_SRC_DIR}M_6.mat ${FAUST_DEMO_BSL_DATA_SRC_DIR}M_8.mat ${FAUST_DEMO_BSL_DATA_SRC_DIR}M_16.mat ${FAUST_DEMO_BSL_DATA_SRC_DIR}M_25.mat) add_test(NAME MATFILE_MULTIPLICATION_MEG_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/faust_multiplication_${TEST_FPP} ${FAUST_DATA_MAT_DIR}/matrix_MEG.mat ${FAUST_DATA_MAT_DIR}/faust_MEG_rcg_6.mat ${FAUST_DATA_MAT_DIR}/faust_MEG_rcg_8.mat ${FAUST_DATA_MAT_DIR}/faust_MEG_rcg_16.mat ${FAUST_DATA_MAT_DIR}/faust_MEG_rcg_25.mat)
add_test(NAME MATFILE_PALM4MSA_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/test_palm4MSA_${TEST_FPP} ) add_test(NAME MATFILE_PALM4MSA_${TEST_FPP} COMMAND ${FAUST_BIN_TEST_BIN_DIR}/test_palm4MSA_${TEST_FPP} )
......
misc/test/src/faust_multiplication.cpp.in
+ 1
− 1
View file @ 6cb5a9d6
...@@ -85,7 +85,7 @@ int main(int argc, char* argv[]) ...@@ -85,7 +85,7 @@ int main(int argc, char* argv[])
std::cout<<"loading dense matrix"<<std::endl; std::cout<<"loading dense matrix"<<std::endl;
string matDenseFilename = argv[1]; string matDenseFilename = argv[1];
Faust::MatDense<FPP,Cpu> M; Faust::MatDense<FPP,Cpu> M;
init_faust_mat_from_matio(M,matDenseFilename.c_str(),"X_fixed"); init_faust_mat_from_matio(M,matDenseFilename.c_str(),"matrix");
int nbRow=M.getNbRow(); int nbRow=M.getNbRow();
int nbCol=M.getNbCol(); int nbCol=M.getNbCol();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment