From 25c43ebd60c141bacf3ff9fd9c5e2f357bc5e4b6 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Mon, 29 Jan 2018 15:46:04 +0000 Subject: finds boost libraries during wrappers build (win) finds and set the correct name for the boost libraries. Builds GPU wrapper if CUDA is found. --- Wrappers/Python/src/cpu_regularizers.pyx | 19 +++++++++++++++++++ Wrappers/Python/src/fista_module.cpp | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'Wrappers/Python/src') diff --git a/Wrappers/Python/src/cpu_regularizers.pyx b/Wrappers/Python/src/cpu_regularizers.pyx index e69de29..a8f8c8f 100644 --- a/Wrappers/Python/src/cpu_regularizers.pyx +++ b/Wrappers/Python/src/cpu_regularizers.pyx @@ -0,0 +1,19 @@ +# distutils: language=c++ +""" +Copyright 2018 CCPi +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Author: Edoardo Pasca +""" + +import cython +import numpy as np +cimport numpy as np diff --git a/Wrappers/Python/src/fista_module.cpp b/Wrappers/Python/src/fista_module.cpp index 3876cad..cef3ecc 100644 --- a/Wrappers/Python/src/fista_module.cpp +++ b/Wrappers/Python/src/fista_module.cpp @@ -1028,13 +1028,13 @@ bp::list TGV_PD(np::ndarray input, double d_lambda, double d_alpha1, double d_al return result; } -BOOST_PYTHON_MODULE(cpu_regularizers) +BOOST_PYTHON_MODULE(cpu_regularizers_boost) { np::initialize(); //To specify that this module is a package bp::object package = bp::scope(); - package.attr("__path__") = "cpu_regularizers"; + package.attr("__path__") = "cpu_regularizers_boost"; np::dtype dt1 = np::dtype::get_builtin(); np::dtype dt2 = np::dtype::get_builtin(); -- cgit v1.2.3