Skip to content

Commit

Permalink
update CorMatHr executable files in the release software-package.
Browse files Browse the repository at this point in the history
  • Loading branch information
haixiao990 committed Jun 1, 2018
1 parent 23b3132 commit b15878c
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 10 deletions.
22 changes: 22 additions & 0 deletions software_package/BNA_time_log
Expand Up @@ -110,3 +110,25 @@ Degree E:/data/testdata/unweighted\L0002_25218_pearson_spa0.100%_cor0.707_weight
Degree E:/data/testdata/unweighted\L0002_25218_pearson_spa0.200%_cor0.663_unweighted.csrCPU kernel time 0s
Degree CPU total time 0.097s

Cp E:/data/testdata/weighted\G0001_25218_pearson_spa0.100%_cor0.689_weighted.csrCPU kernel time 0.234449s
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
Cp E:/data/testdata/weighted\G0002_25218_pearson_spa0.100%_cor0.662_weighted.csrCPU kernel time 0.164417s
Cp RandomCPU (Maslov+kernel) time 8.55308e-007s
Cp E:/data/testdata/weighted\K0001_25218_pearson_spa0.100%_cor0.727_weighted.csrCPU kernel time 0.179265s
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
Cp E:/data/testdata/weighted\K0002_25218_pearson_spa0.100%_cor0.607_weighted.csrCPU kernel time 0.225957s
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
Cp E:/data/testdata/weighted\L0001_25218_pearson_spa0.100%_cor0.815_weighted.csrCPU kernel time 0.252356s
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
Cp E:/data/testdata/weighted\L0002_25218_pearson_spa0.100%_cor0.707_weighted.csrCPU kernel time 0.225264s
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
Cp CPU total time 1.458s

Degree E:/data/testdata/weighted\G0001_25218_pearson_spa0.100%_cor0.689_weighted.csrCPU kernel time 0s
Degree E:/data/testdata/weighted\G0002_25218_pearson_spa0.100%_cor0.662_weighted.csrCPU kernel time 0.001s
Degree E:/data/testdata/weighted\K0001_25218_pearson_spa0.100%_cor0.727_weighted.csrCPU kernel time 0.001s
Degree E:/data/testdata/weighted\K0002_25218_pearson_spa0.100%_cor0.607_weighted.csrCPU kernel time 0s
Degree E:/data/testdata/weighted\L0001_25218_pearson_spa0.100%_cor0.815_weighted.csrCPU kernel time 0.001s
Degree E:/data/testdata/weighted\L0002_25218_pearson_spa0.100%_cor0.707_weighted.csrCPU kernel time 0.001s
Degree CPU total time 0.097s

Binary file modified software_package/exefiles/CUCorMatHr.exe
Binary file not shown.
Binary file modified software_package/exefiles_weighted/CUCorMatHr.exe
Binary file not shown.
14 changes: 5 additions & 9 deletions software_package/scriptweighted.bat
@@ -1,10 +1,6 @@
echo weightednetworks
.\exefiles_weighted\CUCorMatHr.exe E:/revised/data/4mm E:/revised/data/4mm/mask.nii 0.1 n s p 0.5
.\exefiles_weighted\CUBFW_Lp.exe E:/revised/data/4mm/weighted 2 gnl
.\exefiles_weighted\Cp.exe E:/revised/data/4mm/weighted 2 1 gnk
.\exefiles_weighted\SmallWorldProperty.exe E:/revised/data/4mm/weighted
.\exefiles_weighted\Louvain_Modularity.exe E:/revised/data/4mm/weighted 2
.\exefiles_weighted\PC_CPU.exe E:/revised/data/4mm/weighted
.\exefiles_weighted\Degree.exe E:/revised/data/4mm/weighted
.\exefiles_weighted\CUEC.exe E:/revised/data/4mm/weighted
.\exefiles_weighted\ConvertNII.exe E:/revised/data/4mm/weighted E:/revised/data/4mm/mask.nii 0.1
.\exefiles_weighted\CUCorMatHr.exe E:/data/testdata E:/data/testdata/mask.nii 0.2 n s p 0.1
.\exefiles_weighted\Cp.exe E:/data/testdata/weighted 0 2 gn
.\exefiles_weighted\Degree.exe E:/data/testdata/weighted
.\exefiles_weighted\CUEC.exe E:/data/testdata/weighted
.\exefiles_weighted\ConvertNII.exe E:/data/testdata/weighted E:/data/testdata/mask.nii 0.2
Binary file modified src/BNAPlatform-win64-cuda-20180520/bin/CUCorMatHr_CU75.exe
Binary file not shown.
Expand Up @@ -466,7 +466,7 @@ int CorMat_gpu(string OutCor, real__t * BOLD_t, const int &N, const int &N0, con
char sparsity[30];
sprintf(sparsity, "_spa%.3f%%_cor%.3f", spa, r_thresh[s]);
Outfilename = OutCor;
Outfilename.append(string(sparsity)).append("_weighted.csr");
Outfilename.append(string(sparsity)).append("_unweighted.csr");
ofstream fout;
cout<<"generating "<<Outfilename.c_str()<< "..."<<endl;
fout.open(Outfilename.c_str(), ios::binary | ios::out);
Expand Down

0 comments on commit b15878c

Please sign in to comment.