File tree Expand file tree Collapse file tree 10 files changed +603
-101
lines changed Expand file tree Collapse file tree 10 files changed +603
-101
lines changed Original file line number Diff line number Diff line change @@ -778,6 +778,7 @@ jobs:
778778 cmake -S . -B build ${{ matrix.defines }} `
779779 -DCURL_LIBRARY="$env:CURL_PATH/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:CURL_PATH/include"
780780 cmake --build build --config Release -j ${env:NUMBER_OF_PROCESSORS}
781+ cp $env:CURL_PATH/bin/libcurl-*.dll build/bin/Release
781782
782783 - name : Add libopenblas.dll
783784 id : add_libopenblas_dll
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ sd=`dirname $0`
3939cd $sd /../
4040SRC=` pwd`
4141
42- CMAKE_EXTRA=" -DLLAMA_FATAL_WARNINGS=ON -DLLAMA_CURL=OFF "
42+ CMAKE_EXTRA=" -DLLAMA_FATAL_WARNINGS=ON -DLLAMA_CURL=ON "
4343
4444if [ ! -z ${GG_BUILD_METAL} ]; then
4545 CMAKE_EXTRA=" ${CMAKE_EXTRA} -DGGML_METAL=ON -DGGML_METAL_USE_BF16=ON"
Original file line number Diff line number Diff line change @@ -767,6 +767,9 @@ bool fs_validate_filename(const std::string & filename) {
767767 return true ;
768768}
769769
770+ #include < iostream>
771+
772+
770773// returns true if successful, false otherwise
771774bool fs_create_directory_with_parents (const std::string & path) {
772775#ifdef _WIN32
@@ -784,9 +787,16 @@ bool fs_create_directory_with_parents(const std::string & path) {
784787 // process path from front to back, procedurally creating directories
785788 while ((pos_slash = path.find (' \\ ' , pos_slash)) != std::string::npos) {
786789 const std::wstring subpath = wpath.substr (0 , pos_slash);
787- const wchar_t * test = subpath.c_str ();
788790
789- const bool success = CreateDirectoryW (test, NULL );
791+ pos_slash += 1 ;
792+
793+ // skip the drive letter, in some systems it can return an access denied error
794+ if (subpath.length () == 2 && subpath[1 ] == ' :' ) {
795+ continue ;
796+ }
797+
798+ const bool success = CreateDirectoryW (subpath.c_str (), NULL );
799+
790800 if (!success) {
791801 const DWORD error = GetLastError ();
792802
@@ -800,8 +810,6 @@ bool fs_create_directory_with_parents(const std::string & path) {
800810 return false ;
801811 }
802812 }
803-
804- pos_slash += 1 ;
805813 }
806814
807815 return true ;
Original file line number Diff line number Diff line change @@ -503,6 +503,9 @@ static __m256 __lasx_xvreplfr2vr_s(const float val) {
503503// TODO: move to ggml-threading
504504void ggml_barrier (struct ggml_threadpool * tp );
505505
506+ void ggml_threadpool_chunk_set (struct ggml_threadpool * tp , int value );
507+ int ggml_threadpool_chunk_add (struct ggml_threadpool * tp , int value );
508+
506509#ifdef __cplusplus
507510}
508511#endif
You can’t perform that action at this time.
0 commit comments