diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-28 13:23:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 13:23:52 +0000 |
| commit | 73eab10a44572b117054c3cff2cc1f14c58fdfa7 (patch) | |
| tree | fd9a560e080536b3afdab095bee5e962f3b41a49 | |
| parent | 2739056cd99552cd740892992fa4d5c70b4839b0 (diff) | |
| parent | 0d74c50c48ae518fedb44e5d04a148eaa02b485b (diff) | |
| download | regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.tar.gz regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.tar.bz2 regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.tar.xz regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.zip | |
Merge branch 'master' into master
| -rwxr-xr-x | Core/regularisers_GPU/TV_FGP_GPU_core.h | 9 | ||||
| -rwxr-xr-x | Core/regularisers_GPU/TV_SB_GPU_core.h | 10 | ||||
| -rw-r--r-- | Core/regularisers_GPU/dTV_FGP_GPU_core.h | 9 | ||||
| -rw-r--r-- | Wrappers/Python/conda-recipe/meta.yaml | 2 |
4 files changed, 14 insertions, 16 deletions
diff --git a/Core/regularisers_GPU/TV_FGP_GPU_core.h b/Core/regularisers_GPU/TV_FGP_GPU_core.h index b28cdf3..bf13508 100755 --- a/Core/regularisers_GPU/TV_FGP_GPU_core.h +++ b/Core/regularisers_GPU/TV_FGP_GPU_core.h @@ -1,10 +1,9 @@ -#include <stdio.h> -#include <stdlib.h> -#include <memory.h> - #ifndef _TV_FGP_GPU_ #define _TV_FGP_GPU_ -extern "C" int TV_FGP_GPU_main(float *Input, float *Output, float lambdaPar, int iter, float epsil, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ); +#include "CCPiDefines.h" +#include <memory.h> + +extern "C" CCPI_EXPORT int TV_FGP_GPU_main(float *Input, float *Output, float lambdaPar, int iter, float epsil, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ); #endif diff --git a/Core/regularisers_GPU/TV_SB_GPU_core.h b/Core/regularisers_GPU/TV_SB_GPU_core.h index d44ab77..901b90f 100755 --- a/Core/regularisers_GPU/TV_SB_GPU_core.h +++ b/Core/regularisers_GPU/TV_SB_GPU_core.h @@ -1,10 +1,10 @@ -#include <stdio.h> -#include <stdlib.h> -#include <memory.h> - #ifndef _SB_TV_GPU_ #define _SB_TV_GPU_ -extern "C" int TV_SB_GPU_main(float *Input, float *Output, float mu, int iter, float epsil, int methodTV, int printM, int dimX, int dimY, int dimZ); +#include "CCPiDefines.h" +#include <memory.h> + + +extern "C" CCPI_EXPORT int TV_SB_GPU_main(float *Input, float *Output, float mu, int iter, float epsil, int methodTV, int printM, int dimX, int dimY, int dimZ); #endif diff --git a/Core/regularisers_GPU/dTV_FGP_GPU_core.h b/Core/regularisers_GPU/dTV_FGP_GPU_core.h index 9020b1a..f9281e8 100644 --- a/Core/regularisers_GPU/dTV_FGP_GPU_core.h +++ b/Core/regularisers_GPU/dTV_FGP_GPU_core.h @@ -1,10 +1,9 @@ -#include <stdio.h> -#include <stdlib.h> -#include <memory.h> - #ifndef _dTV_FGP_GPU_ #define _dTV_FGP_GPU_ -extern "C" int dTV_FGP_GPU_main(float *Input, float *InputRef, float *Output, float lambdaPar, int iter, float epsil, float eta, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ); +#include "CCPiDefines.h" +#include <memory.h> + +extern "C" CCPI_EXPORT int dTV_FGP_GPU_main(float *Input, float *InputRef, float *Output, float lambdaPar, int iter, float epsil, float eta, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ); #endif diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 9fe813d..9dd5544 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -12,7 +12,7 @@ test: files: - lena_gray_512.tif requires: - - pillow + - pillow=4.1.1 requirements: build: |