Skip to content

Commit 7345fbe

Browse files
committed
ci: fix windows workflow; don't run vulkan tests for now
vulkan/llvmpipe status: * sam: black image * birefnet: runs out of memory, also corrupts follow up tests * migan: passes * esrgan: very slow and broken image
1 parent d63c1d9 commit 7345fbe

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,35 @@ jobs:
6363
-D CMAKE_BUILD_RPATH="@loader_path"
6464
6565
- name: Build
66-
run: cmake --build build
66+
run: cmake --build build --config Release
6767

68-
- name: Test
68+
# tests fail with vulkan/llvmpipe (runs out of memory or just wrong results)
69+
# - name: Test Vulkan
70+
# if: matrix.os == 'ubuntu-22.04'
71+
# working-directory: ./build
72+
# run: |
73+
# export GGML_VK_VISIBLE_DEVICES=0
74+
# ctest --verbose
75+
76+
- name: Test CPU
77+
if: matrix.os != 'ubuntu-22.04'
6978
working-directory: ./build
70-
run: ctest --verbose
79+
run: ctest --verbose -C Release
7180

7281
- name: Install
73-
run: cmake --install build --prefix install
82+
run: cmake --install build --prefix install --config Release
7483

7584
- name: Package
7685
working-directory: ./build
7786
run: cpack
7887

7988
- name: Upload artifacts
89+
if: success() || failure()
8090
uses: actions/upload-artifact@v4
8191
with:
82-
name: visioncpp
92+
name: visioncpp-${{ matrix.os }}
8393
path: |
8494
./build/*.tar.gz
8595
./build/*.zip
96+
./tests/results/*.png
8697
compression-level: 0

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "depend/ggml"]
22
path = depend/ggml
3-
url = git@github.com:Acly/ggml.git
3+
url = https://github.com/Acly/ggml.git

tests/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ target_include_directories(test-models PRIVATE . ../src)
2323
target_compile_options(test-models PRIVATE ${VISP_WARNINGS})
2424
target_compile_definitions(test-models PRIVATE ${VISP_ASSERT} ${VISP_FMT_DEFS})
2525
target_link_libraries(test-models PRIVATE visioncpp ${VISP_FMT_LINK})
26-
if(VISP_VULKAN)
26+
if(VISP_VULKAN AND NOT VISP_CI)
2727
add_test(NAME models COMMAND test-models -v)
2828
else()
29+
# GPU tests currently don't pass on GitHub runners with Vulkan/llvmpipe
2930
add_test(NAME models COMMAND test-models -v --no-gpu)
3031
endif()
3132

tests/testing.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ int main(int argc, char** argv) {
3939

4040
auto run = [&](test_case const& test, char const* name, backend_type backend) {
4141
try {
42+
if (!filter.empty() && name != filter && test.name != filter) {
43+
return; // test not selected
44+
}
4245
if (verbose) {
4346
printf("%s", name);
4447
fflush(stdout);
@@ -78,13 +81,10 @@ int main(int argc, char** argv) {
7881
fixed_string<128> name;
7982

8083
for (auto& test : registry.tests) {
81-
if (!filter.empty() && test.name != filter) {
82-
continue;
83-
}
8484
if (test.is_backend_test) {
85-
run(test, format(name, "{}<cpu>", test.name), backend_type::cpu);
85+
run(test, format(name, "{}[cpu]", test.name), backend_type::cpu);
8686
if (!exclude_gpu) {
87-
run(test, format(name, "{}<gpu>", test.name), backend_type::gpu);
87+
run(test, format(name, "{}[gpu]", test.name), backend_type::gpu);
8888
}
8989
} else {
9090
run(test, test.name, backend_type::cpu);

0 commit comments

Comments
 (0)