From 72a4bade63280d8683d010d4165aa416b0aed56f Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Sat, 11 Aug 2018 13:21:06 +0100
Subject: MWsize GPU fix
---
.../Matlab/mex_compile/regularisers_GPU/Diffusion_4thO_GPU.cpp | 5 +++--
Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_TV_GPU.cpp | 6 ++++--
Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_dTV_GPU.cpp | 8 +++++---
Wrappers/Matlab/mex_compile/regularisers_GPU/LLT_ROF_GPU.cpp | 6 ++++--
Wrappers/Matlab/mex_compile/regularisers_GPU/NonlDiff_GPU.cpp | 6 ++++--
Wrappers/Matlab/mex_compile/regularisers_GPU/ROF_TV_GPU.cpp | 6 ++++--
Wrappers/Matlab/mex_compile/regularisers_GPU/SB_TV_GPU.cpp | 6 ++++--
Wrappers/Matlab/mex_compile/regularisers_GPU/TGV_GPU.cpp | 5 +++--
docs/installation.txt | 8 ++++++++
9 files changed, 39 insertions(+), 17 deletions(-)
create mode 100644 docs/installation.txt
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/Diffusion_4thO_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/Diffusion_4thO_GPU.cpp
index 0edc067..0cc042b 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/Diffusion_4thO_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/Diffusion_4thO_GPU.cpp
@@ -42,8 +42,9 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter_numb, dimX, dimY, dimZ;
- const int *dim_array;
+ int number_of_dims, iter_numb;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
float *Input, *Output=NULL, lambda, tau, sigma;
dim_array = mxGetDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_TV_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_TV_GPU.cpp
index 9ed9ae0..c174e75 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_TV_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_TV_GPU.cpp
@@ -43,8 +43,10 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter, dimX, dimY, dimZ, methTV, printswitch, nonneg;
- const int *dim_array;
+ int number_of_dims, iter, methTV, printswitch, nonneg;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
+
float *Input, *Output=NULL, lambda, epsil;
number_of_dims = mxGetNumberOfDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_dTV_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_dTV_GPU.cpp
index 5b80616..3f5a4b3 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_dTV_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/FGP_dTV_GPU.cpp
@@ -47,9 +47,11 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter, dimX, dimY, dimZ, methTV, printswitch, nonneg;
- const int *dim_array;
- const int *dim_array2;
+ int number_of_dims, iter, methTV, printswitch, nonneg;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
+ const mwSize *dim_array2;
+
float *Input, *InputRef, *Output=NULL, lambda, epsil, eta;
number_of_dims = mxGetNumberOfDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/LLT_ROF_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/LLT_ROF_GPU.cpp
index 37563b0..e8da4ce 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/LLT_ROF_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/LLT_ROF_GPU.cpp
@@ -46,8 +46,10 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iterationsNumb, dimX, dimY, dimZ;
- const int *dim_array;
+ int number_of_dims, iterationsNumb;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
+
float *Input, *Output=NULL, lambdaROF, lambdaLLT, tau;
dim_array = mxGetDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/NonlDiff_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/NonlDiff_GPU.cpp
index bfba9ea..1cd0cdc 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/NonlDiff_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/NonlDiff_GPU.cpp
@@ -46,8 +46,10 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter_numb, dimX, dimY, dimZ, penaltytype;
- const int *dim_array;
+ int number_of_dims, iter_numb, penaltytype;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
+
float *Input, *Output=NULL, lambda, tau, sigma;
dim_array = mxGetDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/ROF_TV_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/ROF_TV_GPU.cpp
index f60ba7b..bd01d55 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/ROF_TV_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/ROF_TV_GPU.cpp
@@ -42,8 +42,10 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter_numb, dimX, dimY, dimZ;
- const int *dim_array;
+ int number_of_dims, iter_numb;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
+
float *Input, *Output=NULL, lambda, tau;
dim_array = mxGetDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/SB_TV_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/SB_TV_GPU.cpp
index 60847d9..9d1328f 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/SB_TV_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/SB_TV_GPU.cpp
@@ -42,8 +42,10 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter, dimX, dimY, dimZ, methTV, printswitch;
- const int *dim_array;
+ int number_of_dims, iter, methTV, printswitch;
+ mwSize dimX, dimY, dimZ;
+ const mwSize *dim_array;
+
float *Input, *Output=NULL, lambda, epsil;
number_of_dims = mxGetNumberOfDimensions(prhs[0]);
diff --git a/Wrappers/Matlab/mex_compile/regularisers_GPU/TGV_GPU.cpp b/Wrappers/Matlab/mex_compile/regularisers_GPU/TGV_GPU.cpp
index 5a0df5b..edb551d 100644
--- a/Wrappers/Matlab/mex_compile/regularisers_GPU/TGV_GPU.cpp
+++ b/Wrappers/Matlab/mex_compile/regularisers_GPU/TGV_GPU.cpp
@@ -43,8 +43,9 @@ void mexFunction(
int nrhs, const mxArray *prhs[])
{
- int number_of_dims, iter, dimX, dimY;
- const int *dim_array;
+ int number_of_dims, iter;
+ mwSize dimX, dimY;
+ const mwSize *dim_array;
float *Input, *Output=NULL, lambda, alpha0, alpha1, L2;
number_of_dims = mxGetNumberOfDimensions(prhs[0]);
diff --git a/docs/installation.txt b/docs/installation.txt
new file mode 100644
index 0000000..a536111
--- /dev/null
+++ b/docs/installation.txt
@@ -0,0 +1,8 @@
+One can install CCPi-RGL toolkit using cmake:
+
+
+ cmake ../CCPi-Regularisation-Toolkit/ -DBUILD_MATLAB_WRAPPERS=ON -DBUILD_PYTHON_WRAPPERS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DMatlab_ROOT_DIR=<Matlab directory> -DBUILD_CUDA=OFF
+
+make
+
+make install
\ No newline at end of file
--
cgit v1.2.3