diff options
| author | Edoardo Pasca <edo.pakino@gmail.com> | 2018-07-04 22:56:09 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.pakino@gmail.com> | 2018-07-04 22:56:09 +0100 |
| commit | 70e86868640390c4dde0ad67670707467f9773f9 (patch) | |
| tree | 18dd0c0a0cd96d7ad04741f281bd942c5d183323 | |
| parent | 11199684baba00298c5fab2599c87fc80456ac16 (diff) | |
| download | regularization-70e86868640390c4dde0ad67670707467f9773f9.tar.gz regularization-70e86868640390c4dde0ad67670707467f9773f9.tar.bz2 regularization-70e86868640390c4dde0ad67670707467f9773f9.tar.xz regularization-70e86868640390c4dde0ad67670707467f9773f9.zip | |
fixes for windows shared library
| -rw-r--r-- | Core/regularisers_CPU/FGP_dTV_core.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Core/regularisers_CPU/SB_TV_core.h | 0 | ||||
| -rw-r--r-- | Core/regularisers_CPU/TNV_core.h | 17 |
3 files changed, 13 insertions, 6 deletions
diff --git a/Core/regularisers_CPU/FGP_dTV_core.h b/Core/regularisers_CPU/FGP_dTV_core.h index 95dc249..8d721d5 100644 --- a/Core/regularisers_CPU/FGP_dTV_core.h +++ b/Core/regularisers_CPU/FGP_dTV_core.h @@ -52,7 +52,7 @@ limitations under the License. #ifdef __cplusplus extern "C" { #endif -float dTV_FGP_CPU_main(float *Input, float *InputRef, float *Output, float lambdaPar, int iterationsNumb, float epsil, float eta, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ); +CCPI_EXPORT float dTV_FGP_CPU_main(float *Input, float *InputRef, float *Output, float lambdaPar, int iterationsNumb, float epsil, float eta, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ); CCPI_EXPORT float GradNorm_func2D(float *B, float *B_x, float *B_y, float eta, int dimX, int dimY); CCPI_EXPORT float ProjectVect_func2D(float *R1, float *R2, float *B_x, float *B_y, int dimX, int dimY); diff --git a/Core/regularisers_CPU/SB_TV_core.h b/Core/regularisers_CPU/SB_TV_core.h index ad4f529..ad4f529 100755..100644 --- a/Core/regularisers_CPU/SB_TV_core.h +++ b/Core/regularisers_CPU/SB_TV_core.h diff --git a/Core/regularisers_CPU/TNV_core.h b/Core/regularisers_CPU/TNV_core.h index 1559b83..c082694 100644 --- a/Core/regularisers_CPU/TNV_core.h +++ b/Core/regularisers_CPU/TNV_core.h @@ -4,6 +4,7 @@ #include <stdio.h> #include "omp.h" #include "utils.h" +#include "CCPiDefines.h" #define fTiny 0.00000001f #define fLarge 100000000.0f @@ -31,10 +32,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -float TNV_CPU_main(float *Input, float *u, float lambda, int maxIter, float tol, int dimX, int dimY, int dimZ); +#ifdef __cplusplus +extern "C" { +#endif +CCPI_EXPORT float TNV_CPU_main(float *Input, float *u, float lambda, int maxIter, float tol, int dimX, int dimY, int dimZ); /*float PDHG(float *A, float *B, float tau, float sigma, float theta, float lambda, int p, int q, int r, float tol, int maxIter, int d_c, int d_w, int d_h);*/ -float proxG(float *u_upd, float *v, float *f, float taulambda, int dimX, int dimY, int dimZ); -float gradient(float *u_upd, float *gradx_upd, float *grady_upd, int dimX, int dimY, int dimZ); -float proxF(float *gx, float *gy, float *vx, float *vy, float sigma, int p, int q, int r, int dimX, int dimY, int dimZ); -float divergence(float *qx_upd, float *qy_upd, float *div_upd, int dimX, int dimY, int dimZ); +CCPI_EXPORT float proxG(float *u_upd, float *v, float *f, float taulambda, int dimX, int dimY, int dimZ); +CCPI_EXPORT float gradient(float *u_upd, float *gradx_upd, float *grady_upd, int dimX, int dimY, int dimZ); +CCPI_EXPORT float proxF(float *gx, float *gy, float *vx, float *vy, float sigma, int p, int q, int r, int dimX, int dimY, int dimZ); +CCPI_EXPORT float divergence(float *qx_upd, float *qy_upd, float *div_upd, int dimX, int dimY, int dimZ); +#ifdef __cplusplus +} +#endif
\ No newline at end of file |