From fb52b99cbe99dd69376a10cbef7524f9d762449f Mon Sep 17 00:00:00 2001 From: jahausw Date: Fri, 5 Jun 2015 18:40:41 -0400 Subject: [PATCH] some more final tw --- common/weights/dl_djinn_weights.sh | 9 +++++ tonic-suite/asr/src/kaldi.mk | 58 ----------------------------- tonic-suite/asr/src/kaldi.mk.bak | 58 ----------------------------- tonic-suite/asr/src/probe/exp-test | Bin 25728 -> 0 bytes tonic-suite/img/Makefile | 2 +- tonic-suite/nlp/Makefile | 2 +- 6 files changed, 11 insertions(+), 118 deletions(-) create mode 100755 common/weights/dl_djinn_weights.sh delete mode 100644 tonic-suite/asr/src/kaldi.mk delete mode 100644 tonic-suite/asr/src/kaldi.mk.bak delete mode 100755 tonic-suite/asr/src/probe/exp-test diff --git a/common/weights/dl_djinn_weights.sh b/common/weights/dl_djinn_weights.sh new file mode 100755 index 0000000..aac6185 --- /dev/null +++ b/common/weights/dl_djinn_weights.sh @@ -0,0 +1,9 @@ +# Download weights for DjiNN and Tonic + +fname=djinn-weights-1.0.tar.gz + +wget http://web.eecs.umich.edu/~jahausw/download/$fname + +tar xvzf $fname + +rm -rf $fname diff --git a/tonic-suite/asr/src/kaldi.mk b/tonic-suite/asr/src/kaldi.mk deleted file mode 100644 index 61f3497..0000000 --- a/tonic-suite/asr/src/kaldi.mk +++ /dev/null @@ -1,58 +0,0 @@ -# This file was generated using the following command: -# ./configure - -# Rules that enable valgrind debugging ("make valgrind") - -valgrind: .valgrind - -.valgrind: - echo -n > valgrind.out - for x in $(TESTFILES); do echo $$x>>valgrind.out; valgrind ./$$x >/dev/null 2>> valgrind.out; done - ! ( grep 'ERROR SUMMARY' valgrind.out | grep -v '0 errors' ) - ! ( grep 'definitely lost' valgrind.out | grep -v -w 0 ) - rm valgrind.out - touch .valgrind - - -CONFIGURE_VERSION := 2 -OPENFSTLIBS = -L/home/ypkang/git/brainiac/tonic-suite/asr/tools/openfst/lib -lfst -OPENFSTLDFLAGS = -Wl,-rpath=/home/ypkang/git/brainiac/tonic-suite/asr/tools/openfst/lib -FSTROOT = /home/ypkang/git/brainiac/tonic-suite/asr/tools/openfst -ATLASINC = /home/ypkang/kaldi-trunk/tools/ATLAS/include -ATLASLIBS = /usr/lib/atlas-base/libatlas.so.3.0 /usr/lib/atlas-base/libf77blas.so.3.0 /usr/lib/atlas-base/libcblas.so.3 /usr/lib/atlas-base/liblapack_atlas.so.3 -Wl,-rpath=/usr/lib/atlas-base -# You have to make sure ATLASLIBS is set... - -ifndef FSTROOT -$(error FSTROOT not defined.) -endif - -ifndef ATLASINC -$(error ATLASINC not defined.) -endif - -ifndef ATLASLIBS -$(error ATLASLIBS not defined.) -endif - - -CXXFLAGS = -msse -msse2 -Wall -I.. \ - -pthread \ - -DKALDI_DOUBLEPRECISION=0 -DHAVE_POSIX_MEMALIGN \ - -Wno-sign-compare -Wno-unused-local-typedefs -Winit-self \ - -DHAVE_EXECINFO_H=1 -rdynamic -DHAVE_CXXABI_H \ - -DHAVE_ATLAS -I$(ATLASINC) \ - -I$(FSTROOT)/include \ - $(EXTRA_CXXFLAGS) \ - -g # -O0 -DKALDI_PARANOID - -ifeq ($(KALDI_FLAVOR), dynamic) -CXXFLAGS += -fPIC -endif - -LDFLAGS = -rdynamic $(OPENFSTLDFLAGS) -LDLIBS = $(EXTRA_LDLIBS) $(OPENFSTLIBS) $(ATLASLIBS) -lm -lpthread -ldl -lglog -CC = g++ -CXX = g++ -AR = ar -AS = as -RANLIB = ranlib diff --git a/tonic-suite/asr/src/kaldi.mk.bak b/tonic-suite/asr/src/kaldi.mk.bak deleted file mode 100644 index 5a8d519..0000000 --- a/tonic-suite/asr/src/kaldi.mk.bak +++ /dev/null @@ -1,58 +0,0 @@ -# This file was generated using the following command: -# ./configure - -# Rules that enable valgrind debugging ("make valgrind") - -valgrind: .valgrind - -.valgrind: - echo -n > valgrind.out - for x in $(TESTFILES); do echo $$x>>valgrind.out; valgrind ./$$x >/dev/null 2>> valgrind.out; done - ! ( grep 'ERROR SUMMARY' valgrind.out | grep -v '0 errors' ) - ! ( grep 'definitely lost' valgrind.out | grep -v -w 0 ) - rm valgrind.out - touch .valgrind - - -CONFIGURE_VERSION := 2 -OPENFSTLIBS = -L/home/ypkang/kaldi-trunk/tools/openfst/lib -lfst -OPENFSTLDFLAGS = -Wl,-rpath=/home/ypkang/kaldi-trunk/tools/openfst/lib -FSTROOT = /home/ypkang/kaldi-trunk/tools/openfst -ATLASINC = /home/ypkang/kaldi-trunk/tools/ATLAS/include -ATLASLIBS = /usr/lib/atlas-base/libatlas.so.3.0 /usr/lib/atlas-base/libf77blas.so.3.0 /usr/lib/atlas-base/libcblas.so.3 /usr/lib/atlas-base/liblapack_atlas.so.3 -Wl,-rpath=/usr/lib/atlas-base -# You have to make sure ATLASLIBS is set... - -ifndef FSTROOT -$(error FSTROOT not defined.) -endif - -ifndef ATLASINC -$(error ATLASINC not defined.) -endif - -ifndef ATLASLIBS -$(error ATLASLIBS not defined.) -endif - - -CXXFLAGS = -msse -msse2 -Wall -I.. \ - -pthread \ - -DKALDI_DOUBLEPRECISION=0 -DHAVE_POSIX_MEMALIGN \ - -Wno-sign-compare -Wno-unused-local-typedefs -Winit-self \ - -DHAVE_EXECINFO_H=1 -rdynamic -DHAVE_CXXABI_H \ - -DHAVE_ATLAS -I$(ATLASINC) \ - -I$(FSTROOT)/include \ - $(EXTRA_CXXFLAGS) \ - -g # -O0 -DKALDI_PARANOID - -ifeq ($(KALDI_FLAVOR), dynamic) -CXXFLAGS += -fPIC -endif - -LDFLAGS = -rdynamic $(OPENFSTLDFLAGS) -LDLIBS = $(EXTRA_LDLIBS) $(OPENFSTLIBS) $(ATLASLIBS) -lm -lpthread -ldl -CC = g++ -CXX = g++ -AR = ar -AS = as -RANLIB = ranlib diff --git a/tonic-suite/asr/src/probe/exp-test b/tonic-suite/asr/src/probe/exp-test deleted file mode 100755 index 90de2ff22ddb5bade06099fcb23f09e9e2c281eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25728 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 diff --git a/tonic-suite/img/Makefile b/tonic-suite/img/Makefile index 48f519f..120a711 100644 --- a/tonic-suite/img/Makefile +++ b/tonic-suite/img/Makefile @@ -18,7 +18,7 @@ LINK_FLAGS = $(LIBRARY_DIRS) \ -lopencv_highgui \ -lopencv_imgproc \ -lopencv_objdetect \ - $(COMMON)/libsocket.a \ + $(COMMON)/libtonic.a \ libflandmark_static.a \ -lboost_program_options \ -lboost_filesystem \ diff --git a/tonic-suite/nlp/Makefile b/tonic-suite/nlp/Makefile index dcb0254..88c5f8c 100644 --- a/tonic-suite/nlp/Makefile +++ b/tonic-suite/nlp/Makefile @@ -14,7 +14,7 @@ ifeq ($(CPU_ONLY), 1) endif LINK_FLAGS = $(LIBRARY_DIRS) \ - $(COMMON)/libsocket.a \ + $(COMMON)/libtonic.a \ -lboost_program_options \ -lboost_filesystem \ -lboost_system \