2022-10-22 10:07:59 +00:00
|
|
|
# dependencies
|
|
|
|
|
|
|
|
|
|
find_package(Threads REQUIRED)
|
|
|
|
|
|
|
|
|
|
# third-party
|
|
|
|
|
|
2023-04-30 09:14:33 +00:00
|
|
|
if (WHISPER_SDL2)
|
2022-10-25 16:13:08 +00:00
|
|
|
# SDL2
|
|
|
|
|
find_package(SDL2 REQUIRED)
|
|
|
|
|
|
|
|
|
|
string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
|
|
|
|
|
|
|
|
|
|
message(STATUS "SDL2_INCLUDE_DIRS = ${SDL2_INCLUDE_DIRS}")
|
|
|
|
|
message(STATUS "SDL2_LIBRARIES = ${SDL2_LIBRARIES}")
|
|
|
|
|
endif()
|
2022-10-22 10:07:59 +00:00
|
|
|
|
2023-12-29 10:23:27 +00:00
|
|
|
if (WHISPER_CLBLAST)
|
|
|
|
|
find_package(CLBlast REQUIRED)
|
|
|
|
|
endif()
|
|
|
|
|
|
2023-02-15 17:28:10 +00:00
|
|
|
# common
|
|
|
|
|
|
|
|
|
|
set(TARGET common)
|
|
|
|
|
|
|
|
|
|
add_library(${TARGET} STATIC
|
|
|
|
|
common.h
|
|
|
|
|
common.cpp
|
2023-04-30 15:51:57 +00:00
|
|
|
common-ggml.h
|
|
|
|
|
common-ggml.cpp
|
2023-11-13 08:51:34 +00:00
|
|
|
grammar-parser.cpp
|
2023-02-15 17:28:10 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
include(DefaultTargetOptions)
|
|
|
|
|
|
2023-04-30 15:51:57 +00:00
|
|
|
target_link_libraries(${TARGET} PRIVATE whisper)
|
|
|
|
|
|
2023-02-15 17:28:10 +00:00
|
|
|
set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
|
|
|
|
|
2023-04-30 09:14:33 +00:00
|
|
|
if (WHISPER_SDL2)
|
2023-02-15 17:28:10 +00:00
|
|
|
# common-sdl
|
|
|
|
|
|
|
|
|
|
set(TARGET common-sdl)
|
|
|
|
|
|
|
|
|
|
add_library(${TARGET} STATIC
|
|
|
|
|
common-sdl.h
|
|
|
|
|
common-sdl.cpp
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
include(DefaultTargetOptions)
|
|
|
|
|
|
|
|
|
|
target_include_directories(${TARGET} PUBLIC ${SDL2_INCLUDE_DIRS})
|
|
|
|
|
target_link_libraries(${TARGET} PRIVATE ${SDL2_LIBRARIES})
|
|
|
|
|
|
|
|
|
|
set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
|
|
|
|
endif()
|
|
|
|
|
|
2024-02-19 08:50:15 +00:00
|
|
|
# add json lib
|
|
|
|
|
add_library(json_cpp INTERFACE json.hpp)
|
|
|
|
|
|
2022-10-22 10:07:59 +00:00
|
|
|
# examples
|
|
|
|
|
|
2022-10-25 16:13:08 +00:00
|
|
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
|
|
|
2022-10-22 10:07:59 +00:00
|
|
|
if (EMSCRIPTEN)
|
|
|
|
|
add_subdirectory(whisper.wasm)
|
2022-11-25 21:57:46 +00:00
|
|
|
add_subdirectory(stream.wasm)
|
2022-11-26 09:40:06 +00:00
|
|
|
add_subdirectory(command.wasm)
|
2022-11-21 20:20:42 +00:00
|
|
|
add_subdirectory(talk.wasm)
|
2022-12-11 09:09:01 +00:00
|
|
|
add_subdirectory(bench.wasm)
|
2023-02-04 07:10:25 +00:00
|
|
|
elseif(CMAKE_JS_VERSION)
|
|
|
|
|
add_subdirectory(addon.node)
|
2022-10-22 10:07:59 +00:00
|
|
|
else()
|
2022-10-25 16:13:08 +00:00
|
|
|
add_subdirectory(main)
|
|
|
|
|
add_subdirectory(stream)
|
2023-11-20 19:40:24 +00:00
|
|
|
add_subdirectory(server)
|
2022-11-25 17:06:56 +00:00
|
|
|
add_subdirectory(command)
|
2022-10-25 16:13:08 +00:00
|
|
|
add_subdirectory(bench)
|
2023-04-30 15:51:57 +00:00
|
|
|
add_subdirectory(quantize)
|
2022-12-09 18:38:10 +00:00
|
|
|
add_subdirectory(talk)
|
2023-03-27 18:00:32 +00:00
|
|
|
add_subdirectory(talk-llama)
|
examples : vim plugin and LSP server (#1144)
* Initial proof of concept Vim plugin
At present, this is likely only slightly better than feature parity with
the existing whisper.nvim
Known issues:
Trailing whitespace
Up to an existing length(5 seconds) of speech may be processed when
listening is enabled
CPU cycles are spent processing speech even when not listening.
Fixing these issues is likely dependent upon future efforts to create a
dedicated library instead of wrapping examples/stream
* Support $WHISPER_CPP_HOME environment variable
A minor misunderstanding of the whisper.nvim implementation resulted in
a plugin that was functional, but not a drop in replacement as it should
be now.
* Initial progress on LSP implementation
Libcall is nonviable because the library is immediately freed after a
call is made. Further investigation has shown Language Server Protocol as
a promising alternative that both simplifies the required logic on the
vimscript side and increases the ease with which plugins for other
editors could be made in the future. This is a very large undertaking
and my progress has slowed substantially.
Work is far from being in a usable state, but I wish to keep track of
major refactors for organizational purposes.
* Rewrite audio windowing of guided transcription
One of the defining goals of this venture is allowing consecutive
commands to be rattled off without the existing deadzones of the current
implementation.
* Add unguided_transcription. Cleanup.
The unguided transcription implantation heavily borrows from existing
example implementations and the guided_transcription logic.
A high level pass was done to check that method arguments are accurate
to what inputs are actually required.
A first attempt at cancellation support was added for record keeping,
but will be deleted in a future commit.
* Fix compilation.
Resolves a large number of compilation errors.
No testing has been done yet for execution errors.
Update Makefile and .gitignore
* Functional unguided_transcription
* Functional guided_transcription
Fix commandset_list being passed by value
Properly register the first token of a multitoken command
* Minor changes before time fix
I've apparently made an awfully major mistake in thinking that unix time
was in milliseconds and will be changing all timekeeping code to use
standardized methods.
In preparation for this is a number of minor bugfixes.
Output is manually flushed.
An echo method has been added.
registerCommandset now wraps the returned index
* Swap timekeeping to use std::chrono
* Add work in progress lsp backed whisper.vim plugin
Current progress blockers are
Adding modality awareness to the command processing
(specifically, motion prompting)
Improving the VAD to be a little more responsive
(testing start of activity)
* Reworked vim plugin command loop
* Fix change inside
Multiple bug fixes that, crucially, bring the plugin to the point where a
demonstration video is possible
Add better echo messaging so whisper_log isn't required
Add loading complete message as indicator when listening has started
Insert/append are actually included in command sets
Some more heavy handed corrections to prevent a double exit when leaving
insert mode
As a somewhat hacky fix, the very first space is removed when inserting.
This cleans up most use cases, but leaves me unsatisfied with the few
cases it would be desired.
* Forcibly set commandset_index to 0 after subinsert
Also remove unnecessary ! to use builtin vim command
* Fix upper
A minor scope mistake was causing upper'd inputs to be eaten.
This was fixed and echoing was slightly improved for clarity.
* Fix formatting
Corrects indentation to 4 spaces as project standard
Slightly better error support for malformed json input
* Remove obsolete vim plugin
* Add json.hpp library
The same library that is used for the llama.cpp server
* Minor cleanups
add lsp to the make clean directive.
remove a redundant params definition.
reorder whisper.vim logging for subtranscriptions
Corrections to unlets (variables of argument scope appear immutable)
* Fix indentation. Fallback for subTranscription
Indentation has been changed to 4 spaces.
Unit testing has been set up, I'm opting not to include it in the
repository for now.
It however, has revealed a bug in the state logic where a
subtranscription can be initiated without having a saved command
When this occurs, append is added as a fallback
* Move audio polling logic to a subfunction
While work on the improved vad will continue, It's grown to be a little
out of scope. Instead, a future commit will perform multiple detection
passes at substretches of audio when a backlog of audio exists.
To facilitate this, and prevent code duplication, the vad code has been
moved into a subfunction shared by both the unguided and guided
transcription functions.
* Test for voice over subchunks if backlog > 1s
As the existing VAD implementation only checks for a falling edge at the
end of an audio chunk. It fails to detect voice in cases where the
recorded voice is only at the beginning of the audio.
To ameliorate this, when the timestamp would cause analysis of audio
over a second in length, it is split into 1 second length subchunks
which are individually tested.
Results are promising, but there seems to be a remaining bug with
unguided transcription likely related to saving context
* Limit the maximum length of audio input.
This existing VAD implementation only detects falling edges, which
means any gap in the users speaking is processed for transcription.
This simply establishes a constant maximum length depending on the type
of transcription. Uguided gets a generous 10 seconds and guided, 2.
While quick testing showed that commands are generally around a half a
second to a second, limiting commands to an even second resulted in
extreme degradation of quality. (Seemingly always the same output for a
given commandset)
* Unguided timestamp tracking, cleanup
Unguided transcriptions where not setup to allow for passing of
timestamp data forward, but have been corrected.
No_context is now always set to false. While conceptually desirable for
the quality of guided transcription, It was seemingly responsible for
prior command inputs ghosting in unguided transcription.
Save and Run are now tracked by command number instead of command text.
While command_text was provided for convenience, I wish to keep command
index authoritative. This gives greater consistency and potentially
allows for end users to rename or even translate the spoken versions of
these commands
* By default, maintain mode.
Previously, mode was reset to 0 unless otherwise set.
In addition to causing some edge cases, this was didn't mesh well with
the existing approach to visual mode.
With this change, initial tests indicate visual mode is functional.
* Add undo breaks before subtranscriptions
Subtranscriptions use undo as a hack to allow for partial responses to
be displayed. However, scripts don't cause an undo break mid execution
unless specifically instructed to. This meant that multiple
unguided transcriptions from a single session would cause a latter to
undo a former.
This is now fixed and undo should be reasonably usable as a command.
* Append instead of insert for new undo sequence
When entering and leavening insert mode with `i`, the cursor shifts one
column to the left. This is remedied by using append instead of insert
for setting these breaks in the undo sequence
`-` was also added to the pronunciation dictionary to be pronounced as
minus as it was causing a particularly high failure rate.
* Move undo sequence breaks to command execution
Previously, undo sequence breaks were triggered when there was a command
that caused a move to insert mode. This caused commands that changed
state (like delete or paste) to be bundled together with into the last
command that caused text to be entered.
* Fix repeat. Add space, carrot, dollar commands
Repeat (.) wasn't being tracked properly just like undo and is being
manually tracked now.
While efforts have been made to properly handle spaces, it was
particularly finicky to add a single space when one is needed. A
special 'space' command has been added to insert a single space and move
the cursor after it.
Carrot and Dollar commands have been added for start of line and end of
line respectively. These are both simple to implement, and just a
matter of defining a pronunciation.
* Return error on duplicate in commandset
Not every command in the commandset tokenizes to a single token.
Because of this, it's possible for that two commands could resolve to
the same single token after subsequent tokens are discarded.
This commit adds a simple check for duplicates when a commandset is
registered and returns an error if so.
Additional code will be required later on the vim side to actually
process this error.
* Add support for user-defined commands
This adds a user definable dictionary from spoken keys to strings or
funcrefs. All keys are added to the commandlist and when spoken, trigger
the corresponding function.
Like "save" and "run", these user commands are only available when the
command buffer is empty.
* Add readme, update cmake
* Add area commandset. Refactor spoken_dict
Area commands (inside word, around sentence...) have been given a
commandset as considered earlier.
Verbose definitions for spoken_dict entries now use dicts instead of
lists. This shortens the definition for most keys that require it and
scales better with the addition of further commandsets
* Add mark, jump. Fix change under visual.
Mark (m) and jump (') have been added.
When a visual selection was executed upon a command that initiated a
subtranscription (change) the area of the visual selection is not
properly tracked which causes the attempt to stream in partial response
to fail. This is solved by disabling partial transcriptions from being
streamed when a subtranscription is started while in visual mode.
* Accommodate ignorecase. Fix change.
From testing on older different versions of vim, the test for
distinguishing an 'R' replace all from an 'r' replace could fail if
ignorecase was set. The comparison has been changed to explicitly
require case matching
Change detection has been moved to the execution section as it was missing the
change+motion case.
* Support registers. Fix README typo
There's no logic to prevent doubled register entry, but the functional
result is equivalent to if the same key order was typed into vim.
A minor typo in the readme. I've mismemorized the mnemonic for 't' as 'to'
instead of till., but 'to' can't be used as it's a homophone with '2'.
While there was no mistake in the actual logic, it was misleading to use
'to' in the readme.
2023-08-27 18:35:06 +00:00
|
|
|
add_subdirectory(lsp)
|
2024-02-23 07:22:24 +00:00
|
|
|
if (LLAMA_SYCL)
|
|
|
|
|
add_subdirectory(sycl)
|
|
|
|
|
endif()
|
2022-10-22 10:07:59 +00:00
|
|
|
endif()
|
2023-12-14 13:58:26 +00:00
|
|
|
|
|
|
|
|
add_subdirectory(wchess)
|
