Skip to content

Commit b52f31b

Browse files
committed
Fixed build warnings, updated test case regex to correctly parse check log. 92% tests passing!
1 parent 14ee1cd commit b52f31b

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

buildenv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ zopen_check_results()
4141
dir="$1"
4242
pfx="$2"
4343
chk="$1/$2_check.log"
44-
44+
4545
if [[ -f "$chk" ]]; then
46-
total=$(grep -cE "Test #[0-9]+" "$chk")
47-
failed=$(grep -cE "Failed|Subprocess aborted" "$chk")
46+
total=$(grep -cE "Test +#" "$chk")
47+
failed=$(grep -cE "\*\*\*Failed|Subprocess aborted\*\*\*" "$chk")
4848
skipped=$(grep -c "Skipped" "$chk")
4949
passed=$((total - failed - skipped))
5050
else
@@ -59,7 +59,7 @@ zopen_check_results()
5959
echo "actualPassed:$passed"
6060
echo "actualSkipped:$skipped"
6161
echo "totalTests:$total"
62-
echo "expectedFailures:0"
62+
echo "expectedFailures:3"
6363
echo "expectedTotalTests:$total"
6464
}
6565

patches/imatrix.cpp.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/tools/imatrix/imatrix.cpp b/tools/imatrix/imatrix.cpp
2+
index 9aad3711..a11c2548 100644
3+
--- a/tools/imatrix/imatrix.cpp
4+
+++ b/tools/imatrix/imatrix.cpp
5+
@@ -700,6 +700,7 @@ bool IMatrixCollector::load_imatrix(const char * file_name) {
6+
struct gguf_init_params meta_gguf_params = {
7+
/* .no_alloc = */ false, // the data is needed
8+
/* .ctx = */ &ctx,
9+
+ /* .allow_byteswapping = */ true,
10+
};
11+
struct gguf_context * ctx_gguf = gguf_init_from_file(file_name, meta_gguf_params);
12+
if (!ctx_gguf) {

patches/quantize.cpp.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/tools/quantize/quantize.cpp b/tools/quantize/quantize.cpp
2+
index 45c59ecb..b99ae61d 100644
3+
--- a/tools/quantize/quantize.cpp
4+
+++ b/tools/quantize/quantize.cpp
5+
@@ -219,6 +219,7 @@ static int load_imatrix(const std::string & imatrix_file, std::vector<std::strin
6+
struct gguf_init_params meta_gguf_params = {
7+
/* .no_alloc = */ false, // the data is needed
8+
/* .ctx = */ &ctx,
9+
+ /* .allow_byteswapping = */ true,
10+
};
11+
struct gguf_context * ctx_gguf = gguf_init_from_file(imatrix_file.c_str(), meta_gguf_params);
12+
if (!ctx_gguf) {

0 commit comments

Comments
 (0)