Commit 8746058c authored by Karel Vesely's avatar Karel Vesely
Browse files

trunk,tools : adding patch to beamformit tool, also adding build procedure for...

trunk,tools : adding patch to beamformit tool, also adding build procedure for libsndfile needed by beamfomit (beamformit is used in ami mdm setup)



git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@5022 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
parent 566c00e0
......@@ -53,6 +53,7 @@ distclean:
rm -rf sctk-2.4.9-20141015-1634Z.tar.bz2
rm -rf openfst-$(OPENFST_VERSION).tar.gz
rm -f openfst
rm -rf libsndfile-1.0.25{,.tar.gz} BeamformIt-3.51{,.tgz}
.PHONY: openfst # so target will be made even though "openfst" exists.
......@@ -176,13 +177,22 @@ openblas_compiled:
cd OpenBLAS; sed 's:# FCOMMON_OPT = -frecursive:FCOMMON_OPT = -frecursive:' < Makefile.rule >tmp && mv tmp Makefile.rule
$(MAKE) PREFIX=`pwd`/OpenBLAS/install FC=gfortran $(fortran_opt) DEBUG=1 USE_THREAD=1 -C OpenBLAS all install
beamformit: beamformit-3.51
# libsndfile needed by beamformit,
libsndfile: libsndfile-1.0.25.tar.gz libsndfile-1.0.25/lib/libsndfile.so
libsndfile-1.0.25.tar.gz:
wget http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
libsndfile-1.0.25/lib/libsndfile.so:
tar xvf libsndfile-1.0.25.tar.gz && cd libsndfile-1.0.25/ && \
./configure --prefix=$(PWD)/libsndfile-1.0.25/ && make && make install
# beamforming tool,
beamformit: libsndfile beamformit-3.51
.PHONY: beamformit-3.51
beamformit-3.51: beamformit-3.51.tgz
tar -xozf BeamformIt-3.51.tgz; \
cd BeamformIt-3.51; cmake . ; make
cd BeamformIt-3.51; patch -p1 -N < ../extras/beamformit.patch; cmake . ; make
beamformit-3.51.tgz:
wget -c -T 10 http://www.xavieranguera.com/beamformit/releases/BeamformIt-3.51.tgz
......
diff -rupN BeamformIt-3.51/CMakeLists.txt BeamformIt-3.51.new/CMakeLists.txt
--- BeamformIt-3.51/CMakeLists.txt 2015-04-21 17:38:56.449493905 +0200
+++ BeamformIt-3.51.new/CMakeLists.txt 2015-04-21 17:40:03.347495289 +0200
@@ -20,7 +20,7 @@ set (CMAKE_C_FLAGS_RELEASE "-D_R
set (CMAKE_CXX_FLAGS_RELEASE "-DLINUX -Wall -W -O3 -DNDEBUG -Wno-unknown-pragmas -Wno-unused-result -Wno-unused-variable")
##find libraries installed in the system
-FIND_LIBRARY(LIBSNDFILE sndfile)
+FIND_LIBRARY(LIBSNDFILE sndfile ../libsndfile-1.0.25/lib/)
##set particular settings for each architecture
set (FFTREAL_HDRS ${CMAKE_CURRENT_SOURCE_DIR}/external/FFTReal-2.11)
@@ -37,7 +37,7 @@ endif()
##set some generic link directories
LINK_DIRECTORIES(${os_link_libs})
set (CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem") #needed for the SYSTEM link directories to work on osx
-INCLUDE_DIRECTORIES(SYSTEM ${os_include_libs})
+INCLUDE_DIRECTORIES(SYSTEM ${os_include_libs} ../libsndfile-1.0.25/include/)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/includes)
#gather project files (note that when adding a new file cmake needs to be rerun)
diff -rupN BeamformIt-3.51/src/delaysum.cc BeamformIt-3.51.new/src/delaysum.cc
--- BeamformIt-3.51/src/delaysum.cc 2015-04-21 17:38:57.474493926 +0200
+++ BeamformIt-3.51.new/src/delaysum.cc 2015-04-21 17:40:31.974495882 +0200
@@ -12,7 +12,7 @@
#include <iostream>
#include <cstring>
-#include "samplerate.h"
+//#include "samplerate.h"
#include "sndfile.h"
#include "global.h"
#include "delaysum.h"
diff -rupN BeamformIt-3.51/src/fileinout.cc BeamformIt-3.51.new/src/fileinout.cc
--- BeamformIt-3.51/src/fileinout.cc 2015-04-21 17:38:57.488493926 +0200
+++ BeamformIt-3.51.new/src/fileinout.cc 2015-04-21 17:40:47.166496196 +0200
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <cstring>
#include "fileinout.h"
-#include "samplerate.h"
+//#include "samplerate.h"
//char tmp_string[1024];
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