fix naming error, add log & update doc

Author: null-define

README.md

@@ -1,13 +1,20 @@
-# stable_diffusion_cpp_py
+# stable-diffusion-cpp-py
 
-python bind for stable_diffusion_cpp by pybind11
+python bind for stable-diffusion.cpp
+
+## description
+
+a simple stable_diffusion_cpp python wrapper by using pybind11 and magic_enum, aim to provide a python interface for stable-diffusion.cpp to build upper application
 
 ## install
 
 - if you use nvidia gpu, execute `CMAKE_ARGS="-DSD_CUBLAS=on" pip install git+https://github.com/null-define/stable-diffusion-cpp-py` install
 - if you use amd gpu, execute `CC=/opt/rocm/llvm/bin/clang CXX=/opt/rocm/llvm/bin/clang++ CMAKE_ARGS="-DSD_HIPBLAS=ON -DAMDGPU_TARGETS=gfx1100" pip install git+https://github.com/null-define/stable-diffusion-cpp-py` install
 
+- To upgrade and rebuild stable-diffusion-cpp-py add --upgrade --force-reinstall --no-cache-dir flags to the pip install command to ensure the package is rebuilt from source.
 
 ## References
+
 - [stable-diffusion.cpp](https://github.com/leejet/stable-diffusion.cpp)
-- [pybind11](https://github.com/pybind/pybind11)
+- [pybind11](https://github.com/pybind/pybind11)
+- [stable-diffusion-cpp-py](https://github.com/abetlen/llama-cpp-python)

sd_cpp_lib/CMakeLists.txt

@@ -17,6 +17,6 @@ add_subdirectory(./stable-diffusion.cpp EXCLUDE_FROM_ALL)
 
 set(TARGET sd_cpp_lib)
 pybind11_add_module(${TARGET} sd_cpp_lib.cc)
-target_link_libraries(${TARGET} PRIVATE stable-diffusion)
+target_link_libraries(${TARGET} PRIVATE stable-diffusion ggml)
 
 

sd_cpp_lib/sd_cpp_lib.cc

@@ -1,8 +1,50 @@
 #include "magic_enum/magic_enum.hpp"
 #include "pybind11/pybind11.h"
 #include "stable-diffusion.h"
+#include "util.h"
 #include <memory>
 
+static sd_log_level_t g_cfg_log_level = SD_LOG_INFO;
+
+/* Enables Printing the log level tag in color using ANSI escape codes */
+void sd_log_cb(enum sd_log_level_t level, char const* log, void* data) {
+  int tag_color;
+  char const* level_str;
+  FILE* out_stream = (level == SD_LOG_ERROR) ? stderr : stdout;
+
+  if (!log || level < g_cfg_log_level) {
+    return;
+  }
+
+  switch (level) {
+    case SD_LOG_DEBUG:
+      tag_color = 37;
+      level_str = "DEBUG";
+      break;
+    case SD_LOG_INFO:
+      tag_color = 34;
+      level_str = "INFO";
+      break;
+    case SD_LOG_WARN:
+      tag_color = 35;
+      level_str = "WARN";
+      break;
+    case SD_LOG_ERROR:
+      tag_color = 31;
+      level_str = "ERROR";
+      break;
+    default: /* Potential future-proofing */
+      tag_color = 33;
+      level_str = "?????";
+      break;
+  }
+
+  fprintf(out_stream, "[%-5s] ", level_str);
+
+  fputs(log, out_stream);
+  fflush(out_stream);
+}
+
 template <typename T>
 using deleted_unique_ptr = std::unique_ptr<T, std::function<void(T*)>>;
 
@@ -37,6 +79,9 @@ PYBIND11_MODULE(sd_cpp_lib, m) {
   export_enum<rng_type_t>(m);
   export_enum<schedule_t>(m);
   export_enum<sample_method_t>(m);
+  export_enum<sd_log_level_t>(m);
+  m.def("set_log_level",
+        [](sd_log_level_t log_level) { g_cfg_log_level = log_level; });
   m.def(
       "new_sd_ctx",
       [](std::string const& model_path, std::string const& vae_path,
@@ -47,12 +92,14 @@ PYBIND11_MODULE(sd_cpp_lib, m) {
          sd_type_t wtype, rng_type_t rng_type, schedule_t s,
          bool keep_clip_on_cpu, bool keep_control_net_cpu,
          bool keep_vae_on_cpu) {
-        return static_cast<py::capsule>(new_sd_ctx(
+        sd_set_log_callback(sd_log_cb, nullptr);
+        auto ptr = new_sd_ctx(
             model_path.c_str(), vae_path.c_str(), taesd_path.c_str(),
             control_net_path.c_str(), lora_model_dir.c_str(), embed_dir.c_str(),
             stacked_id_embed_dir.c_str(), vae_decode_only, vae_tiling,
             free_params_immediately, n_threads, wtype, rng_type, s,
-            keep_clip_on_cpu, keep_control_net_cpu, keep_vae_on_cpu));
+            keep_clip_on_cpu, keep_control_net_cpu, keep_vae_on_cpu);
+        return static_cast<py::capsule>(ptr);
       },
       "create stable diffusion context");
   m.def(

stable_diffusion_cpp/stable_diffusion_cpp.py

@@ -1,5 +1,12 @@
-import sd_cpp_lib
-from sd_cpp_lib import sd_image_t, sd_type_t, rng_type_t, schedule_t, sample_method_t
+from stable_diffusion_cpp import sd_cpp_lib
+from stable_diffusion_cpp.sd_cpp_lib import (
+    sd_image_t,
+    sd_type_t,
+    rng_type_t,
+    schedule_t,
+    sample_method_t,
+    sd_log_level_t,
+)
 
 
 class StableDiffusion:
@@ -23,8 +30,13 @@ def __init__(
         keep_control_net_cpu=False,
         keep_vae_on_cpu=False,
         esrgan_path="",
+        log_level=sd_log_level_t.SD_LOG_WARN,
     ) -> None:
-        self.sd_ctx = sdcpy.new_sd_ctx(
+        self.sd_ctx = None
+        self.upscaler_ctx = None
+        sd_cpp_lib.set_log_level(log_level)
+
+        self.sd_ctx = sd_cpp_lib.new_sd_ctx(
             model_path,
             vae_path,
             taesd_path,
@@ -43,12 +55,14 @@ def __init__(
             keep_control_net_cpu,
             keep_vae_on_cpu,
         )
-        self.upscaler_ctx = None
         if esrgan_path:
-            self.upscaler_ctx = sdcpy.new_upscaler_ctx(esrgan_path, n_threads, wtype)
+            self.upscaler_ctx = sd_cpp_lib.new_upscaler_ctx(
+                esrgan_path, n_threads, wtype
+            )
 
     def __del__(self):
-        sdcpy.free_sd_ctx(self.sd_ctx)
+        if self.sd_ctx:
+            sd_cpp_lib.free_sd_ctx(self.sd_ctx)
 
     def txt_to_img(
         self,
@@ -70,7 +84,7 @@ def txt_to_img(
     ):
         prompt_str = ",".join(prompt)
         negative_prompt_str = ",".join(negative_prompt)
-        return sdcpy.txt2img(
+        return sd_cpp_lib.txt2img(
             self.sd_ctx,
             prompt_str,
             negative_prompt_str,
@@ -92,4 +106,4 @@ def txt_to_img(
     def upscale_img(self, img, upscale_factor):
         if not self.upscaler_ctx:
             return img
-        return sdcpy.upscale(self.upscaler_ctx, img, upscale_factor)
+        return sd_cpp_lib.upscale(self.upscaler_ctx, img, upscale_factor)