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.

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

make : fix embdinput library and server examples building on MSYS2 #2235

Merged
merged 2 commits into from
Jul 21, 2023

Conversation

przemoc
Copy link
Contributor

@przemoc przemoc commented Jul 15, 2023

No description provided.

@przemoc
Copy link
Contributor Author

przemoc commented Jul 16, 2023

BTW I'm not familiar with GitHub Actions, but maybe MSYS2 could be relatively easily added to CI? I mean UCRT64 (default since 2022-10-29, previously it was MINGW64 relying on old msvcrt.dll) and CLANG64 (it's good to not rely on gcc only) environments specifically.

https://github.com/msys2/setup-msys2 may be potentially helpful to achieve that.

@przemoc
Copy link
Contributor Author

przemoc commented Jul 16, 2023

( rm -rf build && mkdir build && cd build && cmake .. && cmake --build . --config Release ) atm fails in MSYS2. It looks like lack of linking ws2_32 that has been fixed for Makefile in this PR.

@przemoc
Copy link
Contributor Author

przemoc commented Jul 16, 2023

Seems to be building without errors now.

$ time ( rm -rf build && mkdir build && cd build && cmake .. && cmake --build . --config Release )
-- Building for: Ninja
-- The C compiler identification is GNU 13.1.0
-- The CXX compiler identification is GNU 13.1.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: C:/msys64/ucrt64/bin/cc.exe - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: C:/msys64/ucrt64/bin/c++.exe - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Found Git: C:/msys64/usr/bin/git.exe (found version "2.41.0")
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success
-- Found Threads: TRUE
-- CMAKE_SYSTEM_PROCESSOR: AMD64
-- x86 detected
-- Configuring done (1.8s)
-- Generating done (0.1s)
-- Build files have been written to: C:/msys64/home/przemoc/git/github.com/ggerganov/llama.cpp/build
[1/47] Generating build details from Git
-- Found Git: C:/msys64/usr/bin/git.exe (found version "2.41.0")
...
[45/47] Linking CXX executable bin\embd-input-test.exe
[46/47] Building CXX object examples/server/CMakeFiles/server.dir/server.cpp.obj
[47/47] Linking CXX executable bin\server.exe

real    0m26.451s
user    0m0.000s
sys     0m0.015s

Copy link
Owner

@ggerganov ggerganov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW I'm not familiar with GitHub Actions, but maybe MSYS2 could be relatively easily added to CI?

You, I believe it is relatively easy to add

@ggerganov ggerganov merged commit 9cf022a into ggerganov:master Jul 21, 2023
@przemoc przemoc deleted the fix-make-on-msys2 branch July 21, 2023 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants