Skip to content

Commit 59aa38f

Browse files
committed
update doc; update CI (ios/.. removed)
1 parent fe7983f commit 59aa38f

File tree

4 files changed

+21
-168
lines changed

4 files changed

+21
-168
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -132,23 +132,6 @@ jobs:
132132
cmake --build build --config Release -j $(nproc)
133133
cmake --build build --config Release --target libchatllm -j $(nproc)
134134
135-
- name: Test
136-
id: cmake_test
137-
run: |
138-
cd build
139-
ctest -L 'main|curl' --verbose --timeout 900
140-
141-
- name: Test llama2c conversion
142-
id: llama2c_test
143-
run: |
144-
cd build
145-
echo "Fetch tokenizer"
146-
wget https://huggingface.co/karpathy/tinyllamas/resolve/main/stories260K/tok512.bin
147-
echo "Fetch llama2c model"
148-
wget https://huggingface.co/karpathy/tinyllamas/resolve/main/stories260K/stories260K.bin
149-
./bin/llama-convert-llama2c-to-ggml --copy-vocab-from-model ./tok512.bin --llama2c-model stories260K.bin --llama2c-output-model stories260K.gguf
150-
./bin/llama-cli -m stories260K.gguf -p "One day, Lily met a Shoggoth" -n 500 -c 256
151-
152135
ubuntu-latest-cmake-sanitizer:
153136
runs-on: ubuntu-latest
154137

@@ -472,155 +455,6 @@ jobs:
472455
build-linux-cross:
473456
uses: ./.github/workflows/build-linux-cross.yml
474457

475-
macOS-latest-cmake-ios:
476-
runs-on: macos-latest
477-
478-
steps:
479-
- name: Clone
480-
id: checkout
481-
uses: actions/checkout@v4
482-
483-
- name: ccache
484-
uses: hendrikmuhs/[email protected]
485-
with:
486-
key: macOS-latest-cmake-ios
487-
evict-old-files: 1d
488-
489-
- name: Dependencies
490-
id: depends
491-
continue-on-error: true
492-
run: |
493-
brew update
494-
495-
- name: Build
496-
id: cmake_build
497-
run: |
498-
sysctl -a
499-
cmake -B build -G Xcode \
500-
-DGGML_METAL_USE_BF16=ON \
501-
-DGGML_METAL_EMBED_LIBRARY=ON \
502-
-DLLAMA_BUILD_COMMON=OFF \
503-
-DLLAMA_BUILD_EXAMPLES=OFF \
504-
-DLLAMA_BUILD_TOOLS=OFF \
505-
-DLLAMA_BUILD_TESTS=OFF \
506-
-DLLAMA_BUILD_SERVER=OFF \
507-
-DCMAKE_SYSTEM_NAME=iOS \
508-
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
509-
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
510-
cmake --build build --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
511-
512-
macOS-latest-cmake-tvos:
513-
runs-on: macos-latest
514-
515-
steps:
516-
- name: Clone
517-
id: checkout
518-
uses: actions/checkout@v4
519-
520-
- name: ccache
521-
uses: hendrikmuhs/[email protected]
522-
with:
523-
key: macOS-latest-cmake-tvos
524-
evict-old-files: 1d
525-
526-
- name: Dependencies
527-
id: depends
528-
continue-on-error: true
529-
run: |
530-
brew update
531-
532-
- name: Build
533-
id: cmake_build
534-
run: |
535-
sysctl -a
536-
cmake -B build -G Xcode \
537-
-DGGML_METAL_USE_BF16=ON \
538-
-DGGML_METAL_EMBED_LIBRARY=ON \
539-
-DLLAMA_BUILD_COMMON=OFF \
540-
-DLLAMA_BUILD_EXAMPLES=OFF \
541-
-DLLAMA_BUILD_TOOLS=OFF \
542-
-DLLAMA_BUILD_TESTS=OFF \
543-
-DLLAMA_BUILD_SERVER=OFF \
544-
-DCMAKE_SYSTEM_NAME=tvOS \
545-
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
546-
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
547-
cmake --build build --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
548-
549-
macOS-latest-cmake-visionos:
550-
runs-on: macos-latest
551-
552-
steps:
553-
- name: Clone
554-
id: checkout
555-
uses: actions/checkout@v4
556-
557-
- name: Dependencies
558-
id: depends
559-
continue-on-error: true
560-
run: |
561-
brew update
562-
563-
- name: Build
564-
id: cmake_build
565-
run: |
566-
sysctl -a
567-
cmake -B build -G Xcode \
568-
-DGGML_METAL_USE_BF16=ON \
569-
-DGGML_METAL_EMBED_LIBRARY=ON \
570-
-DLLAMA_BUILD_COMMON=OFF \
571-
-DLLAMA_BUILD_EXAMPLES=OFF \
572-
-DLLAMA_BUILD_TOOLS=OFF \
573-
-DLLAMA_BUILD_TESTS=OFF \
574-
-DLLAMA_BUILD_SERVER=OFF \
575-
-DCMAKE_SYSTEM_NAME=visionOS \
576-
-DCMAKE_OSX_DEPLOYMENT_TARGET=1.0 \
577-
-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=ggml
578-
cmake --build build --config Release -j $(sysctl -n hw.logicalcpu) -- CODE_SIGNING_ALLOWED=NO
579-
580-
macOS-latest-swift:
581-
runs-on: macos-latest
582-
583-
strategy:
584-
matrix:
585-
destination: ['generic/platform=macOS', 'generic/platform=iOS', 'generic/platform=tvOS']
586-
587-
steps:
588-
- name: Clone
589-
id: checkout
590-
uses: actions/checkout@v4
591-
592-
- name: ccache
593-
uses: hendrikmuhs/[email protected]
594-
with:
595-
key: macOS-latest-swift
596-
evict-old-files: 1d
597-
598-
- name: Dependencies
599-
id: depends
600-
continue-on-error: true
601-
run: |
602-
brew update
603-
604-
- name: Build llama.cpp with CMake
605-
id: cmake_build
606-
run: |
607-
sysctl -a
608-
cmake -B build -G Xcode \
609-
-DGGML_METAL_USE_BF16=ON \
610-
-DGGML_METAL_EMBED_LIBRARY=ON \
611-
-DLLAMA_CURL=OFF \
612-
-DLLAMA_BUILD_EXAMPLES=OFF \
613-
-DLLAMA_BUILD_TOOLS=OFF \
614-
-DLLAMA_BUILD_TESTS=OFF \
615-
-DLLAMA_BUILD_SERVER=OFF \
616-
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
617-
cmake --build build --config Release -j $(sysctl -n hw.logicalcpu)
618-
619-
- name: xcodebuild for swift package
620-
id: xcodebuild
621-
run: |
622-
./build-xcframework.sh
623-
624458
windows-msys2:
625459
runs-on: windows-latest
626460

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[中文版](README_zh.md) | [日本語](README_ja.md)
44

5-
[![License: MIT](https://img.shields.io/badge/license-MIT-blue)](LICENSE)
5+
[![License: MIT](https://img.shields.io/badge/license-MIT-blue)](LICENSE) [![CI](https://github.com/foldl/chatllm.cpp/actions/workflows/build.yml/badge.svg)](https://github.com/foldl/chatllm.cpp/actions/workflows/build.yml)
66

77
![](./docs/demo.gif)
88

docs/multimodal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Dependencies
44

55
To keep things simple, external tools are used for accessing and processing multimedia data.
6-
These tools should available in OS's searching paths.
6+
These tools should be available in OS's searching paths.
77

88
* **[ffmpeg](https://ffmpeg.org/)**: v7.0.2 or compatible
99

scripts/install-oneapi.bat

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
:: MIT license
2+
:: Copyright (C) 2024 Intel Corporation
3+
:: SPDX-License-Identifier: MIT
4+
5+
6+
set URL=%1
7+
set COMPONENTS=%2
8+
9+
curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5
10+
start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log
11+
del %TEMP%\webimage.exe
12+
if "%COMPONENTS%"=="" (
13+
webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
14+
) else (
15+
webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
16+
)
17+
set installer_exit_code=%ERRORLEVEL%
18+
rd /s/q "webimage_extracted"
19+
exit /b %installer_exit_code%

0 commit comments

Comments
 (0)