flaxdiff 0.1.36.3__py3-none-any.whl → 0.1.36.4__py3-none-any.whl

flaxdiff/data/sources/tfds.py

@@ -4,6 +4,8 @@ import grain.python as pygrain
 from flaxdiff.utils import AutoTextTokenizer
 from typing import Dict
 import random
+import augmax
+import jax
 
 # -----------------------------------------------------------------------------------------------#
 # Oxford flowers and other TFDS datasources -----------------------------------------------------#
@@ -47,6 +49,15 @@ def tfds_augmenters(image_scale, method):
         interpolation = cv2.INTER_CUBIC
     else:
         interpolation = cv2.INTER_AREA
+        
+    augments = augmax.Chain(
+        augmax.HorizontalFlip(0.5),
+        augmax.RandomContrast((-0.05, 0.05), 1.),
+        augmax.RandomBrightness((-0.2, 0.2), 1.)
+    )
+
+    augments = jax.jit(augments, backend="cpu")
+        
     class augmenters(pygrain.MapTransform):
         def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
@@ -56,6 +67,7 @@ def tfds_augmenters(image_scale, method):
             image = element['image']
             image = cv2.resize(image, (image_scale, image_scale),
                             interpolation=interpolation)
+            # image = augments(image)
             # image = (image - 127.5) / 127.5
             caption = labelizer(element)
             results = self.tokenize(caption)

flaxdiff/trainer/diffusion_trainer.py

@@ -14,6 +14,7 @@ from typing import Dict, Callable, Sequence, Any, Union, Tuple, Type
 from ..schedulers import NoiseScheduler
 from ..predictors import DiffusionPredictionTransform, EpsilonPredictionTransform
 from ..samplers.common import DiffusionSampler
+from ..samplers.ddim import DDIMSampler
 
 from flaxdiff.utils import RandomMarkovState
 
@@ -179,9 +180,6 @@ class DiffusionTrainer(SimpleTrainer):
                 nloss = loss_fn(preds, expected_output)
                 # Ignore the loss contribution of images with zero standard deviation
                 nloss *= noise_schedule.get_weights(noise_level)
-                # nloss = jnp.mean(nloss, axis=(1,2,3))
-                # nloss = jnp.where(is_non_zero, nloss, 0)
-                # nloss = jnp.mean(nloss, where=nloss != 0)
                 nloss = jnp.mean(nloss)
                 loss = nloss
                 return loss
@@ -224,11 +222,11 @@ class DiffusionTrainer(SimpleTrainer):
         if distributed_training:
             train_step = shard_map(train_step, mesh=self.mesh, in_specs=(P(), P(), P('data'), P('data')), 
                                    out_specs=(P(), P(), P()))
-            train_step = jax.jit(train_step)
+        train_step = jax.jit(train_step)
             
         return train_step
 
-    def _define_vaidation_step(self, sampler_class: Type[DiffusionSampler]):
+    def _define_vaidation_step(self, sampler_class: Type[DiffusionSampler]=DDIMSampler, sampling_noise_schedule: NoiseScheduler=None):
         model = self.model
         encoder = self.encoder
         autoencoder = self.autoencoder
@@ -241,7 +239,7 @@ class DiffusionTrainer(SimpleTrainer):
             sampler = sampler_class(
                 model=model,
                 params=state.ema_params,
-                noise_schedule=self.noise_schedule,
+                noise_schedule=self.noise_schedule if sampling_noise_schedule is None else sampling_noise_schedule,
                 model_output_transform=self.model_output_transform,
                 image_size=self.input_shapes['x'][0],
                 null_labels_seq=null_labels_full,
@@ -311,10 +309,11 @@ class DiffusionTrainer(SimpleTrainer):
             print("Error logging images to wandb", e)
             traceback.print_exc()
     
-    def fit(self, data, training_steps_per_epoch, epochs, val_steps_per_epoch=8, sampler_class=None):
+    def fit(self, data, training_steps_per_epoch, epochs, val_steps_per_epoch=8, sampler_class: Type[DiffusionSampler]=DDIMSampler, sampling_noise_schedule: NoiseScheduler=None):
         local_batch_size = data['local_batch_size']
         validation_step_args = {
             "sampler_class": sampler_class,
+            "sampling_noise_schedule": sampling_noise_schedule,
         }
         super().fit(
             data, 

{flaxdiff-0.1.36.3.dist-info → flaxdiff-0.1.36.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flaxdiff
-Version: 0.1.36.3
+Version: 0.1.36.4
 Summary: A versatile and easy to understand Diffusion library
 Author-email: Ashish Kumar Singh <ashishkmr472@gmail.com>
 License-Expression: MIT

{flaxdiff-0.1.36.3.dist-info → flaxdiff-0.1.36.4.dist-info}/RECORD

@@ -5,7 +5,7 @@ flaxdiff/data/dataset_map.py,sha256=hcHaoR2IbNQmfyPUhYd6_8xinurxxCqawQijAsDI0Ek,
 flaxdiff/data/datasets.py,sha256=YUMoSvF2yAyikRvRofZVlHwfEOU3zXSSG4KkLnVfpoA,5626
 flaxdiff/data/online_loader.py,sha256=1Fi_QRixxRzbt602nORINcDeHEccvCrBpagrz4PURYg,12499
 flaxdiff/data/sources/gcs.py,sha256=11ZuQhvMyJRLg21DgVdzO5qEuae7zgzTXGNOskF-cbs,3380
-flaxdiff/data/sources/tfds.py,sha256=WA3h9lyR4yotCNEmJON2noIN-2HNcqhf6zigx1XXsMI,2481
+flaxdiff/data/sources/tfds.py,sha256=7n-uobG_UvkD5mU_1ovPd9kb6xJrbEKFFXdVEHDunts,2781
 flaxdiff/metrics/inception.py,sha256=a5kjMCPMT9gB88c_HCKiek-2vsAyoE35K7nDt4h4pVI,31843
 flaxdiff/metrics/utils.py,sha256=YuuOfqvqgIjsceupwNeJ59vQ2TnGeNMIyKdkIqOmoNg,1702
 flaxdiff/models/__init__.py,sha256=FAivVYXxM2JrCFIXf-C3374RB2Hth25dBrzOeNFhH1U,26
@@ -38,10 +38,10 @@ flaxdiff/schedulers/linear.py,sha256=6003F5ISq1Wc0h6UAzY95MJgsDIKGMhBzbiVALpea0k
 flaxdiff/schedulers/sqrt.py,sha256=1F84ZgQPuoNMhe6yxGTR2G0h7dPOZtm4UDQOakbSsEU,445
 flaxdiff/trainer/__init__.py,sha256=T-vUVq4zHcMK6kpCsG4Gu8vn71q6lZD-lg-Ul7yKfEk,128
 flaxdiff/trainer/autoencoder_trainer.py,sha256=hxihkRL9WCIQVGOP-pc1jjjIUaRXDLcNo3_erTKsuWM,7049
-flaxdiff/trainer/diffusion_trainer.py,sha256=ajOWBgFFwXP_VQScUjcuPoaB4Gk02aF0Ls5LNlA8wqA,12691
+flaxdiff/trainer/diffusion_trainer.py,sha256=zde_nRzsC2GD5KNCn5Qjw9ldHi7L_-teJhcUNUDCdcQ,12815
 flaxdiff/trainer/simple_trainer.py,sha256=lmRo8N0bMupIyS3ejPvPtxoskY_3GLC8iyJE6u4TIWc,21990
 flaxdiff/trainer/video_diffusion_trainer.py,sha256=gMkKpnKNTo8QhTx5ptEEkc7W5-7rzXIr9queU53hXyQ,2197
-flaxdiff-0.1.36.3.dist-info/METADATA,sha256=9XaZMJ6SMFP7OUn2tp9v5FQveMGoxvuiyxdJ8SmMd8w,22310
-flaxdiff-0.1.36.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-flaxdiff-0.1.36.3.dist-info/top_level.txt,sha256=-2-nXnfkJgSfkki1tjm5Faw6Dso7vhtdn2szwCdX5CQ,9
-flaxdiff-0.1.36.3.dist-info/RECORD,,
+flaxdiff-0.1.36.4.dist-info/METADATA,sha256=MTgRu4VgbQaGqbGv_S3wXd_dzeNmHXnixRdvs93dWj0,22310
+flaxdiff-0.1.36.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+flaxdiff-0.1.36.4.dist-info/top_level.txt,sha256=-2-nXnfkJgSfkki1tjm5Faw6Dso7vhtdn2szwCdX5CQ,9
+flaxdiff-0.1.36.4.dist-info/RECORD,,