Skip to content

Qwen3.8-Flash-Next on any consumer hardware: one-click install for Windows / Linux. Strata inference engine, OpenAI/Anthropic API on localhost, optional image input.

C++

Fix #3358: the trellis CPU tests skip, not fail, on a ggml without trellis types

Niko1221a5c7abe0746b
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49282a0d8..96ebc4d66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2088,14 +2088,14 @@ if(STRATA_BUILD_TESTS)
add_executable(native_hadamard_test src/kernels/cpu/native_hadamard_test.cpp)
target_link_libraries(native_hadamard_test PRIVATE strata_kernels_cpu strata_artifact)
add_test(NAME native_hadamard_test COMMAND native_hadamard_test)
- set_tests_properties(native_hadamard_test PROPERTIES TIMEOUT 300)
+ set_tests_properties(native_hadamard_test PROPERTIES TIMEOUT 300 SKIP_RETURN_CODE 77)
# the CPU trellis kernels (tq_cpu.hpp): AVX2 / AVX-512 vs the scalar kernel bit for bit, vs ggml-cpu's vec_dot
# and to_float, plain and with the Hadamard rotation; `tq_cpu_parity --bench` is the micro-benchmark
add_executable(tq_cpu_parity src/kernels/cpu/tq_cpu_parity.cpp)
target_link_libraries(tq_cpu_parity PRIVATE strata_kernels_cpu)
add_test(NAME tq_cpu_parity COMMAND tq_cpu_parity)
add_test(NAME tq_cpu_parity_avx2 COMMAND ${CMAKE_COMMAND} -E env STRATA_FORCE_AVX2=1 $<TARGET_FILE:tq_cpu_parity>)
- set_tests_properties(tq_cpu_parity tq_cpu_parity_avx2 PROPERTIES TIMEOUT 300)
+ set_tests_properties(tq_cpu_parity tq_cpu_parity_avx2 PROPERTIES TIMEOUT 300 SKIP_RETURN_CODE 77)
endif()
add_executable(expert_parity src/kernels/cpu/expert_parity.cpp)
diff --git a/src/kernels/cpu/native_hadamard_test.cpp b/src/kernels/cpu/native_hadamard_test.cpp
index de5b923f1..2b8012e57 100644
--- a/src/kernels/cpu/native_hadamard_test.cpp
+++ b/src/kernels/cpu/native_hadamard_test.cpp
@@ -303,7 +303,7 @@ int main(int argc, char** argv) {
return rc;
}
// ggml type ids of the agention fork: 144 TQ2_T, 145 TQK6, 146 TQK7
- if (GGML_TYPE_COUNT <= 146) { std::fprintf(stderr, "this ggml has no trellis types (build with STRATA_GGML_DIR = the agention fork)\n"); return 1; }
+ if (GGML_TYPE_COUNT <= 146) { std::fprintf(stderr, "this ggml has no trellis types (build with STRATA_GGML_DIR = the agention fork): skipped\n"); return 77; } // 77: ctest SKIP_RETURN_CODE (#3358)
rc |= synthetic(8, 8); // Q8_0: the fold's convention, against the unrotated float expert
rc |= synthetic(145, 146); // Gyro-S
rc |= synthetic(144, 144); // Gyro-M
diff --git a/src/kernels/cpu/tq_cpu_parity.cpp b/src/kernels/cpu/tq_cpu_parity.cpp
index 2f860ee66..1c9fd0736 100644
--- a/src/kernels/cpu/tq_cpu_parity.cpp
+++ b/src/kernels/cpu/tq_cpu_parity.cpp
@@ -534,8 +534,8 @@ int bench(bool quick, const std::string& only) {
int main(int argc, char** argv) {
ggml_cpu_init();
if (GGML_TYPE_COUNT <= 146) {
- std::fprintf(stderr, "this ggml has no trellis types (build with STRATA_GGML_DIR = the agention llama.cpp fork)\n");
- return 1;
+ std::fprintf(stderr, "this ggml has no trellis types (build with STRATA_GGML_DIR = the agention llama.cpp fork): skipped\n");
+ return 77; // ctest SKIP_RETURN_CODE: a plain ggml is not a failure (#3358)
}
if (argc >= 2 && std::strcmp(argv[1], "--bench") == 0) { // --bench [--quick] [--only <kernel name part>]
bool quick = false;