Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bob
bob.measure
Commits
6e0d6361
Commit
6e0d6361
authored
May 21, 2015
by
Manuel Günther
Browse files
Applied new versioning system
parent
6e00d9cd
Changes
5
Hide whitespace changes
Inline
Side-by-side
bob/measure/__init__.py
View file @
6e0d6361
# import Libraries of other lib packages
import
bob.math
import
bob.io.base
from
._library
import
*
from
.
import
version
...
...
bob/measure/main.cpp
View file @
6e0d6361
...
...
@@ -10,6 +10,9 @@
#endif
#include
<bob.blitz/cppapi.h>
#include
<bob.blitz/cleanup.h>
#include
<bob.core/api.h>
#include
<bob.io.base/api.h>
#include
"error.h"
static
int
double1d_converter
(
PyObject
*
o
,
PyBlitzArrayObject
**
a
)
{
...
...
@@ -1097,6 +1100,8 @@ static PyObject* create_module (void) {
/* imports bob.blitz C-API + dependencies */
if
(
import_bob_blitz
()
<
0
)
return
0
;
if
(
import_bob_core_logging
()
<
0
)
return
0
;
if
(
import_bob_io_base
()
<
0
)
return
0
;
return
Py_BuildValue
(
"O"
,
m
);
}
...
...
bob/measure/version.cpp
View file @
6e0d6361
...
...
@@ -5,109 +5,12 @@
* @brief Binds configuration information available from bob
*/
#include
<Python.h>
#include
<string>
#include
<cstdlib>
#include
<blitz/blitz.h>
#include
<boost/preprocessor/stringize.hpp>
#include
<boost/version.hpp>
#include
<boost/format.hpp>
#ifdef NO_IMPORT_ARRAY
#undef NO_IMPORT_ARRAY
#endif
#define BOB_IMPORT_VERSION
#include
<bob.blitz/capi.h>
#include
<bob.blitz/cleanup.h>
#include
<bob.core/config.h>
#include
<bob.math/config.h>
#include
<bob.io.base/config.h>
static
int
dict_set
(
PyObject
*
d
,
const
char
*
key
,
const
char
*
value
)
{
PyObject
*
v
=
Py_BuildValue
(
"s"
,
value
);
if
(
!
v
)
return
0
;
int
retval
=
PyDict_SetItemString
(
d
,
key
,
v
);
Py_DECREF
(
v
);
if
(
retval
==
0
)
return
1
;
//all good
return
0
;
//a problem occurred
}
static
int
dict_steal
(
PyObject
*
d
,
const
char
*
key
,
PyObject
*
value
)
{
if
(
!
value
)
return
0
;
int
retval
=
PyDict_SetItemString
(
d
,
key
,
value
);
Py_DECREF
(
value
);
if
(
retval
==
0
)
return
1
;
//all good
return
0
;
//a problem occurred
}
/**
* Describes the version of Boost libraries installed
*/
static
PyObject
*
boost_version
()
{
boost
::
format
f
(
"%d.%d.%d"
);
f
%
(
BOOST_VERSION
/
100000
);
f
%
(
BOOST_VERSION
/
100
%
1000
);
f
%
(
BOOST_VERSION
%
100
);
return
Py_BuildValue
(
"s"
,
f
.
str
().
c_str
());
}
/**
* Describes the compiler version
*/
static
PyObject
*
compiler_version
()
{
# if defined(__GNUC__) && !defined(__llvm__)
boost
::
format
f
(
"%s.%s.%s"
);
f
%
BOOST_PP_STRINGIZE
(
__GNUC__
);
f
%
BOOST_PP_STRINGIZE
(
__GNUC_MINOR__
);
f
%
BOOST_PP_STRINGIZE
(
__GNUC_PATCHLEVEL__
);
return
Py_BuildValue
(
"ss"
,
"gcc"
,
f
.
str
().
c_str
());
# elif defined(__llvm__) && !defined(__clang__)
return
Py_BuildValue
(
"ss"
,
"llvm-gcc"
,
__VERSION__
);
# elif defined(__clang__)
return
Py_BuildValue
(
"ss"
,
"clang"
,
__clang_version__
);
# else
return
Py_BuildValue
(
"s"
,
"unsupported"
);
# endif
}
/**
* Python version with which we compiled the extensions
*/
static
PyObject
*
python_version
()
{
boost
::
format
f
(
"%s.%s.%s"
);
f
%
BOOST_PP_STRINGIZE
(
PY_MAJOR_VERSION
);
f
%
BOOST_PP_STRINGIZE
(
PY_MINOR_VERSION
);
f
%
BOOST_PP_STRINGIZE
(
PY_MICRO_VERSION
);
return
Py_BuildValue
(
"s"
,
f
.
str
().
c_str
());
}
/**
* Numpy version
*/
static
PyObject
*
numpy_version
()
{
return
Py_BuildValue
(
"{ssss}"
,
"abi"
,
BOOST_PP_STRINGIZE
(
NPY_VERSION
),
"api"
,
BOOST_PP_STRINGIZE
(
NPY_API_VERSION
));
}
/**
* bob.blitz c/c++ api version
*/
static
PyObject
*
bob_blitz_version
()
{
return
Py_BuildValue
(
"{ss}"
,
"api"
,
BOOST_PP_STRINGIZE
(
BOB_BLITZ_API_VERSION
));
}
/**
* bob.core c/c++ api version
*/
static
PyObject
*
bob_core_version
()
{
return
Py_BuildValue
(
"{ss}"
,
"api"
,
BOOST_PP_STRINGIZE
(
BOB_CORE_API_VERSION
));
}
/**
* bob.math c/c++ api version
*/
static
PyObject
*
bob_math_version
()
{
return
Py_BuildValue
(
"{ss}"
,
"api"
,
BOOST_PP_STRINGIZE
(
BOB_MATH_API_VERSION
));
}
static
PyObject
*
build_version_dictionary
()
{
...
...
@@ -115,17 +18,18 @@ static PyObject* build_version_dictionary() {
if
(
!
retval
)
return
0
;
auto
retval_
=
make_safe
(
retval
);
if
(
!
dict_s
e
t
(
retval
,
"Blitz++"
,
BZ_VERSION
))
return
0
;
if
(
!
dict_st
eal
(
retval
,
"Blitz++"
,
blitz_version
()
))
return
0
;
if
(
!
dict_steal
(
retval
,
"Boost"
,
boost_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"Compiler"
,
compiler_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"Python"
,
python_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"NumPy"
,
numpy_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"HDF5"
,
hdf5_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"bob.blitz"
,
bob_blitz_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"bob.core"
,
bob_core_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"bob.math"
,
bob_math_version
()))
return
0
;
if
(
!
dict_steal
(
retval
,
"bob.io.base"
,
bob_io_base_version
()))
return
0
;
Py_INCREF
(
retval
);
return
retval
;
return
Py_BuildValue
(
"O"
,
retval
);
}
static
PyMethodDef
module_methods
[]
=
{
...
...
@@ -164,8 +68,6 @@ static PyObject* create_module (void) {
if
(
!
externals
)
return
0
;
if
(
PyModule_AddObject
(
m
,
"externals"
,
externals
)
<
0
)
return
0
;
if
(
import_bob_blitz
()
<
0
)
return
0
;
return
Py_BuildValue
(
"O"
,
m
);
}
...
...
setup.py
View file @
6e0d6361
...
...
@@ -3,7 +3,7 @@
# Andre Anjos <andre.anjos@idiap.ch>
# Mon 16 Apr 08:18:08 2012 CEST
bob_packages
=
[
'bob.core'
,
'bob.math'
]
bob_packages
=
[
'bob.core'
,
'bob.io.base'
,
'bob.math'
]
from
setuptools
import
setup
,
find_packages
,
dist
dist
.
Distribution
(
dict
(
setup_requires
=
[
'bob.extension'
,
'bob.blitz'
]
+
bob_packages
))
...
...
version.txt
View file @
6e0d6361
2.0.2b0
\ No newline at end of file
2.0.2b1
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment