Skip to content

feat: don't force user to jason dependency if Elixir JSON available #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: don't force user to jason dependency if Elixir JSON available #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions lib/safetensors.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,27 @@ defmodule Safetensors do
:ok
end

cond do
Code.ensure_loaded?(JSON) ->
@json_module JSON

Code.ensure_loaded?(Jason) ->
@json_module Jason

true ->
raise "You need to include jason package in your dependencies to make safetensors work with your current Elixir (#{System.version()}) or upgrade to Elixir 1.18+"
end

defp tensor_header_entry(tensor_name, tensor, offset) do
end_offset = offset + tensor_byte_size(tensor)

header_entry = {
tensor_name,
Jason.OrderedObject.new(
%{
dtype: tensor |> Nx.type() |> type_to_dtype(),
shape: tensor |> Nx.shape() |> Tuple.to_list(),
data_offsets: [offset, end_offset]
)
}
}

{header_entry, end_offset}
Expand All @@ -87,8 +98,8 @@ defmodule Safetensors do
defp header_binary(header_entries) do
header_json =
header_entries
|> Jason.OrderedObject.new()
|> Jason.encode!()
|> Map.new()
|> @json_module.encode!()

[<<byte_size(header_json)::unsigned-64-integer-little>>, header_json]
end
Expand Down Expand Up @@ -212,7 +223,7 @@ defmodule Safetensors do
defp decode_header!(header_json) do
{_metadata, header} =
header_json
|> Jason.decode!()
|> @json_module.decode!()
|> Map.pop(@header_metadata_key)

header
Expand Down
6 changes: 5 additions & 1 deletion mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ defmodule Safetensors.MixProject do

defp deps do
[
{:jason, "~> 1.4"},
{:nx, "~> 0.5"},

# Optional
{:jason, "~> 1.4", optional: true},

# Dev
{:ex_doc, "~> 0.37", only: :dev, runtime: false}
]
end
Expand Down
Loading