Commit f63376f8 authored by André Anjos's avatar André Anjos 💬

Removed more Bob/C++ ties

parent 254954ae
......@@ -10,7 +10,7 @@
*/
#include "Ceps.h"
#include <bob/core/assert.h>
#include <bob.core/assert.h>
bob::ap::Ceps::Ceps(const double sampling_frequency,
const double win_length_ms, const double win_shift_ms,
......
......@@ -7,7 +7,7 @@
*/
#include "Energy.h"
#include <bob/core/assert.h>
#include <bob.core/assert.h>
bob::ap::Energy::Energy(const double sampling_frequency, const double win_length_ms,
const double win_shift_ms):
......
......@@ -9,7 +9,7 @@
#include <stdexcept>
#include "FrameExtractor.h"
#include <bob/core/check.h>
#include <bob.core/check.h>
bob::ap::FrameExtractor::FrameExtractor(const double sampling_frequency,
const double win_length_ms, const double win_shift_ms):
......
......@@ -8,7 +8,7 @@
*/
#include "Spectrogram.h"
#include <bob/core/assert.h>
#include <bob.core/assert.h>
#include <bob/core/cast.h>
bob::ap::Spectrogram::Spectrogram(const double sampling_frequency,
......
......@@ -10,6 +10,7 @@ extensions = bob.buildout
auto-checkout = *
develop = src/bob.extension
src/bob.blitz
src/bob.core
src/bob.sp
.
......@@ -22,6 +23,7 @@ prefixes = /idiap/group/torch5spro/nightlies/last/bob/linux-x86_64-release
[sources]
bob.extension = git https://github.com/bioidiap/bob.extension
bob.blitz = git https://github.com/bioidiap/bob.blitz
bob.core = git https://github.com/bioidiap/bob.core
bob.sp = git https://github.com/bioidiap/bob.sp
[scripts]
......
......@@ -4,8 +4,11 @@
# Thu 30 Jan 08:45:49 2014 CET
from setuptools import setup, find_packages, dist
dist.Distribution(dict(setup_requires=['bob.blitz']))
dist.Distribution(dict(setup_requires=['bob.blitz', 'bob.core']))
from bob.blitz.extension import Extension
import bob.core
include_dirs = [bob.core.get_include()]
packages = ['bob-core >= 1.2.2', 'bob-sp >= 1.2.2']
version = '2.0.0a0'
......@@ -29,6 +32,7 @@ setup(
install_requires=[
'setuptools',
'bob.blitz',
'bob.core',
'bob.sp', # for testing
'scipy', # for testing
],
......@@ -58,6 +62,7 @@ setup(
"bob/ap/ceps.cpp",
"bob/ap/main.cpp",
],
include_dirs = include_dirs,
packages = packages,
version = version,
),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment