Merge pull request #2 from ring-c/main

Cublas support from upstream
seasonjs · Apr 12, 2024 · fd4a1d4 · fd4a1d4
2 parents 2c60396 + 50ff108
commit fd4a1d4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 /cmake-build-release/
 /cmake-build-debug-visual-studio/
 /cmake-build-release-visual-studio/
+/.idea
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/stable-diffusion.cpp-build.iml b/.idea/stable-diffusion.cpp-build.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,6 +29,7 @@ option(SD_AVX "sd: enable AVX" ON)
 option(SD_AVX2 "sd: enable AVX2" ON)
 option(SD_AVX512 "sd: enable AVX512" OFF)
 option(SD_FMA "sd: enable FMA" ON)
+option(SD_CUBLAS "sd: cuda backend" OFF)
 
 if (SD_AVX512)
     set(GGML_AVX512 ON)
@@ -41,6 +42,12 @@ if (SD_FMA)
     set(GGML_FMA ON)
 endif ()
 
+if(SD_CUBLAS)
+	message("Use CUBLAS as backend stable-diffusion")
+    set(GGML_CUBLAS ON)
+    add_definitions(-DSD_USE_CUBLAS)
+endif()
+
 include(sd)
 include_directories(${sd_SOURCE_DIR})