xax 0.1.3__tar.gz → 0.1.5__tar.gz

{xax-0.1.3/xax.egg-info → xax-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xax
-Version: 0.1.3
+Version: 0.1.5
 Summary: A library for fast Jax experimentation
 Home-page: https://github.com/kscalelabs/xax
 Author: Benjamin Bolte

{xax-0.1.3 → xax-0.1.5}/xax/__init__.py

@@ -12,7 +12,7 @@ and running the update script:
     python -m scripts.update_api --inplace
 """
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"
 
 # This list shouldn't be modified by hand; instead, run the update script.
 __all__ = [

{xax-0.1.3 → xax-0.1.5}/xax/nn/export.py

@@ -9,7 +9,14 @@ import jax
 import tensorflow as tf
 from jax.experimental import jax2tf
 from jaxtyping import Array, PyTree
-from orbax.export import ExportManager, JaxModule, ServingConfig
+
+try:
+    from orbax.export import ExportManager, JaxModule, ServingConfig
+except ImportError as e:
+    raise ImportError(
+        "Please install the package with `orbax` as a dependency, using "
+        "'xax[export]` to install the required dependencies."
+    ) from e
 
 logger = logging.getLogger(__name__)
 

{xax-0.1.3 → xax-0.1.5}/xax/task/base.py

@@ -153,6 +153,8 @@ class BaseTask(Generic[Config]):
             for base in cls.__orig_bases__:
                 if hasattr(base, "__args__"):
                     for arg in base.__args__:
+                        if isinstance(arg, TypeVar) and arg.__bound__ is not None:
+                            arg = arg.__bound__
                         if issubclass(arg, BaseConfig):
                             return arg
 

{xax-0.1.3 → xax-0.1.5}/xax/task/mixins/compile.py

@@ -5,6 +5,7 @@ behavior during initialization and training.
 """
 
 import logging
+import sys
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Generic, TypeVar
@@ -17,6 +18,16 @@ from xax.task.base import BaseConfig, BaseTask
 logger = logging.getLogger(__name__)
 
 
+def get_cache_dir() -> str | None:
+    # By default, only cache on MacOS, since Jax caching on Linux is very
+    # prone to NaNs.
+    match sys.platform:
+        case "darwin":
+            return str((Path.home() / ".cache" / "jax" / "jaxcache").resolve())
+        case _:
+            return None
+
+
 @jax.tree_util.register_dataclass
 @dataclass
 class CompileOptions:
@@ -42,7 +53,8 @@ class CompileOptions:
 
     # JAX cache options
     cache_dir: str | None = field(
-        value=lambda: str((Path.home() / ".cache" / "jax" / "jaxcache").resolve()),
+        # Only cache by default on MacOS systems.
+        value=get_cache_dir,
         help="Directory for JAX compilation cache. If None, caching is disabled",
     )
     cache_min_size_bytes: int = field(
@@ -54,7 +66,7 @@ class CompileOptions:
         help="Minimum compilation time in seconds for cache entries. 0 means no minimum",
     )
     cache_enable_xla: str = field(
-        value="all",
+        value="none",
         help="Which XLA caches to enable",
     )
 

{xax-0.1.3 → xax-0.1.5}/xax/task/mixins/train.py

@@ -122,7 +122,7 @@ class ValidStepTimer:
 
         # Step-based validation.
         valid_every_n_steps = self.valid_every_n_steps
-        if valid_every_n_steps is not None and state.num_steps > valid_every_n_steps + self.last_valid_step:
+        if valid_every_n_steps is not None and state.num_steps >= valid_every_n_steps + self.last_valid_step:
             self.last_valid_step = state.num_steps
             return True
 

{xax-0.1.3 → xax-0.1.5}/xax/utils/tensorboard.py

@@ -258,12 +258,40 @@ class TensorboardWriter:
         fps: int = 30,
     ) -> None:
         assert value.ndim == 4, "Video must be 4D array (T, H, W, C)"
-        images = [PIL.Image.fromarray(frame) for frame in value]
+
+        images = [PIL.Image.fromarray(frame).convert("RGB") for frame in value]
+        width, height = images[0].size
+        big_image = PIL.Image.new("RGB", (width, height * len(images)))
+        for i, im in enumerate(images):
+            big_image.paste(im, (0, i * height))
+
+        quantized_big = big_image.quantize(method=PIL.Image.Quantize.MAXCOVERAGE, dither=PIL.Image.Dither.NONE)
+        palette = quantized_big.getpalette()
+
+        processed = []
+        for im in images:
+            q = im.quantize(
+                method=PIL.Image.Quantize.MAXCOVERAGE,
+                palette=quantized_big,
+                dither=PIL.Image.Dither.NONE,
+            )
+            processed.append(q)
+
+        if palette is not None:
+            palette[0:3] = [255, 255, 255]
+            for im in processed:
+                im.putpalette(palette)
 
         # Create temporary file for GIF
         temp_file = tempfile.NamedTemporaryFile(suffix=".gif", delete=False)
         try:
-            images[0].save(temp_file.name, save_all=True, append_images=images[1:], duration=int(1000 / fps), loop=0)
+            processed[0].save(
+                temp_file.name,
+                save_all=True,
+                append_images=processed[1:],
+                duration=int(1000 / fps),
+                loop=0,
+            )
             with open(temp_file.name, "rb") as f:
                 video_string = f.read()
 

{xax-0.1.3 → xax-0.1.5/xax.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xax
-Version: 0.1.3
+Version: 0.1.5
 Summary: A library for fast Jax experimentation
 Home-page: https://github.com/kscalelabs/xax
 Author: Benjamin Bolte