Update Cmake sources path

eoctet · Jun 27, 2024 · f85968f · f85968f
1 parent d701c9b
commit f85968f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/llama-java-core/build.sh b/llama-java-core/build.sh
@@ -17,7 +17,7 @@ CMAKE_ARGS="-DLLAMA_BLAS=ON -DLLAMA_BLAS_VENDOR=OpenBLAS -DBUILD_SHARED_LIBS=ON
 
 if [ "$1" == "macos" ]; then
   # Manually compile Metal to be compatible with certain Macbook versions
-  xcrun -sdk macosx metal -o ggml_metal.ir -c ggml-metal.metal
+  xcrun -sdk macosx metal -o ggml_metal.ir -c ggml/src/ggml-metal.metal
   xcrun -sdk macosx metallib -o default.metallib ggml_metal.ir
   CMAKE_ARGS="-DBUILD_SHARED_LIBS=ON -DLLAMA_NATIVE=OFF -DLLAMA_METAL=ON"
   echo "=> Cmake in macos."

diff --git a/llama-java-core/llamajava/CMakeLists.txt b/llama-java-core/llamajava/CMakeLists.txt
@@ -5,11 +5,11 @@ add_library(${TARGET}
             llamajava.cpp
             ${PROJECT_SOURCE_DIR}/common/grammar-parser.h
             ${PROJECT_SOURCE_DIR}/common/grammar-parser.cpp
-            ${PROJECT_SOURCE_DIR}/llama.cpp
-            ${PROJECT_SOURCE_DIR}/llama.h
-            ${PROJECT_SOURCE_DIR}/unicode.h
-            ${PROJECT_SOURCE_DIR}/unicode.cpp
-            ${PROJECT_SOURCE_DIR}/unicode-data.cpp
+            ${PROJECT_SOURCE_DIR}/src/llama.cpp
+            ${PROJECT_SOURCE_DIR}/include/llama.h
+            ${PROJECT_SOURCE_DIR}/src/unicode.h
+            ${PROJECT_SOURCE_DIR}/src/unicode.cpp
+            ${PROJECT_SOURCE_DIR}/src/unicode-data.cpp
         )
 
 target_include_directories(${TARGET} PRIVATE llamajava)