remove auto-tag

tihu-nlp · b00f · Mar 14, 2019 · Sep 24, 2018 · Sep 24, 2018 · Sep 24, 2018
commit fac9aedfbd985ebb5f5b0756f7b571c90f5c22d9
diff --git a/tihu/Makefile b/tihu/Makefile
@@ -1,66 +1,29 @@
 LIBNAME = tihu
 TARGET=lib$(LIBNAME).so
-TARGET_TEST=$(LIBNAME)_test
 CC = g++
-
-INC =  `python2.7-config --includes` -I. -Xlinker -export-dynamic
-CXXFLAGS = -c -fPIC -Wall -std=c++14 $(INC) -O3 -g
+SRCS = $(wildcard *.cpp) $(wildcard */*.cpp) $(wildcard */*/*.cpp)
+OBJS = $(addprefix obj/,$(patsubst %.cpp,%.o,$(SRCS)))
+OBJDIRS = $(dir $(OBJS))
+INC = `python2.7-config --includes` -I. -Xlinker -export-dynamic
 ## for debugging
-##CXXFLAGS = -c -Wall -std=c++14 $(INC) -DDEBUG -g -fPIC
-LDFLAGS =  `python2.7-config --ldflags` -shared -Wl,-soname,$(TARGET) -o $(TARGET)
+CXXFLAGS = -c -Wall -std=c++14 $(INC) -DDEBUG -g -fPIC
+#CXXFLAGS = -c -fPIC -Wall -std=c++14 $(INC) -O3 -g
+LDFLAGS = `python2.7-config --ldflags` -shared -Wl,-soname,$(TARGET) -o $(TARGET)
 LIBS =
-RM = rm -f
-
-SRCS= \
-	ipa_transcript/tihu_dict/afx_manager.cpp \
-	ipa_transcript/tihu_dict/afx_entry.cpp \
-	ipa_transcript/tihu_dict/hash_manager.cpp \
-	ipa_transcript/tihu_dict/pfx_entry.cpp \
-	ipa_transcript/tihu_dict/sfx_entry.cpp \
-	ipa_transcript/tihu_dict/tihu_dict.cpp \
-	ipa_transcript/letter_to_sound/persian_to_phoneme.cpp \
-    ipa_transcript/letter_to_sound/english_to_phoneme.cpp \
-    ipa_transcript/letter_to_sound/punctuation_to_phoneme.cpp \
-    ipa_transcript/letter_to_sound/number_to_phoneme.cpp \
-    ipa_transcript/letter_to_sound/letter_to_sound.cpp \
-    ipa_transcript/letter_to_sound/g2p_seq2seq_linux.cpp \
-	synthesis/espeak/espeak_lib.cpp \
-	synthesis/espeak/espeak_syn.cpp \
-	synthesis/mbrola/mbrola_lib.cpp \
-	synthesis/mbrola/mbrola_syn.cpp \
-	synthesis/mbrola/mbrowrap.cpp \
-    hazm/hazm.cpp \
-    text_tagger.cpp \
-	corpus.cpp \
-	event.cpp \
-    phoneme.cpp \
-	pitch_range.cpp \
-	word.cpp \
-	tihu.cpp \
-    parser.cpp \
-    engine.cpp \
-	settings.cpp \
-	synthesizer.cpp \
-	helper.cpp \
-	hunzip.cpp \
-	file_manager.cpp
-
-OBJS = $(SRCS:.cpp=.o)
-
 
 .PHONY: all
 all: $(TARGET) install
 
 $(TARGET): $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-.cpp.o:
-	$(CC) $(CXXFLAGS) $< -o $@
+obj/%.o: %.cpp
+	@mkdir -p $(@D)
+	$(CC) $(CXXFLAGS) -c $< -o $@
 
 .PHONY: clean
 clean:
-	-$(RM) $(TARGET) $(OBJS) $(TARGET_TEST)
-
+	rm -rf ./obj
 
 install:
 	cp $(TARGET) ../build/
@@ -71,3 +34,6 @@ test: $(TARGET_TEST)
 
 $(TARGET_TEST): $(TARGET)
 	$(CC) $(TARGET_TEST).cpp -o $@ -L. -ldl
+
+# to print variables in makefile
+print-%  : ; @echo $* = $($*)
diff --git a/tihu/engine.cpp b/tihu/engine.cpp
@@ -24,7 +24,6 @@
 #include "synthesis/mbrola/mbrola_syn.h"
 #include "synthesis/espeak/espeak_syn.h"
 #include "hazm/hazm.h"
-#include "text_tagger.h"
 #include "engine.h"
 #include "tihu.h"
 
@@ -49,7 +48,6 @@ CEngine::CEngine()
     TihuDict        = nullptr;
     LetterToSound   = nullptr;
     Synthesizer     = nullptr;
-    TextTagger      = nullptr;
     Corpus          = new CCorpus();
 }
 
@@ -67,9 +65,6 @@ CEngine::~CEngine()
     if(Synthesizer) {
         delete Synthesizer;
     }
-    if(TextTagger) {
-        delete TextTagger;
-    }
     delete Corpus;
 }
 
@@ -85,7 +80,6 @@ int CEngine::LoadModules()
     Hazm = new CHazm();
     TihuDict = new CTihuDict();
     LetterToSound = new CLetterToSound();
-    TextTagger = new CTextTagger();
 
     if (!static_cast<CHazm*>(Hazm)->Load("Hazm")) {
         return TIHU_ERROR_LOAD_DATA;
@@ -148,7 +142,6 @@ void CEngine::SetCallback(TIHU_CALLBACK callback, void* userData)
     (TihuDict) ? TihuDict->SetCallBack(callback, userData) : void();
     (LetterToSound) ? LetterToSound->SetCallBack(callback, userData) : void();
     (Synthesizer) ? Synthesizer->SetCallBack(callback, userData) : void();
-    (TextTagger) ? TextTagger->SetCallBack(callback, userData) : void();
 }
 
 void CEngine::Stop()
@@ -180,11 +173,6 @@ void CEngine::Diacritize(const std::string &text)
 
 }
 
-void CEngine::AutoTag(const std::string &text)
-{
-
-}
-
 bool CEngine::SetParam(TIHU_PARAM param, int value)
 {
     bool applied = true;

diff --git a/tihu/engine.h b/tihu/engine.h
@@ -43,7 +43,6 @@ class CEngine
 
     void Speak(const std::string &text);
     void Diacritize(const std::string &text); //TODO:
-    void AutoTag(const std::string &text); //TODO:
 
     void Dump(const std::string &filename);
     void Stop();
@@ -65,7 +64,6 @@ class CEngine
     IParser* Hazm;
     IParser* TihuDict;
     IParser* LetterToSound;
-    IParser* TextTagger;
 
     ISynthesizer* Synthesizer;
 

diff --git a/tihu/ipa_transcript/letter_to_sound/english_to_phoneme.h b/tihu/ipa_transcript/letter_to_sound/english_to_phoneme.h
@@ -26,12 +26,7 @@
 #include "helper.h"
 
 #include <map>
-
-#ifdef WIN32
-#include "g2p_seq2seq_windows.h"
-#else
-#include "g2p_seq2seq_linux.h"
-#endif
+#include "g2p_seq2seq.h"
 
 class CEnglishToPhoneme
 {

diff --git a/...ipt/letter_to_sound/g2p_seq2seq_linux.cpp → ...ranscript/letter_to_sound/g2p_seq2seq.cpp b/...ipt/letter_to_sound/g2p_seq2seq_linux.cpp → ...ranscript/letter_to_sound/g2p_seq2seq.cpp
@@ -18,8 +18,7 @@
 *    Mostafa Sedaghat Joo (mostafa.sedaghat@gmail.com)
 *
 *******************************************************************************/
-#include "g2p_seq2seq_linux.h"
-//#include "path_manager.h"
+#include "g2p_seq2seq.h"
 
 
 #include <unistd.h>

diff --git a/...cript/letter_to_sound/g2p_seq2seq_linux.h → ..._transcript/letter_to_sound/g2p_seq2seq.h b/...cript/letter_to_sound/g2p_seq2seq_linux.h → ..._transcript/letter_to_sound/g2p_seq2seq.h
diff --git a/tihu/ipa_transcript/letter_to_sound/g2p_seq2seq_windows.cpp b/tihu/ipa_transcript/letter_to_sound/g2p_seq2seq_windows.cpp
diff --git a/tihu/ipa_transcript/letter_to_sound/g2p_seq2seq_windows.h b/tihu/ipa_transcript/letter_to_sound/g2p_seq2seq_windows.h
diff --git a/tihu/ipa_transcript/letter_to_sound/persian_to_phoneme.h b/tihu/ipa_transcript/letter_to_sound/persian_to_phoneme.h
@@ -26,12 +26,7 @@
 #include "helper.h"
 
 #include <map>
-
-#ifdef WIN32
-#include "g2p_seq2seq_windows.h"
-#else
-#include "g2p_seq2seq_linux.h"
-#endif
+#include "g2p_seq2seq.h"
 
 class CPersianToPhoneme
 {

diff --git a/tihu/text_tagger.cpp b/tihu/text_tagger.cpp