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.ap
Commits
b5be4c3e
Commit
b5be4c3e
authored
Aug 18, 2014
by
Manuel Günther
Browse files
Switched to new bob.extension version; moved headers to include/bob.ap
parent
bab7be80
Changes
12
Hide whitespace changes
Inline
Side-by-side
bob/ap/cpp/Ceps.cpp
View file @
b5be4c3e
...
...
@@ -9,7 +9,7 @@
* Copyright (C) Idiap Research Institute, Martigny, Switzerland
*/
#include
"
Ceps.h
"
#include
<bob.ap/
Ceps.h
>
#include
<bob.core/assert.h>
bob
::
ap
::
Ceps
::
Ceps
(
const
double
sampling_frequency
,
...
...
bob/ap/cpp/Energy.cpp
View file @
b5be4c3e
...
...
@@ -6,7 +6,7 @@
* Copyright (C) Idiap Research Institute, Martigny, Switzerland
*/
#include
"
Energy.h
"
#include
<bob.ap/
Energy.h
>
#include
<bob.core/assert.h>
bob
::
ap
::
Energy
::
Energy
(
const
double
sampling_frequency
,
const
double
win_length_ms
,
...
...
bob/ap/cpp/FrameExtractor.cpp
View file @
b5be4c3e
...
...
@@ -8,7 +8,7 @@
#include
<stdexcept>
#include
"
FrameExtractor.h
"
#include
<bob.ap/
FrameExtractor.h
>
#include
<bob.core/check.h>
bob
::
ap
::
FrameExtractor
::
FrameExtractor
(
const
double
sampling_frequency
,
...
...
bob/ap/cpp/Spectrogram.cpp
View file @
b5be4c3e
...
...
@@ -7,7 +7,7 @@
* Copyright (C) Idiap Research Institute, Martigny, Switzerland
*/
#include
"
Spectrogram.h
"
#include
<bob.ap/
Spectrogram.h
>
#include
<bob.core/assert.h>
#include
<bob.core/cast.h>
...
...
bob/ap/
cp
p/Ceps.h
→
bob/ap/
include/bob.a
p/Ceps.h
View file @
b5be4c3e
File moved
bob/ap/
cp
p/Energy.h
→
bob/ap/
include/bob.a
p/Energy.h
View file @
b5be4c3e
File moved
bob/ap/
cp
p/FrameExtractor.h
→
bob/ap/
include/bob.a
p/FrameExtractor.h
View file @
b5be4c3e
File moved
bob/ap/
cp
p/Spectrogram.h
→
bob/ap/
include/bob.a
p/Spectrogram.h
View file @
b5be4c3e
File moved
bob/ap/include/bob.ap/config.h
0 → 100644
View file @
b5be4c3e
/**
* @author Manuel Guenther <manuel.guenther@idiap.ch>
* @date Mon Aug 18 16:08:58 CEST 2014
*
* @brief General directives for all modules in bob.ap
*/
#ifndef BOB_AP_CONFIG_H
#define BOB_AP_CONFIG_H
/* Macros that define versions and important names */
#define BOB_AP_API_VERSION 0x0200
#endif
/* BOB_AP_CONFIG_H */
bob/ap/types.h
View file @
b5be4c3e
...
...
@@ -8,10 +8,10 @@
#ifndef BOB_AP_TYPES_H
#define BOB_AP_TYPES_H
#include
"cp
p/FrameExtractor.h
"
#include
"cp
p/Energy.h
"
#include
"cp
p/Spectrogram.h
"
#include
"cp
p/Ceps.h
"
#include
<bob.a
p/FrameExtractor.h
>
#include
<bob.a
p/Energy.h
>
#include
<bob.a
p/Spectrogram.h
>
#include
<bob.a
p/Ceps.h
>
/**
* Represents either an FrameExtractor
...
...
bob/ap/version.cpp
View file @
b5be4c3e
...
...
@@ -20,6 +20,7 @@
#include
<bob.blitz/capi.h>
#include
<bob.blitz/cleanup.h>
#include
<bob.core/config.h>
#include
<bob.sp/config.h>
static
int
dict_set
(
PyObject
*
d
,
const
char
*
key
,
const
char
*
value
)
{
PyObject
*
v
=
Py_BuildValue
(
"s"
,
value
);
...
...
@@ -101,6 +102,13 @@ static PyObject* bob_core_version() {
return
Py_BuildValue
(
"{ss}"
,
"api"
,
BOOST_PP_STRINGIZE
(
BOB_CORE_API_VERSION
));
}
/**
* bob.sp c/c++ api version
*/
static
PyObject
*
bob_sp_version
()
{
return
Py_BuildValue
(
"{ss}"
,
"api"
,
BOOST_PP_STRINGIZE
(
BOB_SP_API_VERSION
));
}
static
PyObject
*
build_version_dictionary
()
{
PyObject
*
retval
=
PyDict_New
();
...
...
@@ -114,6 +122,7 @@ static PyObject* build_version_dictionary() {
if
(
!
dict_steal
(
retval
,
"NumPy"
,
numpy_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.sp"
,
bob_sp_version
()))
return
0
;
Py_INCREF
(
retval
);
return
retval
;
...
...
setup.py
View file @
b5be4c3e
...
...
@@ -5,7 +5,7 @@
from
setuptools
import
setup
,
find_packages
,
dist
dist
.
Distribution
(
dict
(
setup_requires
=
[
'bob.blitz'
,
'bob.core'
,
'bob.sp'
]))
from
bob.blitz.extension
import
Extension
from
bob.blitz.extension
import
Extension
,
Library
,
build_ext
version
=
'2.0.0a0'
...
...
@@ -29,29 +29,36 @@ setup(
'setuptools'
,
'bob.blitz'
,
'bob.core'
,
'bob.sp'
,
# for testing
'bob.sp'
,
'scipy'
,
# for testing
],
namespace_packages
=
[
"bob"
,
],
],
ext_modules
=
[
Extension
(
"bob.ap.version"
,
[
"bob/ap/version.cpp"
,
],
],
version
=
version
,
bob_packages
=
[
'bob.core'
]
),
Extension
(
"bob.ap._library"
,
bob_packages
=
[
'bob.core'
,
'bob.sp'
]
),
Library
(
"bob.ap.bob_ap"
,
[
"bob/ap/cpp/Energy.cpp"
,
"bob/ap/cpp/FrameExtractor.cpp"
,
"bob/ap/cpp/Spectrogram.cpp"
,
"bob/ap/cpp/Ceps.cpp"
,
],
version
=
version
,
bob_packages
=
[
'bob.core'
,
'bob.sp'
]
),
Extension
(
"bob.ap._library"
,
[
"bob/ap/energy.cpp"
,
"bob/ap/frame_extractor.cpp"
,
"bob/ap/spectrogram.cpp"
,
...
...
@@ -59,10 +66,13 @@ setup(
"bob/ap/main.cpp"
,
],
version
=
version
,
# TODO: version the packages ?
bob_packages
=
[
'bob.core'
,
'bob.sp'
]
),
],
),
],
cmdclass
=
{
'build_ext'
:
build_ext
},
classifiers
=
[
'Development Status :: 3 - Alpha'
,
...
...
@@ -72,6 +82,6 @@ setup(
'Programming Language :: Python'
,
'Programming Language :: Python :: 3'
,
'Topic :: Software Development :: Libraries :: Python Modules'
,
],
],
)
)
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