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

sycl : Re-add erroneously removed -fsycl from GGML_EXTRA_LIBS #8667

Merged
merged 1 commit into from
Jul 24, 2024

Conversation

joeatodd
Copy link
Collaborator

Fix for #8665 introduced in #8644.

@joeatodd
Copy link
Collaborator Author

@mudler this fixed the issue for me locally - can you confirm?

@airMeng - this is a small hotfix for a bug introduced by my previous PR.

Copy link
Collaborator

@airMeng airMeng left a comment

Choose a reason for hiding this comment

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

It is a reminder that we shall check whether build shared libs both :)

@airMeng
Copy link
Collaborator

airMeng commented Jul 24, 2024

cmake -B build -DGGML_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DLLAMA_CURL=ON ${OPT_SYCL_F16} && \

can you update the scripts here so we can avoid the similar issues?

@mudler
Copy link
Contributor

mudler commented Jul 24, 2024

@mudler this fixed the issue for me locally - can you confirm?

@airMeng - this is a small hotfix for a bug introduced by my previous PR.

Seems to work so far! can't give a full ack as now I have another issue caused by another recent change, so the build fails in another spot 😓

If this gets merged before I fix the other issues I'll be checking this out and open up follow-ups if having still problems 👍

@mudler
Copy link
Contributor

mudler commented Jul 24, 2024

Thank you for the quick fix @joeatodd !

@joeatodd
Copy link
Collaborator Author

It is a reminder that we shall check whether build shared libs both :)

I agree - need to build statically in CI.

can you update the scripts here so we can avoid the similar issues?

I'm happy to make a change to catch issues like this. I see a couple of options:

  1. Add an ARG which controls -DBUILD_SHARED_LIBS to either llama-server-intel.Dockerfile or llama-cli-intel.Dockerfile, and build that docker image twice as part of the CI.
  2. Make either llama-server-intel.Dockerfile or llama-cli-intel.Dockerfile always build static libs.

I imagine option 1. might be unpopular since it implies extra CI resources. Option 2 implies no extra CI jobs, but possible confusion when one fails and the other doesn't. Perhaps a comment in the Dockerfile to draw attention to the static/shared build option?

@airMeng what do you think?

Copy link
Contributor

@mudler mudler left a comment

Choose a reason for hiding this comment

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

I can confirm now that's fixing the issue on my side 👍 Thanks @joeatodd !

@joeatodd
Copy link
Collaborator Author

@airMeng I'll merge this for now since it's a hotfix, and I can raise a separate PR for testing static builds once we've agreed the best approach.

@joeatodd joeatodd merged commit 79167d9 into ggerganov:master Jul 24, 2024
53 checks passed
@airMeng
Copy link
Collaborator

airMeng commented Jul 24, 2024

It is a reminder that we shall check whether build shared libs both :)

I agree - need to build statically in CI.

can you update the scripts here so we can avoid the similar issues?

I'm happy to make a change to catch issues like this. I see a couple of options:

  1. Add an ARG which controls -DBUILD_SHARED_LIBS to either llama-server-intel.Dockerfile or llama-cli-intel.Dockerfile, and build that docker image twice as part of the CI.
  2. Make either llama-server-intel.Dockerfile or llama-cli-intel.Dockerfile always build static libs.

I imagine option 1. might be unpopular since it implies extra CI resources. Option 2 implies no extra CI jobs, but possible confusion when one fails and the other doesn't. Perhaps a comment in the Dockerfile to draw attention to the static/shared build option?

@airMeng what do you think?

I prefer option2. llama-server-intel.Dockerfile for shared lib and llama-cli-intel.Dockerfile for static. And some logging might be helpful.

@joeatodd joeatodd deleted the jtodd/fix-cmake branch July 24, 2024 12:53
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jul 27, 2024
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.

3 participants