Merge pull request #28 from NexaAI/xingyu/unified_lib

unified cpu and gpu build
NexaAI · Aug 22, 2024 · 50361e5 · 50361e5
2 parents 72d93b2 + 1944e97
commit 50361e5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 186 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,15 @@
 cmake_minimum_required(VERSION 3.16)
 
+if (GGML_CUDA OR GGML_METAL)
+    set(EMPTY_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/nexa/gguf/lib/empty_file.txt")
+    add_custom_command(
+        OUTPUT ${EMPTY_FILE_PATH}
+        COMMAND ${CMAKE_COMMAND} -E touch ${EMPTY_FILE_PATH}
+        COMMENT "Creating an empty file because MY_FEATURE is ON"
+    )    
+    add_custom_target(create_empty_file ALL DEPENDS ${EMPTY_FILE_PATH})
+endif()
+
 # Project: stable_diffusion_cpp
 project(stable_diffusion_cpp)
 
@@ -174,3 +184,4 @@ if (LLAMA_BUILD)
         endif()
     endif()
 endif()
+
diff --git a/nexa/gguf/lib_utils.py b/nexa/gguf/lib_utils.py
@@ -15,7 +15,9 @@
 
 
 def is_gpu_available():
-    return is_nexa_cuda_installed() or is_nexa_metal_installed()
+    current_dir = os.path.dirname(os.path.abspath(__file__))
+    sentinel_file_exists = os.path.exists(os.path.join(current_dir, "lib", "empty_file.txt"))
+    return sentinel_file_exists
 
 # Load the library
 def load_library(lib_base_name: str):

diff --git a/tomls/pyproject_cuda.toml b/tomls/pyproject_cuda.toml
diff --git a/tomls/pyproject_metal.toml b/tomls/pyproject_metal.toml