diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-03-12 22:14:27 +0000 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-03-12 22:14:27 +0000 |
| commit | 1ac06b5ce11b247930489b7aa3afa59215e43c91 (patch) | |
| tree | 8a5dc7649b2fdeda67c8df9ff2ea2880596d9e67 /src/Matlab | |
| parent | 420e71a0dcb42e91e1aa93306c2e2f688b309620 (diff) | |
| download | regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.tar.gz regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.tar.bz2 regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.tar.xz regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.zip | |
readme updates and demos
Diffstat (limited to 'src/Matlab')
| -rw-r--r-- | src/Matlab/mex_compile/compileGPU_mex.m | 5 | ||||
| -rw-r--r-- | src/Matlab/mex_compile/regularisers_CPU/PatchSelect.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Matlab/mex_compile/compileGPU_mex.m b/src/Matlab/mex_compile/compileGPU_mex.m index 3a7ac7c..7e15233 100644 --- a/src/Matlab/mex_compile/compileGPU_mex.m +++ b/src/Matlab/mex_compile/compileGPU_mex.m @@ -4,7 +4,7 @@ % In order to compile CUDA modules one needs to have nvcc-compiler % installed (see CUDA SDK), check it under MATLAB with !nvcc --version -% In the code bellow we provide a full explicit path to nvcc compiler +% In the code bellow we provide a full explicit path to nvcc compiler % ! paths to matlab and CUDA sdk can be different, modify accordingly ! % Tested on Ubuntu 18.04/MATLAB 2016b/cuda10.0/gcc7.3 @@ -68,7 +68,8 @@ movefile('LLT_ROF_GPU.mex*',Pathmove); delete TV_ROF_GPU_core* TV_FGP_GPU_core* TV_SB_GPU_core* dTV_FGP_GPU_core* NonlDiff_GPU_core* Diffus_4thO_GPU_core* TGV_GPU_core* LLT_ROF_GPU_core* CCPiDefines.h +delete PatchSelect_core* Nonlocal_TV_core* shared.h fprintf('%s \n', 'All successfully compiled!'); pathA2 = sprintf(['..' fsep '..' fsep '..' fsep '..' fsep 'demos'], 1i); -cd(pathA2);
\ No newline at end of file +cd(pathA2); diff --git a/src/Matlab/mex_compile/regularisers_CPU/PatchSelect.c b/src/Matlab/mex_compile/regularisers_CPU/PatchSelect.c index d2f6670..1acab29 100644 --- a/src/Matlab/mex_compile/regularisers_CPU/PatchSelect.c +++ b/src/Matlab/mex_compile/regularisers_CPU/PatchSelect.c @@ -52,8 +52,8 @@ void mexFunction( { int number_of_dims, SearchWindow, SimilarWin, NumNeighb; mwSize dimX, dimY, dimZ; - unsigned short *H_i=NULL, *H_j=NULL, *H_k=NULL; - mwSize *dim_array; + const mwSize *dim_array; + unsigned short *H_i=NULL, *H_j=NULL, *H_k=NULL; float *A, *Weights = NULL, h; mwSize dim_array2[3]; /* for 2D data */ mwSize dim_array3[4]; /* for 3D data */ |