PyPI - mct-nightly - Versions diffs - 1.11.0.20240324.556__tar.gz → 1.11.0.20240326.400__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.11.0.20240324.556
+Version: 1.11.0.20240326.400
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mct-nightly
-Version: 1.11.0.20240324.556
+Version: 1.11.0.20240326.400
 Summary: A Model Compression Toolkit for neural networks
 Home-page: UNKNOWN
 License: UNKNOWN

@@ -27,4 +27,4 @@ from model_compression_toolkit import data_generation
 from model_compression_toolkit import pruning
 from model_compression_toolkit.trainable_infrastructure.keras.load_model import keras_load_quantized_model
-__version__ = "1.11.0.20240324.000556"
+__version__ = "1.11.0.20240326.000400"

@@ -13,7 +13,6 @@
 # limitations under the License.
 # ==============================================================================
-from model_compression_toolkit.core.common.data_loader import FolderImageLoader
 from model_compression_toolkit.core.common.framework_info import FrameworkInfo, ChannelAxis
 from model_compression_toolkit.core.common import network_editors as network_editor
 from model_compression_toolkit.core.common.quantization.debug_config import DebugConfig

@@ -1,108 +0,0 @@
-# Copyright 2021 Sony Semiconductor Israel, Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ==============================================================================
-import os
-from typing import List, Callable
-import numpy as np
-from PIL import Image
-from model_compression_toolkit.logger import Logger
-#:
-FILETYPES = ['jpeg', 'jpg', 'bmp', 'png']
-class FolderImageLoader(object):
-    """
-    Class for images loading, processing and retrieving.
-    """
-    def __init__(self,
-                 folder: str,
-                 preprocessing: List[Callable],
-                 batch_size: int,
-                 file_types: List[str] = FILETYPES):
-        """ Initialize a FolderImageLoader object.
-        Args:
-            folder: Path of folder with images to load. The path has to exist, and has to contain at
-            least one image.
-            preprocessing: List of functions to use when processing the images before retrieving them.
-            batch_size: Number of images to retrieve each sample.
-            file_types: Files types to scan in the folder. Default list is :data:`~model_compression_toolkit.core.common.data_loader.FILETYPES`
-        Examples:
-            Instantiate a FolderImageLoader using a directory of images, that returns 10 images randomly each time it is sampled:
-            >>> image_data_loader = FolderImageLoader('path/to/images/directory', preprocessing=[], batch_size=10)
-            >>> images = image_data_loader.sample()
-            To preprocess the images before retrieving them, a list of preprocessing methods can be passed:
-            >>> image_data_loader = FolderImageLoader('path/to/images/directory', preprocessing=[lambda x: (x-127.5)/127.5], batch_size=10)
-            For the FolderImageLoader to scan only specific files extensions, a list of extensions can be passed:
-            >>> image_data_loader = FolderImageLoader('path/to/images/directory', preprocessing=[], batch_size=10, file_types=['png'])
-        """
-        self.folder = folder
-        self.image_list = []
-        Logger.info(f"Starting Scanning Disk: {self.folder}")
-        for root, dirs, files in os.walk(self.folder):
-            for file in files:
-                file_type = file.split('.')[-1].lower()
-                if file_type in file_types:
-                    self.image_list.append(os.path.join(root, file))
-        self.n_files = len(self.image_list)
-        if self.n_files == 0:
-            Logger.critical(f"Expected files of type {FILETYPES}. No files of type {FILETYPES} were found.") # pragma: no cover
-        Logger.info(f"Finished Disk Scanning: Found {self.n_files} files")
-        self.preprocessing = preprocessing
-        self.batch_size = batch_size
-    def _sample(self):
-        """
-        Read batch_size random images from the image_list the FolderImageLoader holds.
-        Process them using the preprocessing list that was passed at initialization, and
-        prepare it for retrieving.
-        """
-        index = np.random.randint(0, self.n_files, self.batch_size)
-        image_list = []
-        for i in index:
-            file = self.image_list[i]
-            img = np.uint8(np.array(Image.open(file).convert('RGB')))
-            for p in self.preprocessing:  # preprocess images
-                img = p(img)
-            image_list.append(img)
-        self.next_batch_data = np.stack(image_list, axis=0)
-    def sample(self):
-        """
-        Returns: A sample of batch_size images from the folder the FolderImageLoader scanned.
-        """
-        self._sample()
-        data = self.next_batch_data  # get current data
-        return data

@@ -19,7 +19,6 @@ model_compression_toolkit/core/quantization_prep_runner.py
 model_compression_toolkit/core/runner.py
 model_compression_toolkit/core/common/__init__.py
 model_compression_toolkit/core/common/base_substitutions.py
-model_compression_toolkit/core/common/data_loader.py
 model_compression_toolkit/core/common/framework_implementation.py
 model_compression_toolkit/core/common/framework_info.py
 model_compression_toolkit/core/common/memory_computation.py

mct-nightly 1.11.0.20240324.556__tar.gz → 1.11.0.20240326.400__tar.gz

mct-nightly 1.11.0.20240324.556tar.gz → 1.11.0.20240326.400tar.gz