Skip to content

Commit

Permalink
sync sd latest and add wrap with sd_image_t
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyberhan123 committed Jan 2, 2024
1 parent 883704d commit 0828530
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 387 deletions.
1 change: 0 additions & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 30 additions & 5 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,20 @@ set(SD_ABI sd-abi)

add_library(${SD_ABI} SHARED
stable-diffusion-abi.cpp
stable-diffusion-abi.h)
stable-diffusion-abi.h
${sd_SOURCE_DIR}/stable-diffusion.h
${sd_SOURCE_DIR}/stable-diffusion.cpp
)

target_include_directories(${SD_ABI} PUBLIC .)
target_include_directories(${SD_ABI} PUBLIC ${sd_SOURCE_DIR} .)

set_target_properties(zip PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(stable-diffusion PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(${SD_ABI} PUBLIC SD_BUILD_SHARED_LIB)
target_compile_definitions(${SD_ABI} PRIVATE SD_BUILD_DLL)
set_target_properties(${SD_ABI} PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(${SD_ABI} PRIVATE STABLE_DIFFUSION_SHARED STABLE_DIFFUSION_BUILD)
target_link_libraries(${SD_ABI} PRIVATE stable-diffusion ${CMAKE_THREAD_LIBS_INIT})
target_compile_definitions(${SD_ABI} PUBLIC STABLE_DIFFUSION_SHARED STABLE_DIFFUSION_BUILD)
target_compile_definitions(${SD_ABI} PRIVATE STABLE_DIFFUSION_BUILD)
target_link_libraries(${SD_ABI} PUBLIC stable-diffusion)
4 changes: 2 additions & 2 deletions cmake/sd.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ if(${CMAKE_VERSION} VERSION_LESS 3.14)
include(add_FetchContent_MakeAvailable.cmake)
endif()

set(SD_GIT_TAG f2e4d9793bbe0ec713c28cc55b123c68afd8db90)
set(SD_GIT_TAG 7cb41b190fb9b4703f1737171cefd0abec861154)
set(SD_GIT_URL https://github.com/leejet/stable-diffusion.cpp)
set(BUILD_SHARED_LIBS OFF)
#set(BUILD_SHARED_LIBS OFF)

FetchContent_Declare(
sd
Expand Down

0 comments on commit 0828530

Please sign in to comment.