mirror of
https://github.com/seekrs/MacroLibX.git
synced 2026-03-03 20:46:37 +00:00
fix && ci (meson): trying to fix Vulkan issue in renderCore.cpp and add some windows test based from meson wrapdb CI
Signed-off-by: 0verLighT <alexandre@0verlight.com>
This commit is contained in:
70
.github/workflows/windows_meson.yml
vendored
70
.github/workflows/windows_meson.yml
vendored
@@ -11,10 +11,11 @@ on:
|
|||||||
- 'README.md'
|
- 'README.md'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
VisualStudio:
|
||||||
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
platform: ['x64', 'x86']
|
platform: ['x64', 'x86']
|
||||||
steps:
|
steps:
|
||||||
@@ -29,13 +30,80 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
architecture: 'x86'
|
architecture: 'x86'
|
||||||
python-version: '3.12'
|
python-version: '3.12'
|
||||||
|
|
||||||
- name: Install Meson & Ninja
|
- name: Install Meson & Ninja
|
||||||
run: |
|
run: |
|
||||||
python -m pip install meson ninja
|
python -m pip install meson ninja
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
with:
|
with:
|
||||||
arch: ${{matrix.platform}}
|
arch: ${{matrix.platform}}
|
||||||
|
|
||||||
- name: Compile mlx
|
- name: Compile mlx
|
||||||
|
run: |
|
||||||
|
meson setup builddir
|
||||||
|
meson compile -C builddir
|
||||||
|
|
||||||
|
VisualStudio-clang-cl:
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
env:
|
||||||
|
CC: clang-cl
|
||||||
|
CXX: clang-cl
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v5
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Install Meson & Ninja
|
||||||
|
run: |
|
||||||
|
python -m pip install meson ninja
|
||||||
|
|
||||||
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
|
||||||
|
- name: Compile mlx
|
||||||
|
run: |
|
||||||
|
meson setup builddir
|
||||||
|
meson compile -C builddir
|
||||||
|
|
||||||
|
MSYS2:
|
||||||
|
if: "!contains(github.event.head_commit.message, 'ci skip')"
|
||||||
|
runs-on: windows-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform: ['UCRT64', 'CLANG64']
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v5
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- uses: msys2/setup-msys2@v2
|
||||||
|
with:
|
||||||
|
msystem: ${{matrix.platform}}
|
||||||
|
install: >-
|
||||||
|
bison
|
||||||
|
dos2unix
|
||||||
|
flex
|
||||||
|
git
|
||||||
|
pacboy: >-
|
||||||
|
cc:p
|
||||||
|
cmake:p
|
||||||
|
ninja:p
|
||||||
|
pkgconf:p
|
||||||
|
python-certifi:p
|
||||||
|
python-pip:p
|
||||||
|
# Make sure Python is updated to >=3.11 (fix https://github.com/msys2/MINGW-packages/issues/17415).
|
||||||
|
update: true
|
||||||
|
|
||||||
|
- name: Install Meson
|
||||||
|
shell: msys2 {0}
|
||||||
|
run: |
|
||||||
|
python -m pip install meson
|
||||||
|
|
||||||
|
- name: Compile mlx
|
||||||
|
shell: msys2 {0}
|
||||||
run: |
|
run: |
|
||||||
meson setup builddir
|
meson setup builddir
|
||||||
meson compile -C builddir
|
meson compile -C builddir
|
||||||
@@ -55,17 +55,17 @@ namespace mlx
|
|||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void* VulkanAllocationFunction(void*, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
void* VKAPI_PTR VulkanAllocationFunction(void*, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
||||||
{
|
{
|
||||||
return MemManager::AlignedMalloc(alignment, size);
|
return MemManager::AlignedMalloc(alignment, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void* VulkanReallocationFunction(void*, void* ptr, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
void* VKAPI_PTR VulkanReallocationFunction(void*, void* ptr, std::size_t size, std::size_t alignment, VkSystemAllocationScope)
|
||||||
{
|
{
|
||||||
return MemManager::AlignedRealloc(ptr, alignment, size);
|
return MemManager::AlignedRealloc(ptr, alignment, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VulkanFreeFunction(void*, void* ptr)
|
void VKAPI_PTR VulkanFreeFunction(void*, void* ptr)
|
||||||
{
|
{
|
||||||
MemManager::Free(ptr);
|
MemManager::Free(ptr);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user