1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
diff -Naur trunka/linalg/linalg.h trunk/linalg/linalg.h
--- trunka/linalg/linalg.h 2016-04-24 08:33:27.339077788 -0500
+++ trunk/linalg/linalg.h 2016-04-24 08:34:03.125869367 -0500
@@ -1679,7 +1679,7 @@
up.copy(u);
}
lambda+=theta*norm;
- if isnan(lambda) {
+ if (isnan(lambda)) {
std::cerr << "eigLargestSymApprox failed" << std::endl;
exit(1);
}
diff -Naur trunka/swig/python/mkpy trunk/swig/python/mkpy
--- trunka/swig/python/mkpy 2016-04-24 08:33:27.339077788 -0500
+++ trunk/swig/python/mkpy 2016-04-24 08:34:03.125869367 -0500
@@ -10,8 +10,8 @@
exec /cygdrive/c/MinGW/msys/1.0/bin/bash $0 $optx $*
fi
-INC="-I. -Ispams/linalg -Ispams/prox -Ispams/decomp -Ispams/dictLearn -I/usr/include/python2.7/"
-INC_PYTHON=-I/usr/include/python2.6
+INC="-I. -Ispams/linalg -Ispams/prox -Ispams/decomp -Ispams/dictLearn -I/usr/include/python3.5m/"
+INC_PYTHON=-I/usr/include/python3.5m
XCCFLAGS=""
XLINKFLAGS=""
# on MacOS, use following definition instead.
@@ -88,7 +88,7 @@
err=0
for nom in $lst; do
[ $flg_swig -ne 0 ] && {
- swig -c++ -python $OPT_DBG -o ${nom}_wrap.cpp $nom.i
+ swig -c++ -py3 -python $OPT_DBG -o ${nom}_wrap.cpp $nom.i
[ $? -ne 0 ] && exit
}
if [ -e $nom.cpp ]; then
diff -Naur trunka/swig/python/numpy.i trunk/swig/python/numpy.i
--- trunka/swig/python/numpy.i 2016-04-24 08:33:27.342411134 -0500
+++ trunk/swig/python/numpy.i 2016-04-24 08:34:03.125869367 -0500
@@ -107,9 +107,11 @@
if (PyDict_Check( py_obj)) return "dict" ;
if (PyList_Check( py_obj)) return "list" ;
if (PyTuple_Check( py_obj)) return "tuple" ;
+%#if PY_MAJOR_VERSION < 3
if (PyFile_Check( py_obj)) return "file" ;
if (PyModule_Check( py_obj)) return "module" ;
if (PyInstance_Check(py_obj)) return "instance" ;
+%#endif
return "unkown type";
}
diff -Naur trunka/swig/python/py_typemaps.i trunk/swig/python/py_typemaps.i
--- trunka/swig/python/py_typemaps.i 2016-04-24 08:33:27.342411134 -0500
+++ trunk/swig/python/py_typemaps.i 2016-04-24 08:34:24.975945317 -0500
@@ -64,13 +64,11 @@
%typemap(in,numinputs=0,fragment="NumPy_Fragments") (Vector<DATA_TYPE> **ARGOUT_VECTOR)
(Vector<DATA_TYPE> *data_temp)
{
- # argout in
$1 = &data_temp;
}
%typemap(argout) (Vector<DATA_TYPE> **ARGOUT_VECTOR )
{
- # test argout
if(data_temp$argnum != NULL) {
npy_intp n = data_temp$argnum->n();
npy_intp dims[1] = {n};
@@ -142,13 +140,11 @@
%typemap(in,numinputs=0,fragment="NumPy_Fragments") (Matrix<DATA_TYPE> **ARGOUT_MATRIX)
(Matrix<DATA_TYPE> *data_temp)
{
- # argout in
$1 = &data_temp;
}
%typemap(argout) (Matrix<DATA_TYPE> **ARGOUT_MATRIX )
{
- # test argout
if(data_temp$argnum != NULL) {
npy_intp m = data_temp$argnum->m();
npy_intp n = data_temp$argnum->n();
@@ -328,7 +324,6 @@
}
%typemap(argout) (SpMatrix<DATA_TYPE> **ARGOUT_SPMATRIX )
{
-# test argout
if(data_temp$argnum != NULL) {
npy_intp m = data_temp$argnum->m();
npy_intp n = data_temp$argnum->n();
diff -Naur trunka/swig/python/setup.py.in trunk/swig/python/setup.py.in
--- trunka/swig/python/setup.py.in 2016-04-24 08:33:27.342411134 -0500
+++ trunk/swig/python/setup.py.in 2016-04-24 08:34:03.125869367 -0500
@@ -7,7 +7,7 @@
# includes numpy : package numpy.distutils , numpy.get_include()
# python setup.py build --inplace
# python setup.py install --prefix=dist,
-incs = ['.'] + map(lambda x: os.path.join('spams',x),[ 'linalg', 'prox', 'decomp', 'dictLearn']) + [numpy.get_include()] + ['/usr/include/python2.7/']
+incs = ['.'] + [os.path.join('spams',x) for x in [ 'linalg', 'prox', 'decomp', 'dictLearn']] + [numpy.get_include()] + ['/usr/include/python3.5m/']
osname = distutils.util.get_platform()
cc_flags = ['-fPIC', '-fopenmp']
@@ -78,11 +78,6 @@
# scripts = ['test_spams.py'],
data_files = [
('test',['test_spams.py', 'test_decomp.py', 'test_dictLearn.py', 'test_linalg.py', 'test_prox.py', 'test_utils.py']),
- ('doc',['doc_spams.pdf', 'python-interface.pdf']),
- ('doc/sphinx/_sources',mkhtml('_sources')),
- ('doc/sphinx/_static',mkhtml('_static')),
- ('doc/sphinx',mkhtml()),
- ('doc/html',mkhtml(base = 'html')),
('extdata',['boat.png', 'lena.png'])
],
)
|