Mentions légales du service

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

Complete afeba5b0 to fix file conflict between parallel/sequential tests.

parent 84336524
Branches
Tags
No related merge requests found
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
function test_matlab_faust(factors_,expected_F_dense,dim3,copyOptimized) function test_matlab_faust(factors_,expected_F_dense,dim3,copyOptimized)
%function test_matlab_faust(dim1,dim2,dim3,nb_fact) %function test_matlab_faust(dim1,dim2,dim3,nb_fact)
rng(datetime('now').Second*1000+feature('getpid')) rng(datetime('now').Second*1000+feature('getpid'))
fprefix = replace(mat2str(prod(1:10)), {' ', ']', '['}, {'_', '', ''});
import matfaust.Faust import matfaust.Faust
int_max= 100; int_max= 100;
threshold = 0.2; threshold = 0.2;
...@@ -569,11 +570,8 @@ disp('Ok'); ...@@ -569,11 +570,8 @@ disp('Ok');
%% load_faust and save_faust test %% load_faust and save_faust test
disp('TEST LOAD AND SAVE : '); disp('TEST LOAD AND SAVE : ');
filename = ['@FAUST_BIN_TEST_OUTPUT_DIR@' filesep 'faust' int2str(floor(rand()*10000)) '.mat']; filename = ['@FAUST_BIN_TEST_OUTPUT_DIR@' filesep fprefix '_' 'faust' int2str(floor(rand()*10000)) '.mat'];
disp(['save faust into the file : ' filename]) disp(['save faust into the file : ' filename])
if exist(filename, 'file') > 0
delete(filename)
end
save(F,filename); save(F,filename);
F_loaded = Faust(filename); F_loaded = Faust(filename);
[dim1_loaded,dim2_loaded]=size(F_loaded); [dim1_loaded,dim2_loaded]=size(F_loaded);
...@@ -604,12 +602,8 @@ end ...@@ -604,12 +602,8 @@ end
filename_trans = [ '@FAUST_BIN_TEST_OUTPUT_DIR@' filesep 'faust_trans' int2str(floor(rand()*10000)) '.mat']; filename_trans = [ '@FAUST_BIN_TEST_OUTPUT_DIR@' filesep fprefix '_' 'faust_trans' int2str(floor(rand()*10000)) '.mat'];
disp(['save transposed faust into the file : ' filename_trans]); disp(['save transposed faust into the file : ' filename_trans]);
if exist(filename_trans, 'file') > 0
delete(filename_trans)
end
save(F_trans,filename_trans); save(F_trans,filename_trans);
F_trans_loaded = Faust(filename_trans); F_trans_loaded = Faust(filename_trans);
...@@ -753,11 +747,7 @@ for i=1:nb_fact ...@@ -753,11 +747,7 @@ for i=1:nb_fact
end end
end end
% test conj save % test conj save
filename = ['@FAUST_BIN_TEST_OUTPUT_DIR@' filesep fprefix '_' 'faust' int2str(floor(rand()*10000)) '.mat'];
if exist(filename, 'file') > 0
delete(filename)
end
save(conj(F),filename) save(conj(F),filename)
saved_conj_F=full(Faust(filename)); saved_conj_F=full(Faust(filename));
if ( ~isequal(saved_conj_F,F_conj_full)) if ( ~isequal(saved_conj_F,F_conj_full))
...@@ -800,10 +790,7 @@ for i=1:nb_fact ...@@ -800,10 +790,7 @@ for i=1:nb_fact
end end
end end
% test ctranspose save % test ctranspose save
filename = ['@FAUST_BIN_TEST_OUTPUT_DIR@' filesep fprefix '_' 'faust' int2str(floor(rand()*10000)) '.mat'];
if exist(filename, 'file') > 0
delete(filename)
end
save(ctranspose(F),filename) save(ctranspose(F),filename)
saved_ctranspose_F=full(Faust(filename)); saved_ctranspose_F=full(Faust(filename));
if ( ~isequal(saved_ctranspose_F,F_ctranspose_full)) if ( ~isequal(saved_ctranspose_F,F_ctranspose_full))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment