Skip to content

Commit b15878c

Browse files
committed
update CorMatHr executable files in the release software-package.
1 parent 23b3132 commit b15878c

6 files changed

Lines changed: 28 additions & 10 deletions

File tree

software_package/BNA_time_log

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,25 @@ Degree E:/data/testdata/unweighted\L0002_25218_pearson_spa0.100%_cor0.707_weight
110110
Degree E:/data/testdata/unweighted\L0002_25218_pearson_spa0.200%_cor0.663_unweighted.csrCPU kernel time 0s
111111
Degree CPU total time 0.097s
112112

113+
Cp E:/data/testdata/weighted\G0001_25218_pearson_spa0.100%_cor0.689_weighted.csrCPU kernel time 0.234449s
114+
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
115+
Cp E:/data/testdata/weighted\G0002_25218_pearson_spa0.100%_cor0.662_weighted.csrCPU kernel time 0.164417s
116+
Cp RandomCPU (Maslov+kernel) time 8.55308e-007s
117+
Cp E:/data/testdata/weighted\K0001_25218_pearson_spa0.100%_cor0.727_weighted.csrCPU kernel time 0.179265s
118+
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
119+
Cp E:/data/testdata/weighted\K0002_25218_pearson_spa0.100%_cor0.607_weighted.csrCPU kernel time 0.225957s
120+
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
121+
Cp E:/data/testdata/weighted\L0001_25218_pearson_spa0.100%_cor0.815_weighted.csrCPU kernel time 0.252356s
122+
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
123+
Cp E:/data/testdata/weighted\L0002_25218_pearson_spa0.100%_cor0.707_weighted.csrCPU kernel time 0.225264s
124+
Cp RandomCPU (Maslov+kernel) time 5.70205e-007s
125+
Cp CPU total time 1.458s
126+
127+
Degree E:/data/testdata/weighted\G0001_25218_pearson_spa0.100%_cor0.689_weighted.csrCPU kernel time 0s
128+
Degree E:/data/testdata/weighted\G0002_25218_pearson_spa0.100%_cor0.662_weighted.csrCPU kernel time 0.001s
129+
Degree E:/data/testdata/weighted\K0001_25218_pearson_spa0.100%_cor0.727_weighted.csrCPU kernel time 0.001s
130+
Degree E:/data/testdata/weighted\K0002_25218_pearson_spa0.100%_cor0.607_weighted.csrCPU kernel time 0s
131+
Degree E:/data/testdata/weighted\L0001_25218_pearson_spa0.100%_cor0.815_weighted.csrCPU kernel time 0.001s
132+
Degree E:/data/testdata/weighted\L0002_25218_pearson_spa0.100%_cor0.707_weighted.csrCPU kernel time 0.001s
133+
Degree CPU total time 0.097s
134+
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
echo weightednetworks
2-
.\exefiles_weighted\CUCorMatHr.exe E:/revised/data/4mm E:/revised/data/4mm/mask.nii 0.1 n s p 0.5
3-
.\exefiles_weighted\CUBFW_Lp.exe E:/revised/data/4mm/weighted 2 gnl
4-
.\exefiles_weighted\Cp.exe E:/revised/data/4mm/weighted 2 1 gnk
5-
.\exefiles_weighted\SmallWorldProperty.exe E:/revised/data/4mm/weighted
6-
.\exefiles_weighted\Louvain_Modularity.exe E:/revised/data/4mm/weighted 2
7-
.\exefiles_weighted\PC_CPU.exe E:/revised/data/4mm/weighted
8-
.\exefiles_weighted\Degree.exe E:/revised/data/4mm/weighted
9-
.\exefiles_weighted\CUEC.exe E:/revised/data/4mm/weighted
10-
.\exefiles_weighted\ConvertNII.exe E:/revised/data/4mm/weighted E:/revised/data/4mm/mask.nii 0.1
2+
.\exefiles_weighted\CUCorMatHr.exe E:/data/testdata E:/data/testdata/mask.nii 0.2 n s p 0.1
3+
.\exefiles_weighted\Cp.exe E:/data/testdata/weighted 0 2 gn
4+
.\exefiles_weighted\Degree.exe E:/data/testdata/weighted
5+
.\exefiles_weighted\CUEC.exe E:/data/testdata/weighted
6+
.\exefiles_weighted\ConvertNII.exe E:/data/testdata/weighted E:/data/testdata/mask.nii 0.2
0 Bytes
Binary file not shown.

src/BNAPlatform-win64-cuda-20180520/src/CorMat/CUCorMatHr/CorMat-Pspear-2dense2csr.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ int CorMat_gpu(string OutCor, real__t * BOLD_t, const int &N, const int &N0, con
466466
char sparsity[30];
467467
sprintf(sparsity, "_spa%.3f%%_cor%.3f", spa, r_thresh[s]);
468468
Outfilename = OutCor;
469-
Outfilename.append(string(sparsity)).append("_weighted.csr");
469+
Outfilename.append(string(sparsity)).append("_unweighted.csr");
470470
ofstream fout;
471471
cout<<"generating "<<Outfilename.c_str()<< "..."<<endl;
472472
fout.open(Outfilename.c_str(), ios::binary | ios::out);

0 commit comments

Comments
 (0)