sync main clean up code

Author: Cyberhan123

.idea/workspace.xml

@@ -26,11 +26,6 @@ option(SD_AVX2 "sd: enable AVX2" ON)
 option(SD_AVX512 "sd: enable AVX512" OFF)
 option(SD_FMA "sd: enable FMA" ON)
 
-
-set(GGML_AVX512 OFF)
-set(GGML_AVX2 OFF)
-set(GGML_AVX OFF)
-
 if (SD_AVX512)
     set(GGML_AVX512 ON)
 elseif (SD_AVX2)

CMakeLists.txt

@@ -4,7 +4,7 @@ if(${CMAKE_VERSION} VERSION_LESS 3.14)
     include(add_FetchContent_MakeAvailable.cmake)
 endif()
 
-set(SD_GIT_TAG  1ac4ad2ba21c7f1c96c061f452bde129522a85c1)
+set(SD_GIT_TAG  70d2919decdf8f5fcd4956d1da60594c9e7b03ac)
 set(SD_GIT_URL  https://github.com/Cyberhan123/stable-diffusion.cpp)
 set(BUILD_SHARED_LIBS OFF)
 
@@ -14,3 +14,7 @@ FetchContent_Declare(
   GIT_TAG           ${SD_GIT_TAG}
 )
 FetchContent_MakeAvailable(sd)
+
+set(GGML_AVX512 OFF)
+set(GGML_AVX2 OFF)
+set(GGML_AVX OFF)

cmake/sd.cmake

@@ -219,17 +219,16 @@ const char* img2img(void* sd, const sd_img2img_options* opt) {
     if (it != SampleMethodMap.end()) {
         const auto s = static_cast<StableDiffusion *>(sd);
         const auto result = s->img2img(
-            /* const std::vector<uint8_t>& init_img */ opt->init_img,
-                                                       /* const std::string &prompt */ std::string(opt->prompt),
-                                                       /* const std::string &negative_prompt */
-                                                       std::string(opt->negative_prompt),
-                                                       /* float cfg_scale */ opt->cfg_scale,
-                                                       /* int width */ opt->width,
-                                                       /* int height */ opt->height,
-                                                       /* SampleMethod sample_method */ it->second,
-                                                       /* int sample_steps */ opt->sample_steps,
-                                                       /* float strength */ opt->strength,
-                                                       /* int64_t seed */ opt->seed
+            opt->init_img,
+            std::string(opt->prompt),
+            std::string(opt->negative_prompt),
+            opt->cfg_scale,
+            opt->width,
+            opt->height,
+            it->second,
+            opt->sample_steps,
+            opt->strength,
+            opt->seed
         );
         const auto str = code::base64_encode<std::string, std::vector<uint8_t *>>(result, false);
         const auto buffer = new char[str.size()];