flaxdiff 0.1.35.1__tar.gz → 0.1.35.3__tar.gz

{flaxdiff-0.1.35.1 → flaxdiff-0.1.35.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flaxdiff
-Version: 0.1.35.1
+Version: 0.1.35.3
 Summary: A versatile and easy to understand Diffusion library
 Author: Ashish Kumar Singh
 Author-email: ashishkmr472@gmail.com

{flaxdiff-0.1.35.1 → flaxdiff-0.1.35.3}/flaxdiff/data/online_loader.py

@@ -26,7 +26,6 @@ import traceback
 USER_AGENT = get_datasets_user_agent()
 
 data_queue = Queue(16*2000)
-error_queue = Queue(16*2000)
 
 
 def fetch_single_image(image_url, timeout=None, retries=0):
@@ -78,13 +77,6 @@ def default_image_processor(
     return image, original_height, original_width
 
 
-def default_feature_extractor(sample):
-    return {
-        "url": sample["url"],
-        "caption": sample["caption"],
-    }
-
-
 def map_sample(
     url,
     caption,
@@ -129,6 +121,13 @@ def map_sample(
         pass
 
 
+def default_feature_extractor(sample):
+    return {
+        "url": sample["url"],
+        "caption": sample["caption"],
+    }
+
+
 def map_batch(
     batch, num_threads=256, image_shape=(256, 256),
     min_image_shape=(128, 128),
@@ -142,54 +141,22 @@ def map_batch(
             map_sample, image_shape=image_shape, min_image_shape=min_image_shape,
             timeout=timeout, retries=retries, image_processor=image_processor,
             upscale_interpolation=upscale_interpolation,
-            downscale_interpolation=downscale_interpolation,
-            feature_extractor=feature_extractor
+            downscale_interpolation=downscale_interpolation
         )
-        features = feature_extractor(batch)
-        url, caption = features["url"], features["caption"]
         with ThreadPoolExecutor(max_workers=num_threads) as executor:
+            features = feature_extractor(batch)
+            url, caption = features["url"], features["caption"]
             executor.map(map_sample_fn, url, caption)
     except Exception as e:
         print(f"Error maping batch", e)
         traceback.print_exc()
-        error_queue.put_nowait({
-            "batch": batch,
-            "error": str(e)
-        })
+        # error_queue.put_nowait({
+        #     "batch": batch,
+        #     "error": str(e)
+        # })
         pass
 
 
-def map_batch_repeat_forever(
-    batch, num_threads=256, image_shape=(256, 256),
-    min_image_shape=(128, 128),
-    timeout=15, retries=3, image_processor=default_image_processor,
-    upscale_interpolation=cv2.INTER_CUBIC,
-    downscale_interpolation=cv2.INTER_AREA,
-    feature_extractor=default_feature_extractor,
-):
-    while True:  # Repeat forever
-        try:
-            map_sample_fn = partial(
-                map_sample, image_shape=image_shape, min_image_shape=min_image_shape,
-                timeout=timeout, retries=retries, image_processor=image_processor,
-                upscale_interpolation=upscale_interpolation,
-                downscale_interpolation=downscale_interpolation,
-                feature_extractor=feature_extractor
-            )
-            with ThreadPoolExecutor(max_workers=num_threads) as executor:
-                executor.map(map_sample_fn, batch)
-            # Shuffle the batch
-            batch = batch.shuffle(seed=np.random.randint(0, 1000000))
-        except Exception as e:
-            print(f"Error maping batch", e)
-            traceback.print_exc()
-            error_queue.put_nowait({
-                "batch": batch,
-                "error": str(e)
-            })
-            pass
-
-
 def parallel_image_loader(
     dataset: Dataset, num_workers: int = 8, image_shape=(256, 256),
     min_image_shape=(128, 128),
@@ -197,11 +164,9 @@ def parallel_image_loader(
     upscale_interpolation=cv2.INTER_CUBIC,
     downscale_interpolation=cv2.INTER_AREA,
     feature_extractor=default_feature_extractor,
-    map_batch_fn=map_batch,
-
 ):
     map_batch_fn = partial(
-        map_batch_fn, num_threads=num_threads, image_shape=image_shape,
+        map_batch, num_threads=num_threads, image_shape=image_shape,
         min_image_shape=min_image_shape,
         timeout=timeout, retries=retries, image_processor=image_processor,
         upscale_interpolation=upscale_interpolation,
@@ -209,20 +174,18 @@ def parallel_image_loader(
         feature_extractor=feature_extractor
     )
     shard_len = len(dataset) // num_workers
-    print(f"Local Shard lengths: {shard_len}, workers: {num_workers}")
+    print(f"Local Shard lengths: {shard_len}")
     with multiprocessing.Pool(num_workers) as pool:
         iteration = 0
         while True:
             # Repeat forever
             shards = [dataset[i*shard_len:(i+1)*shard_len]
                       for i in range(num_workers)]
-            # shards = [dataset.shard(num_shards=num_workers, index=i) for i in range(num_workers)]
             print(f"mapping {len(shards)} shards")
             pool.map(map_batch_fn, shards)
             iteration += 1
             print(f"Shuffling dataset with seed {iteration}")
             dataset = dataset.shuffle(seed=iteration)
-            print(f"Dataset shuffled")
             # Clear the error queue
             # while not error_queue.empty():
             #     error_queue.get_nowait()
@@ -237,7 +200,6 @@ class ImageBatchIterator:
         upscale_interpolation=cv2.INTER_CUBIC,
         downscale_interpolation=cv2.INTER_AREA,
         feature_extractor=default_feature_extractor,
-        map_batch_fn=map_batch,
     ):
         self.dataset = dataset
         self.num_workers = num_workers
@@ -252,22 +214,10 @@ class ImageBatchIterator:
             image_processor=image_processor,
             upscale_interpolation=upscale_interpolation,
             downscale_interpolation=downscale_interpolation,
-            feature_extractor=feature_extractor,
-            map_batch_fn=map_batch_fn,
+            feature_extractor=feature_extractor
         )
         self.thread = threading.Thread(target=loader, args=(dataset,))
         self.thread.start()
-        self.error_queue = queue.Queue()
-
-        def error_fetcher():
-            while True:
-                error = error_queue.get()
-                self.error_queue.put(error)
-        self.error_thread = threading.Thread(target=error_fetcher)
-        self.error_thread.start()
-
-    def get_error(self):
-        yield self.error_queue.get()
 
     def __iter__(self):
         return self
@@ -331,7 +281,6 @@ class OnlineStreamingDataLoader():
         upscale_interpolation=cv2.INTER_CUBIC,
         downscale_interpolation=cv2.INTER_AREA,
         feature_extractor=default_feature_extractor,
-        map_batch_fn=map_batch,
     ):
         if isinstance(dataset, str):
             dataset_path = dataset
@@ -359,8 +308,7 @@ class OnlineStreamingDataLoader():
             timeout=timeout, retries=retries, image_processor=image_processor,
             upscale_interpolation=upscale_interpolation,
             downscale_interpolation=downscale_interpolation,
-            feature_extractor=feature_extractor,
-            map_batch_fn=map_batch_fn,
+            feature_extractor=feature_extractor
         )
         self.batch_size = batch_size
 
@@ -372,7 +320,7 @@ class OnlineStreamingDataLoader():
                 try:
                     self.batch_queue.put(collate_fn(batch))
                 except Exception as e:
-                    print("Error collating batch", e)
+                    print("Error processing batch", e)
 
         self.loader_thread = threading.Thread(target=batch_loader)
         self.loader_thread.start()

{flaxdiff-0.1.35.1 → flaxdiff-0.1.35.3}/flaxdiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flaxdiff
-Version: 0.1.35.1
+Version: 0.1.35.3
 Summary: A versatile and easy to understand Diffusion library
 Author: Ashish Kumar Singh
 Author-email: ashishkmr472@gmail.com

{flaxdiff-0.1.35.1 → flaxdiff-0.1.35.3}/setup.py

@@ -11,7 +11,7 @@ required_packages=[
 setup(
     name='flaxdiff',
     packages=find_packages(),
-    version='0.1.35.1',
+    version='0.1.35.3',
     description='A versatile and easy to understand Diffusion library',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',