diff --git a/software_package/BNA_time_log b/software_package/BNA_time_log index 9eeb583..85dd505 100644 --- a/software_package/BNA_time_log +++ b/software_package/BNA_time_log @@ -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 + diff --git a/software_package/exefiles/CUCorMatHr.exe b/software_package/exefiles/CUCorMatHr.exe index 912d55f..09a818d 100644 Binary files a/software_package/exefiles/CUCorMatHr.exe and b/software_package/exefiles/CUCorMatHr.exe differ diff --git a/software_package/exefiles_weighted/CUCorMatHr.exe b/software_package/exefiles_weighted/CUCorMatHr.exe index 523ba38..b8bd377 100644 Binary files a/software_package/exefiles_weighted/CUCorMatHr.exe and b/software_package/exefiles_weighted/CUCorMatHr.exe differ diff --git a/software_package/scriptweighted.bat b/software_package/scriptweighted.bat index 49d6c85..6c5653d 100644 --- a/software_package/scriptweighted.bat +++ b/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 diff --git a/src/BNAPlatform-win64-cuda-20180520/bin/CUCorMatHr_CU75.exe b/src/BNAPlatform-win64-cuda-20180520/bin/CUCorMatHr_CU75.exe index 912d55f..09a818d 100644 Binary files a/src/BNAPlatform-win64-cuda-20180520/bin/CUCorMatHr_CU75.exe and b/src/BNAPlatform-win64-cuda-20180520/bin/CUCorMatHr_CU75.exe differ diff --git a/src/BNAPlatform-win64-cuda-20180520/src/CorMat/CUCorMatHr/CorMat-Pspear-2dense2csr.cu b/src/BNAPlatform-win64-cuda-20180520/src/CorMat/CUCorMatHr/CorMat-Pspear-2dense2csr.cu index dc430e3..9508b40 100644 --- a/src/BNAPlatform-win64-cuda-20180520/src/CorMat/CUCorMatHr/CorMat-Pspear-2dense2csr.cu +++ b/src/BNAPlatform-win64-cuda-20180520/src/CorMat/CUCorMatHr/CorMat-Pspear-2dense2csr.cu @@ -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 "<