quantize: optimize c++ color method

Author: T-Dynamos

quantizer_cpp.patch

@@ -171,9 +171,9 @@ diff '--color=auto' -uNr patch/wu.h materialyoucolor/quantize/wu.h
 
  namespace material_color_utilities {
 
---- patch/celebi.cc	2024-03-25 23:22:50.123427023 +0530
-+++ materialyoucolor/quantize/celebi.cc	2024-03-25 23:20:03.277959473 +0530
-@@ -14,47 +14,78 @@
+--- materialyoucolor/quantize/celebi.cc	2025-01-09 12:10:34.733592839 +0530
++++ patch/celebi.cc	2025-01-09 11:57:06.090837655 +0530
+@@ -14,47 +14,81 @@
   * limitations under the License.
   */
 
@@ -244,35 +244,38 @@ diff '--color=auto' -uNr patch/wu.h materialyoucolor/quantize/wu.h
 +  
 +  return result.color_to_count;
 +}
-+ 
 
 -  return result;
-+std::vector<std::vector<int>> StbLoadImage(const char* image_path) {
++
++std::map<uint32_t, uint32_t>  ImageQuantizeCelebi(const char* image_path, const int quality,  int max_colors) {
 +    int width, height, channels;
 +    std::vector<std::vector<int>> pixel_array = {};
-+    // Load the actual image
 +    unsigned char* pixel_result = stbi_load(image_path, &width, &height, &channels, 4);
-+    if (!pixel_result) {return pixel_array;}
-+
-+    pixel_array.reserve(width * height);
++    if (!pixel_result) {return QuantizeCelebi(pixel_array, max_colors);}
++    pixel_array.reserve( (width * height) / quality );
 +    unsigned char* pixel_position;
-+    
++    int _quality = quality;
 +    for (int y = 0; y < height; ++y) {
-+        for (int x = 0; x < width; ++x) {
++        for (int x = 0; x < width; x = x+_quality) {
 +            pixel_position = pixel_result + (x + y * width) * 4;
 +            std::vector<int> current_color = {
 +              pixel_position[0], pixel_position[1], pixel_position[2]};
 +            if (channels > 3) {current_color.push_back(pixel_position[3]);}  
 +            pixel_array.push_back(current_color);
++            if (_quality < quality) {_quality = quality;}
 +        }
++        if (y % 2 == 0) {
++          _quality = quality / 2;
++        } else {_quality = quality;}
 +    }
 +    stbi_image_free(pixel_result);
-+    return pixel_array;
++    return QuantizeCelebi(pixel_array, max_colors);
  }
 
 -}  // namespace material_color_utilities
++
 +PYBIND11_MODULE(celebi, m) {
 +    m.doc() = "Functions from cpp backend";
 +    m.def("QuantizeCelebi", &QuantizeCelebi, "Get dominant colors");
-+    m.def("StbLoadImage", &StbLoadImage, "Get pixel array");
++    m.def("ImageQuantizeCelebi", &ImageQuantizeCelebi, "Get pixel array");
 +}

setup.py

@@ -635,7 +635,7 @@ def download_files(base_url, folder, file_map):
 
     # write __init__.py
     with open(os.path.join(MCU_FOLDER, "__init__.py"), "w") as file:
-        file.write("from .celebi import QuantizeCelebi, StbLoadImage")
+        file.write("from .celebi import QuantizeCelebi, ImageQuantizeCelebi")
         file.close()
 
     if should_apply:

tests/test_all.py

@@ -3,9 +3,11 @@
 import os
 import requests
 from timeit import default_timer
+import gc
 import sys
+import time
 from materialyoucolor.utils.color_utils import rgba_from_argb
-from materialyoucolor.quantize import QuantizeCelebi, StbLoadImage
+from materialyoucolor.quantize import QuantizeCelebi, ImageQuantizeCelebi
 from materialyoucolor.score.score import Score
 from materialyoucolor.hct import Hct
 from materialyoucolor.dynamiccolor.material_dynamic_colors import MaterialDynamicColors
@@ -39,27 +41,28 @@
     print("Downloaded: ", FILENAME, os.path.exists(FILENAME))
 
 console = Console()
+quality = int(sys.argv[2])
 
+########### PILLOW METHOD #############
 start = default_timer()
 image = Image.open(FILENAME)
-
 pixel_len = image.width * image.height
 image_data = image.getdata()
-pixel_array = [image_data[_] for _ in range(0, pixel_len, int(sys.argv[2]))]
-end = default_timer()
-print("File open took [pillow]: ", end - start, "secs")
-start = default_timer()
-pixel_array = StbLoadImage(FILENAME)
+# start = default_timer()
+colors = QuantizeCelebi([image_data[i] for i in range(0, pixel_len, quality)], MAX_COLOR)
 end = default_timer()
-print("File open took [stb_image]: ", end - start, "secs")
+print(f"Color[pillow] generation took {end-start:.4f} secs")
+##############################
 
+########## C++ Method ##########
 start = default_timer()
-colors = QuantizeCelebi(pixel_array, MAX_COLOR)
-selected = Score.score(colors)
+# loading using c++ method
+colors = ImageQuantizeCelebi(FILENAME, quality, MAX_COLOR)
 end = default_timer()
+print(f"Color[stb_image] generation took {end-start:.4f} secs")
+######################
 
-print("Color generation took : ", end - start, "secs\n")
-
+selected = Score.score(colors)
 
 if os.name == "nt":
     # UnicodeEncodeError: 'charmap' codec can't encode characters in position 0-5: character maps to <undefined>
@@ -91,6 +94,8 @@
     )
 console.print(st)
 
+exit()
+
 def print_scheme(scheme_function, name):
     print()
     schemes = [scheme_function(rgb) for rgb in selected]