Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Fix visionOS build and add CI #12415

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

Merged
merged 3 commits into from
Mar 19, 2025
Merged

Conversation

guusw
Copy link
Contributor

@guusw guusw commented Mar 17, 2025

Trying to consolildate #11065 and #11019 to hopefully get it merged.
In short, the new xrOS sdk defines the folowing in types.h:

#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
#include <sys/_types/_u_char.h>
#include <sys/_types/_u_short.h>
#include <sys/_types/_u_int.h>
#ifndef _U_LONG
typedef unsigned long           u_long;
#define _U_LONG
#endif
typedef unsigned short          ushort;         /* Sys V compatibility */
#ifndef __DARWIN_UINT
typedef unsigned int            uint;           /* Sys V compatibility */
#define __DARWIN_UINT
#endif
#endif

So I added _DARWIN_C_SOURCE for the visionOS build which seems to work, alternative would be to include _u_int etc in every file but that seems like a less viable solution. I don't think there's any reason to not have _DARWIN_C_SOURCE defined, I have only added the define for visionOS anyway since it seems to only be a problem with those SDK headers

@github-actions github-actions bot added devops improvements to build systems and github actions ggml changes relating to the ggml tensor library for machine learning labels Mar 17, 2025
Copy link
Member

@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.

Seems like a good solution - let's merge if the CI is green.

sinkingsugar and others added 2 commits March 19, 2025 13:52
Add a new GitHub Actions workflow for building on visionOS with CMake and Xcode.
@guusw
Copy link
Contributor Author

guusw commented Mar 19, 2025

Seems there was already a previous attempted fix using defines, removed those. Now CI is green 😄

@ggerganov ggerganov requested a review from danbev March 19, 2025 09:23
@danbev danbev merged commit 0fd8487 into ggml-org:master Mar 19, 2025
48 checks passed
@danbev
Copy link
Collaborator

danbev commented Mar 19, 2025

Sorry I forgot to add a module to the commit message 😞

ggerganov added a commit to ggml-org/whisper.cpp that referenced this pull request Mar 27, 2025
ggerganov added a commit to ggml-org/whisper.cpp that referenced this pull request Mar 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
devops improvements to build systems and github actions ggml changes relating to the ggml tensor library for machine learning
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants
Morty Proxy This is a proxified and sanitized view of the page, visit original site.