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

Jump to bottom

server : fix building and simplify lib deps on Windows #1772

Merged
merged 2 commits into from
Jan 15, 2024
Merged

server : fix building and simplify lib deps on Windows #1772

merged 2 commits into from
Jan 15, 2024

Conversation

przemoc
Copy link
Contributor

@przemoc przemoc commented Jan 15, 2024

No description provided.

@przemoc
make : fix server example building on MSYS2 environments (Windows)
346ea93 
It was not working since commit eff3570
when server was introduced.
@przemoc
cmake : simplify server example lib deps on Windows
5036229 
server uses httplib::Server, not httplib::SSLServer, so there is no need
to mention cryptographic libraries in target_link_libraries.
Winsock (ws2_32) suffices here.

Also use plain library names like we use in other places.
@przemoc
Copy link
Contributor Author

przemoc commented Jan 15, 2024

This change is similar to sister change in llama.cpp from 0.5y ago, but related to different example:

@ggerganov ggerganov merged commit f5f159c into ggerganov:master Jan 15, 2024
39 checks passed
@przemoc
Copy link
Contributor Author

przemoc commented Jan 15, 2024

Current freeBSD-latest failure of commit f5f159c in master branch:
https://github.com/ggerganov/whisper.cpp/actions/runs/7529770278/job/20494705057

  Mounting disk
  Finished partitioning on disk2
  /usr/bin/sudo umount /Volumes/RES
  /usr/bin/hdiutil detach /dev/disk2
  hdiutil: couldn't eject "disk2" - Resource busy

seems to be some temporary environment/setup issue and not related in any way to changes introduced via this PR.

@przemoc przemoc deleted the fix-server-build-on-msys2 branch January 15, 2024 14:12
@ggerganov
Copy link
Owner

Yes, this CI job fails quite often in this way - nothing we can do

bygreencn added a commit to bygreencn/whisper.cpp that referenced this pull request Jan 16, 2024
@bygreencn
Merge remote-tracking branch 'ggerganov/master'
eda6990 
* ggerganov/master: (86 commits)
  server : fix building and simplify lib deps on Windows (ggerganov#1772)
  talk-llama : sync llama.cpp
  talk-llama : llama.cpp
  sync : ggml
  metal : correctly set SIMD support flags on iOS (llama/4923)
  2-bit quantizations (llama/4897)
  scripts : sync-ggml-am.sh add option to skip commits
  talk-llama : sync llama.cpp
  sync : ggml
  examples : adapt to metal API
  ggml: cache sin/cos for RoPE (llama/4908)
  metal : remove old API (llama/4919)
  metal : disable log for loaded kernels (llama/4794)
  gguf : fix potential infinite for-loop (llama/4600)
  metal : refactor kernel loading code (llama/4794)
  CUDA: faster q8_0 -> f16 dequantization (llama/4895)
  talk-llama : add optional CLI arg to set the bot name (ggerganov#1764)
  examples : add python example for transcription (ggerganov#1744)
  whisper : load the model into multiple buffers of max size 1GB (ggerganov#1763)
  talk-llama : sync llama.cpp
  ...
@przemoc przemoc mentioned this pull request Jan 18, 2024
Closed
jiahansu pushed a commit to WiseSync/whisper.cpp that referenced this pull request Apr 17, 2024
@przemoc @jiahansu
server : fix building and simplify lib deps on Windows (ggerganov#1772)
830eb4e 
* make : fix server example building on MSYS2 environments (Windows)

It was not working since commit eff3570
when server was introduced.

* cmake : simplify server example lib deps on Windows

server uses httplib::Server, not httplib::SSLServer, so there is no need
to mention cryptographic libraries in target_link_libraries.
Winsock (ws2_32) suffices here.

Also use plain library names like we use in other places.
viktor-silakov pushed a commit to viktor-silakov/whisper_node_mic.cpp that referenced this pull request May 11, 2024
@przemoc
server : fix building and simplify lib deps on Windows (ggerganov#1772)
25a6a60 
* make : fix server example building on MSYS2 environments (Windows)

It was not working since commit eff3570
when server was introduced.

* cmake : simplify server example lib deps on Windows

server uses httplib::Server, not httplib::SSLServer, so there is no need
to mention cryptographic libraries in target_link_libraries.
Winsock (ws2_32) suffices here.

Also use plain library names like we use in other places.
iThalay pushed a commit to iThalay/whisper.cpp that referenced this pull request Sep 23, 2024
@przemoc @iThalay
server : fix building and simplify lib deps on Windows (ggerganov#1772)
15aefe8 
* make : fix server example building on MSYS2 environments (Windows)

It was not working since commit eff3570
when server was introduced.

* cmake : simplify server example lib deps on Windows

server uses httplib::Server, not httplib::SSLServer, so there is no need
to mention cryptographic libraries in target_link_libraries.
Winsock (ws2_32) suffices here.

Also use plain library names like we use in other places.
iThalay pushed a commit to iThalay/whisper.cpp that referenced this pull request Sep 23, 2024
@przemoc @iThalay
server : fix building and simplify lib deps on Windows (ggerganov#1772)
3469428 
* make : fix server example building on MSYS2 environments (Windows)

It was not working since commit eff3570
when server was introduced.

* cmake : simplify server example lib deps on Windows

server uses httplib::Server, not httplib::SSLServer, so there is no need
to mention cryptographic libraries in target_link_libraries.
Winsock (ws2_32) suffices here.

Also use plain library names like we use in other places.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ggerganov ggerganov ggerganov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@przemoc @ggerganov