Added bg mode for windows.

CLARIN-PL · Oct 10, 2022 · 5353386 · 5353386
1 parent 9970567
commit 5353386
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+build/
+.vs/
+models*/
+lib/
+test/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,13 +3,9 @@ project(KaldiAligner)
 
 set(CMAKE_CXX_STANDARD 11)
 
-set(KALDI_ROOT /opt/kaldi)
+include_directories(phonetisaurus include include/kaldi)
+link_directories(lib)
 
-include_directories(include ${KALDI_ROOT}/tools/phonetisaurus-g2p/src/ ${KALDI_ROOT}/tools/phonetisaurus-g2p/src/3rdparty/utfcpp ${KALDI_ROOT}/tools/openfst/include ${KALDI_ROOT}/src /usr/local/cuda/include)
-link_directories(${KALDI_ROOT}/tools/openfst/lib ${KALDI_ROOT}/src/lib)
-
-SET(PHONETISAURUS_OBJ ${KALDI_ROOT}/tools/phonetisaurus-g2p/src/lib/phonetisaurus_g2pfst-util.o)
-
-add_compile_definitions(HAVE_CUDA)
-add_executable(KaldiAligner src/main.cpp src/g2p.cpp src/lex.cpp src/kaldi.cpp src/signaling.cpp ${PHONETISAURUS_OBJ})
-target_link_libraries(KaldiAligner fst kaldi-feat kaldi-base kaldi-util kaldi-matrix kaldi-transform kaldi-ivector kaldi-online2 kaldi-decoder kaldi-hmm kaldi-tree kaldi-nnet3 kaldi-cudamatrix kaldi-lat)
+add_compile_definitions(HAVE_MKL)
+add_executable(KaldiAligner src/main.cpp src/g2p.cpp src/lex.cpp src/kaldi.cpp src/signaling.cpp phonetisaurus/util.cc)
+target_link_libraries(KaldiAligner fst kaldi-feat kaldi-base kaldi-util kaldi-matrix kaldi-transform kaldi-ivector kaldi-online2 kaldi-decoder kaldi-hmm kaldi-gmm kaldi-fstext kaldi-tree kaldi-nnet3 kaldi-cudamatrix kaldi-lat mkl_rt mkl_intel_thread mkl_core mkl_intel_lp64)
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -0,0 +1,15 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    }
+  ]
+}
diff --git a/KaldiAligner.exe b/KaldiAligner.exe
diff --git a/src/signaling.cpp b/src/signaling.cpp
@@ -1,5 +1,36 @@
 #include <iostream>
 #include <fstream>
+
+#if defined(_WIN32)
+#include <windows.h>
+
+void init_wait() {
+
+}
+
+void wait_for_signal() {
+    HANDLE hMutex;
+
+    while (true) {
+        hMutex = OpenMutex(MUTEX_ALL_ACCESS, FALSE, TEXT("Global\\KALDI_ALIGNER"));
+        if (hMutex) {
+            break;
+        }
+        Sleep(500);
+    }
+    CloseHandle(hMutex);
+}
+
+
+void do_signal() {
+    HANDLE hMutex;
+    hMutex=CreateMutex(NULL,FALSE,TEXT("Global\\KALDI_ALIGNER"));
+    if (hMutex) {
+        Sleep(750);
+        CloseHandle(hMutex);
+    }
+}
+#else
 #include <signal.h>
 #include <unistd.h>
 
@@ -33,4 +64,5 @@ void do_signal() {
   pidf >> pid;
   pidf.close();
   kill(pid, SIGUSR1);
-}
+}
+#endif
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
@@ -7,5 +7,5 @@ include_directories(../phonetisaurus ../include ../include/kaldi)
 link_directories(../lib)
 
 add_compile_definitions(HAVE_MKL)
-add_executable(KaldiAligner ../src/main.cpp ../src/g2p.cpp ../src/lex.cpp ../src/kaldi.cpp ../phonetisaurus/util.cc)
+add_executable(KaldiAligner ../src/main.cpp ../src/g2p.cpp ../src/lex.cpp ../src/kaldi.cpp ../src/signaling.cpp ../phonetisaurus/util.cc)
 target_link_libraries(KaldiAligner fst kaldi-feat kaldi-base kaldi-util kaldi-matrix kaldi-transform kaldi-ivector kaldi-online2 kaldi-decoder kaldi-hmm kaldi-gmm kaldi-fstext kaldi-tree kaldi-nnet3 kaldi-cudamatrix kaldi-lat mkl_rt mkl_intel_thread mkl_core mkl_intel_lp64)