address review comments

Author: Green-Sky

ggml/src/gguf.cpp

@@ -1310,45 +1310,6 @@ struct gguf_writer_buf final : public gguf_writer_base {
     }
 };
 
-template <typename Writer>
-static void gguf_write_out(const struct gguf_context * ctx, Writer & gw, bool only_meta) {
-    const int64_t n_kv      = gguf_get_n_kv(ctx);
-    const int64_t n_tensors = gguf_get_n_tensors(ctx);
-
-    // write header
-    gw.write(GGUF_MAGIC[0]);
-    gw.write(GGUF_MAGIC[1]);
-    gw.write(GGUF_MAGIC[2]);
-    gw.write(GGUF_MAGIC[3]);
-    gw.write(ctx->version);
-    gw.write(n_tensors);
-    gw.write(n_kv);
-
-    // write key-value pairs
-    for (int64_t i = 0; i < n_kv; ++i) {
-        gw.write(ctx->kv[i]);
-    }
-
-    // write tensor info
-    for (int64_t i = 0; i < n_tensors; ++i) {
-        gw.write_tensor_meta(ctx->info[i]);
-    }
-
-    // we require the data section to be aligned
-    gw.pad(ctx->alignment);
-
-    if (only_meta) {
-        return;
-    }
-
-    const size_t offset_data = gw.written_bytes;
-
-    // write tensor data
-    for (int64_t i = 0; i < n_tensors; ++i) {
-        gw.write_tensor_data(ctx->info[i], offset_data, ctx->alignment);
-    }
-}
-
 // file based writer
 struct gguf_writer_file final : public gguf_writer_base {
     FILE * file;
@@ -1359,18 +1320,21 @@ struct gguf_writer_file final : public gguf_writer_base {
     using gguf_writer_base::write;
 
     void write(const int8_t val) override {
+        if (!ok) return;
         const auto ret = fputc(val, file);
         written_bytes++;
         ok = ok && ret == val;
     }
 
     void write(const std::vector<int8_t> & val) override {
+        if (!ok) return;
         const auto ret = fwrite(val.data(), 1, val.size(), file);
         written_bytes += val.size();
         ok = ok && ret == val.size();
     }
 
     void write_tensor_data(const struct gguf_tensor_info & info, const size_t offset_data, const size_t alignment) override {
+        if (!ok) return;
         GGML_ASSERT(written_bytes - offset_data == info.offset);
 
         GGML_ASSERT(ggml_is_contiguous(&info.t));
@@ -1389,6 +1353,45 @@ struct gguf_writer_file final : public gguf_writer_base {
     }
 };
 
+template <typename writer_t>
+static void gguf_write_out(const struct gguf_context * ctx, writer_t & gw, bool only_meta) {
+    const int64_t n_kv      = gguf_get_n_kv(ctx);
+    const int64_t n_tensors = gguf_get_n_tensors(ctx);
+
+    // write header
+    gw.write(GGUF_MAGIC[0]);
+    gw.write(GGUF_MAGIC[1]);
+    gw.write(GGUF_MAGIC[2]);
+    gw.write(GGUF_MAGIC[3]);
+    gw.write(ctx->version);
+    gw.write(n_tensors);
+    gw.write(n_kv);
+
+    // write key-value pairs
+    for (int64_t i = 0; i < n_kv; ++i) {
+        gw.write(ctx->kv[i]);
+    }
+
+    // write tensor info
+    for (int64_t i = 0; i < n_tensors; ++i) {
+        gw.write_tensor_meta(ctx->info[i]);
+    }
+
+    // we require the data section to be aligned
+    gw.pad(ctx->alignment);
+
+    if (only_meta) {
+        return;
+    }
+
+    const size_t offset_data = gw.written_bytes;
+
+    // write tensor data
+    for (int64_t i = 0; i < n_tensors; ++i) {
+        gw.write_tensor_data(ctx->info[i], offset_data, ctx->alignment);
+    }
+}
+
 void gguf_write_to_buf(const struct gguf_context * ctx, std::vector<int8_t> & buf, bool only_meta) {
     gguf_writer_buf gw(buf);
     gguf_write_out(ctx, gw, only_meta);