Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ def validate(self):
)

def requirements(self):
self.requires("mbits-mstch/1.0.4")
self.requires("metal-cpp/15.2")
self.requires("rapidhash/3.0")
self.requires("jsoncons/1.3.0")
self.requires("mbits-mstch/[>=1.0.0 <2.0.0]")
self.requires("metal-cpp/[>=15.2]")
self.requires("rapidhash/[>=3.0 <4.0]")
self.requires("jsoncons/[>1.3.0 <1.7.0]")
self.requires("pcre2/[>=10.30 <11.0]")
self.requires("simdutf/9.0.0")
self.requires("simdutf/[>=8.2.0 <9.0.0]")

if self.options.build_executable:
self.requires("argparse/[>=3.2 <4.0.0]")
self.requires("argparse/[>=3.0 <4.0.0]")
self.requires("keychain/[>=1.3.0 <2.0.0]")
self.requires("toml11/[>=4.0.0 <5.0.0]")

Expand All @@ -82,7 +82,7 @@ def requirements(self):

def build_requirements(self):
self.tool_requires("cmake/[>=3.31.0]")
self.tool_requires("ninja/[~1.13.2]")
self.tool_requires("ninja/[>=1.10.2]")
self.test_requires("catch2/[>=3.7.0 <4.0.0]")

def generate(self):
Expand Down
5 changes: 4 additions & 1 deletion src/gemma.cc
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ gemma3_options_serializer::save(std::ostream& os, const nn::gemma3_options& opti
.float_format(jsoncons::float_chars_format::general)
.precision(os.precision());

jsoncons::encode_json<options_type>(hf_options, os, encode_options);
auto result = jsoncons::try_encode_json<options_type>(hf_options, os, encode_options);
if (!result) {
throw jsoncons::ser_error(result.error());
}
}


Expand Down
5 changes: 4 additions & 1 deletion src/llama.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ llama3_options_serializer::save(std::ostream& os, const nn::llama3_options& opti
.float_format(jsoncons::float_chars_format::general)
.precision(os.precision());

jsoncons::encode_json<options_type>(hf_options, os, encode_options);
auto result = jsoncons::try_encode_json<options_type>(hf_options, os, encode_options);
if (!result) {
throw jsoncons::ser_error(result.error());
}
}


Expand Down
5 changes: 4 additions & 1 deletion src/safetensor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,10 @@ safetensor_document::save(const std::filesystem::path& p)
}

std::string header_json;
jsoncons::encode_json(header, header_json);
auto result = jsoncons::try_encode_json(header, header_json);
if (!result) {
throw jsoncons::ser_error(result.error());
}

auto header_size = header_json.size();

Expand Down
4 changes: 3 additions & 1 deletion test/test_safetensor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ TEST_CASE("Test sharded document", "[safetensor]")
};

std::ofstream index_file(index_path);
jsoncons::encode_json<safetensor_index>(index, index_file);
auto result = jsoncons::try_encode_json<safetensor_index>(index, index_file);
REQUIRE(result.has_value());

index_file.close();

auto doc = sharded_safetensor_document::open(index_path);
Expand Down
Loading