summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2018-08-05 16:28:39 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2018-08-05 16:28:39 +0100
commitc025620ae1d6f4bfcf823de716336277a2ecb621 (patch)
treeb81cec3b57920987811a2719af0028162de2507a
parent89d9b706aa5f6dfe3724e6bdb628f5c95e7425f6 (diff)
downloadregularization-c025620ae1d6f4bfcf823de716336277a2ecb621.tar.gz
regularization-c025620ae1d6f4bfcf823de716336277a2ecb621.tar.bz2
regularization-c025620ae1d6f4bfcf823de716336277a2ecb621.tar.xz
regularization-c025620ae1d6f4bfcf823de716336277a2ecb621.zip
working recipe for Linux GPU. Needs test
-rw-r--r--Wrappers/Python/CMakeLists.txt4
-rw-r--r--Wrappers/Python/conda-recipe/build.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/Wrappers/Python/CMakeLists.txt b/Wrappers/Python/CMakeLists.txt
index 52f3f39..b4d334f 100644
--- a/Wrappers/Python/CMakeLists.txt
+++ b/Wrappers/Python/CMakeLists.txt
@@ -46,7 +46,7 @@ if (BUILD_CUDA)
if (CUDA_FOUND)
message("CUDA FOUND")
set (SETUP_GPU_WRAPPERS "extra_libraries += ['cilregcuda']\n\
- setup( \n\
+setup( \n\
name='ccpi', \n\
description='CCPi Core Imaging Library - Image regularisers GPU',\n\
version=cil_version,\n\
@@ -124,4 +124,4 @@ if (PYTHONINTERP_FOUND)
add_custom_target(PythonWrapper ALL DEPENDS ${OUTPUT})
#install(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install)")
-endif() \ No newline at end of file
+endif()
diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh
index 9706301..1247707 100644
--- a/Wrappers/Python/conda-recipe/build.sh
+++ b/Wrappers/Python/conda-recipe/build.sh
@@ -9,7 +9,7 @@ cp -rv "$RECIPE_DIR/../../../Core" "$SRC_DIR/Core"
cd $SRC_DIR
-cmake -G "Unix Makefiles" $RECIPE_DIR/../../../ -DBUILD_WRAPPERS=ON -DCONDA_BUILD=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX
+cmake -G "Unix Makefiles" $RECIPE_DIR/../../../ -DBUILD_PYTHON_WRAPPERS=ON -DCONDA_BUILD=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE="Release" -DLIBRARY_LIB=$CONDA_PREFIX/lib -DLIBRARY_INC=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX
make install