Merge pull request #157 from faster-cpython/use-ujson

Use ujson

Author: mdboom

Diff for: bench_runner/hpt.py

@@ -23,13 +23,13 @@
 
 import io
 import functools
-import json
 from pathlib import Path
 from typing import Dict, Optional, Tuple
 
 
 import numpy as np
 from numpy.typing import NDArray
+import ujson
 
 
 ACC_MAXSU = 2
@@ -39,7 +39,7 @@ def load_from_json(
     json_path: Path,
 ) -> Dict[str, NDArray[np.float64]]:
     with open(json_path) as fd:
-        content = json.load(fd)
+        content = ujson.load(fd)
 
     return load_data(content)
 

Diff for: bench_runner/plot.py

@@ -3,7 +3,6 @@
 
 import argparse
 import datetime
-import json
 from operator import attrgetter
 from pathlib import Path
 import re
@@ -13,6 +12,7 @@
 from matplotlib import pyplot as plt
 import matplotlib
 import numpy as np
+import ujson
 
 
 matplotlib.use("agg")
@@ -231,7 +231,7 @@ def get_comparison_value(ref, r, base):
     data_cache = output_filename.with_suffix(".json")
     if data_cache.is_file():
         with open(data_cache) as fd:
-            data = json.load(fd)
+            data = ujson.load(fd)
     else:
         data = {}
 
@@ -317,7 +317,7 @@ def get_comparison_value(ref, r, base):
     plt.close()
 
     with open(data_cache, "w") as fd:
-        json.dump(data, fd, indent=2)
+        ujson.dump(data, fd, indent=2)
 
 
 def flag_effect_plot(
@@ -348,7 +348,7 @@ def get_comparison_value(ref, r):
     data_cache = output_filename.with_suffix(".json")
     if data_cache.is_file():
         with open(data_cache) as fd:
-            data = json.load(fd)
+            data = ujson.load(fd)
     else:
         data = {}
 
@@ -415,7 +415,7 @@ def get_comparison_value(ref, r):
     plt.close()
 
     with open(data_cache, "w") as fd:
-        json.dump(data, fd, indent=2)
+        ujson.dump(data, fd, indent=2)
 
 
 if __name__ == "__main__":

Diff for: bench_runner/result.py

@@ -4,7 +4,6 @@
 
 from collections import defaultdict
 import functools
-import json
 from operator import itemgetter
 from pathlib import Path
 import re
@@ -17,6 +16,7 @@
 import numpy as np
 from packaging import version
 import pyperf
+import ujson
 
 
 from . import git
@@ -538,12 +538,12 @@ def contents(self) -> dict[str, Any]:
         if hasattr(self, "_full_contents"):
             return self._full_contents
 
-        with open(self.filename, "rb") as fd:
-            self._full_contents = json.load(fd)
-
         if hasattr(self, "_fast_contents"):
             del self._fast_contents
 
+        with open(self.filename, "rb") as fd:
+            self._full_contents = ujson.load(fd)
+
         return self._full_contents
 
     @property

Diff for: bench_runner/scripts/remove_benchmark.py

@@ -2,10 +2,12 @@
 
 
 import argparse
-import json
 from pathlib import Path
 
 
+import ujson
+
+
 from bench_runner import result
 from bench_runner.scripts import generate_results
 from bench_runner import util
@@ -15,7 +17,7 @@ def remove_benchmark(
     filename: Path, remove: set[str], keep_hash: set[str], dry_run: bool
 ):
     with open(filename) as fd:
-        data = json.load(fd)
+        data = ujson.load(fd)
 
     if data["metadata"]["benchmark_hash"] in keep_hash:
         util.status("/")
@@ -36,7 +38,7 @@ def remove_benchmark(
 
     if not dry_run:
         with open(filename, "w") as fd:
-            json.dump(data, fd, indent=2)
+            ujson.dump(data, fd, indent=2)
 
 
 def _main(benchmarks: list[str], keep_hash: list[str], dry_run: bool = False):

Diff for: bench_runner/scripts/run_benchmarks.py

@@ -3,7 +3,6 @@
 
 import argparse
 import csv
-import json
 import os
 from operator import itemgetter
 from pathlib import Path
@@ -15,6 +14,9 @@
 from typing import Iterable, Optional, Union
 
 
+import ujson
+
+
 from bench_runner import git
 from bench_runner.result import Result
 from bench_runner.table import md_link
@@ -104,7 +106,7 @@ def run_benchmarks(
             f"No benchmark file created at {BENCHMARK_JSON.resolve()}."
         )
     with open(BENCHMARK_JSON) as fd:
-        contents = json.load(fd)
+        contents = ujson.load(fd)
     if len(contents.get("benchmarks", [])) == 0:
         raise NoBenchmarkError("No benchmarks were run.")
 
@@ -234,7 +236,7 @@ def update_metadata(
     run_id: Optional[str] = None,
 ) -> None:
     with open(filename) as fd:
-        content = json.load(fd)
+        content = ujson.load(fd)
 
     metadata = content.setdefault("metadata", {})
 
@@ -250,7 +252,7 @@ def update_metadata(
         metadata["github_action_url"] = f"{GITHUB_URL}/actions/runs/{run_id}"
 
     with open(filename, "w") as fd:
-        json.dump(content, fd, indent=2)
+        ujson.dump(content, fd, indent=2)
 
 
 def copy_to_directory(

Diff for: pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "matplotlib==3.8.3",
     "pyperf>=2.6.0",
     "ruamel.yaml==0.18.6",
+    "ujson==5.9.0",
     "wheel",
 ]
 dynamic = ["version"]