summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2017-08-23 15:10:26 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2017-08-23 15:10:26 +0100
commitbd4c6178258212bf075f19ff3638c12d46e0f819 (patch)
tree68af455b3f4d745177bbf83b9ec763060347e5a1
parent34d9e8f6768042c5e7b0cf18879a9db45d9eb3e7 (diff)
parenta2ca45848e354f376c53ecd3fed946d64c1ff3aa (diff)
downloadregularization-bd4c6178258212bf075f19ff3638c12d46e0f819.tar.gz
regularization-bd4c6178258212bf075f19ff3638c12d46e0f819.tar.bz2
regularization-bd4c6178258212bf075f19ff3638c12d46e0f819.tar.xz
regularization-bd4c6178258212bf075f19ff3638c12d46e0f819.zip
Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
-rw-r--r--src/Python/fista_module.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Python/fista_module.cpp b/src/Python/fista_module.cpp
index eacda3d..c36329e 100644
--- a/src/Python/fista_module.cpp
+++ b/src/Python/fista_module.cpp
@@ -1032,13 +1032,13 @@ bp::list TGV_PD(np::ndarray input, double d_lambda, double d_alpha1, double d_al
return result;
}
-BOOST_PYTHON_MODULE(regularizers)
+BOOST_PYTHON_MODULE(cpu_regularizers)
{
np::initialize();
//To specify that this module is a package
bp::object package = bp::scope();
- package.attr("__path__") = "regularizers";
+ package.attr("__path__") = "cpu_regularizers";
np::dtype dt1 = np::dtype::get_builtin<uint8_t>();
np::dtype dt2 = np::dtype::get_builtin<uint16_t>();