From 2694ad1b18d14fcfd7d57ded7290ebd1bf845fda Mon Sep 17 00:00:00 2001 From: Kazantsev Date: Wed, 23 Jan 2019 11:52:40 +0000 Subject: fixes gpu build on windows --- Core/regularisers_GPU/TV_FGP_GPU_core.h | 9 ++++----- Core/regularisers_GPU/TV_SB_GPU_core.h | 10 +++++----- Core/regularisers_GPU/dTV_FGP_GPU_core.h | 9 ++++----- 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 -#include -#include - #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 + +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 -#include -#include - #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 + + +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 -#include -#include - #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 + +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: -- cgit v1.2.3 From a293e77c132f8eaa2b1dd52ae9b926b90f72cfd0 Mon Sep 17 00:00:00 2001 From: vagrant Date: Mon, 28 Jan 2019 11:48:19 +0000 Subject: UPDATE: calling universa build script --- build/jenkins-build.sh | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 0c397b1..190ac92 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,29 +1,2 @@ #!/usr/bin/env bash -# Script to builds source code in Jenkins environment -module try-load conda - -# install miniconda if the module is not present -if hash conda 2>/dev/null; then - echo using conda -else - if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then - wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - chmod +x Miniconda3-latest-Linux-x86_64.sh - fi - ./Miniconda3-latest-Linux-x86_64.sh -u -b -p . - PATH=$PATH:./bin -fi - -# presume that git clone is done before this script launch -# git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit -conda install -y conda-build -#export CIL_VERSION=0.10.2 -if [[ -n ${CIL_VERSION} ]] -then - echo Using defined version: $CIL_VERSION -else - export CIL_VERSION=0.10.3 - echo Defining version: $CIL_VERSION -fi -#cd CCPi-Regularisation-Toolkit # already there by jenkins -conda build Wrappers/Python/conda-recipe +bash <(curl -L https://raw.githubusercontent.com/TomasKulhanek/CCPi-VirtualMachine/master/scripts/jenkins-build.sh) -- cgit v1.2.3