Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

varnamc CLI utility in C #157

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

varnamc CLI utility in C #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
015d9eb
Intial port of varnamc from Ruby to C
subins2000 Sep 12, 2020
1602c6c
Add cmake rule to build the new C version of `varnamc`. Move old Ruby…
subins2000 Sep 15, 2020
b49b9df
Replace occurences of Ruby varnamc binary
subins2000 Sep 15, 2020
6082186
Added --learn (-n). Bugfixes
subins2000 Sep 15, 2020
586897b
Added --train (-a)
subins2000 Sep 16, 2020
b8d3bdc
Set default value for all args as NULL
subins2000 Sep 16, 2020
31704b4
Add --version (-v)
subins2000 Sep 16, 2020
262e9e8
Fix naming of transliterate. --transliterate or -t
subins2000 Sep 16, 2020
110c97f
Add --reverse-transliterate (-r)
subins2000 Sep 16, 2020
5ebd0fc
Prettifiying some code
subins2000 Sep 16, 2020
f775edd
Add an --info (-i) flag to get confidence value in transliteration ou…
subins2000 Sep 16, 2020
5d79ed2
Add --learn-from (-f)
subins2000 Sep 17, 2020
6c0ecd2
Rename --info (-d) to --details (-d)
subins2000 Sep 17, 2020
f3b21bf
Add --import-learnings-from (-i)
subins2000 Sep 17, 2020
1a731e2
Add --export-full
subins2000 Oct 19, 2020
578abcc
Install varnamc.rb to /bin too
subins2000 Oct 19, 2020
01d97f5
Disable building varnamc in MSVC
subins2000 Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ examples/stemmer
distribution-tarball/
testrun.log
testrun.xml

varnamc
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/deps/cma

set(VARNAM_LIBRARY_NAME "varnam")
set(VARNAM_LIBRARY_NAME_STATIC "varnamstatic")
set(VARNAM_BINARY_NAME "varnamc")
set(DEPS_LIBRARY_NAME "deps")

set(VARNAM_VERSION_MAJOR 3)
Expand Down Expand Up @@ -156,7 +157,7 @@ if (BUILD_VST)
# Each scheme will have a target to compile
# vst will have a dependency to all these targets so that running vst will compile all the scheme files
foreach(scheme ${SUPPORTED_SCHEMES})
add_custom_target (${scheme}.vst COMMAND ./varnamc --compile schemes/${scheme})
add_custom_target (${scheme}.vst COMMAND ./varnamc.rb --compile schemes/${scheme})
add_dependencies (vst "${scheme}.vst")
install (FILES schemes/${scheme}.vst DESTINATION ${CMAKE_INSTALL_PREFIX}/share/varnam/vst OPTIONAL)
endforeach()
Expand Down Expand Up @@ -189,6 +190,7 @@ INSTALL ( FILES ${CMAKE_BINARY_DIR}/varnamstatic.pc DESTINATION ${VARNAM_LIB_INS
INSTALL ( FILES varnamruby.rb DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
INSTALL_PROGRAMS(/bin FILES varnamc)
INSTALL ( FILES varnamc.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
INSTALL_PROGRAMS(/bin FILES varnamc.rb)

# uninstall target
configure_file(
Expand All @@ -207,3 +209,10 @@ else()
target_link_libraries(${VARNAM_LIBRARY_NAME} pthread dl ${SQLITE3_LIBRARIES})
ENDIF()

# argp doesn't by default exist for windows
# TODO make varnamc work on windows too
IF(!MSVC)
FILE(GLOB_RECURSE SOURCES varnamc.c)
ADD_EXECUTABLE(${VARNAM_BINARY_NAME} ${SOURCES})
target_link_libraries(${VARNAM_BINARY_NAME} ${VARNAM_LIBRARY_NAME})
ENDIF()
6 changes: 3 additions & 3 deletions tests/varnamc_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
START_TEST (learn_failures_file_should_not_be_created_always)
{
int exitcode;
exitcode = system ("../varnamc -s ml -t varnam -d output/");
exitcode = system ("../varnamc.rb -s ml -t varnam -d output/");
ck_assert_int_eq (0, exitcode);
ck_assert_int_eq (0, file_exist ("output/varnamc-learn-failures.txt"));
ck_assert_int_eq (0, file_exist ("output/varnamc-train-failures.txt"));
Expand All @@ -27,7 +27,7 @@ START_TEST (learn_failures_file_should_be_created_upon_failures)

filename = create_text_file ("not-valid-indic-word");
command = strbuf_init (20);
strbuf_addf (command, "../varnamc -s ml --learn-from %s -d output/", filename);
strbuf_addf (command, "../varnamc.rb -s ml --learn-from %s -d output/", filename);
exitcode = system (strbuf_to_s (command));
ck_assert_int_eq (0, exitcode);
ck_assert_int_eq (1, file_exist ("output/varnamc-learn-failures.txt"));
Expand All @@ -50,7 +50,7 @@ START_TEST (training_failures_file_should_be_created_upon_failures)

filename = create_text_file ("not-valid-indic-word");
command = strbuf_init (20);
strbuf_addf (command, "../varnamc -s ml --train-from %s -d output/", filename);
strbuf_addf (command, "../varnamc.rb -s ml --train-from %s -d output/", filename);
exitcode = system (strbuf_to_s (command));
ck_assert_int_eq (0, exitcode);
ck_assert_int_eq (1, file_exist ("output/varnamc-train-failures.txt"));
Expand Down
Loading