Skip to content
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.

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

New JSON encoder for results containing numpy types #598

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
24 changes: 21 additions & 3 deletions src/evaluate/saving.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,26 @@
import sys
from datetime import datetime
from pathlib import Path
import numpy as np

from datasets.utils.filelock import FileLock

from . import __version__


class NpEncoder(json.JSONEncoder):
"""Numpy aware JSON encoder."""

def default(self, o):
if isinstance(o, np.floating):
return float(o)
if isinstance(o, np.integer):
return int(o)
if isinstance(o, np.ndarray):
return o.tolist()
return super().default(o)


def save(path_or_file, **data):
"""
Saves results to a JSON file. Also saves system information such as current time, current commit
Expand Down Expand Up @@ -40,7 +54,7 @@ def save(path_or_file, **data):

with FileLock(str(file_path) + ".lock"):
with open(file_path, "w") as f:
json.dump(data, f)
json.dump(data, f, cls=NpEncoder)

# cleanup lock file
try:
Expand All @@ -65,9 +79,13 @@ def _setup_path(path_or_file, current_time):


def _git_commit_hash():
res = subprocess.run("git rev-parse --is-inside-work-tree".split(), cwd="./", stdout=subprocess.PIPE)
res = subprocess.run(
"git rev-parse --is-inside-work-tree".split(), cwd="./", stdout=subprocess.PIPE
)
if res.stdout.decode().strip() == "true":
res = subprocess.run("git rev-parse HEAD".split(), cwd=os.getcwd(), stdout=subprocess.PIPE)
res = subprocess.run(
"git rev-parse HEAD".split(), cwd=os.getcwd(), stdout=subprocess.PIPE
)
return res.stdout.decode().strip()
else:
return None