Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ggml : reorganize source code + improve CMake #865

Merged
merged 6 commits into from
Jun 26, 2024
Merged

ggml : reorganize source code + improve CMake #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
362a975
scripts : update sync [no ci]
ggerganov Jun 21, 2024
46b9bee
ggml : move headers one up [no ci]
ggerganov Jun 21, 2024
8be8952
files : reorganize + update CMake
ggerganov Jun 21, 2024
6b202fd
cmake : build normal ggml library
ggerganov Jun 25, 2024
7e44e1f
cmake : link math library to test + remove ci for code cov
ggerganov Jun 25, 2024
a7b3103
files : move public headers to include
ggerganov Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 3 additions & 33 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Configure CMake
working-directory: ./build
run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_TEST_COVERAGE=ON -DGGML_CLBLAST=ON ..
run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_CLBLAST=ON ..

- name: Build
working-directory: ./build
Expand All @@ -39,13 +39,6 @@ jobs:
working-directory: ./build
run: ctest --verbose --timeout 900

- name: Test Coverage
working-directory: ./build
run: |
llvm-profdata merge -sparse tests/*.profraw -o ggml.profdata
llvm-cov report ./bin/test-grad0 -instr-profile=ggml.profdata
llvm-cov report ./bin/test-opt -instr-profile=ggml.profdata

test-macos-metal:
runs-on: macos-13
env:
Expand All @@ -61,7 +54,7 @@ jobs:

- name: Configure CMake
working-directory: ./build
run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_TEST_COVERAGE=ON -DGGML_METAL=OFF ..
run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_METAL=OFF ..

- name: Build
working-directory: ./build
Expand All @@ -71,13 +64,6 @@ jobs:
working-directory: ./build
run: ctest --verbose --timeout 900

- name: Test Coverage
working-directory: ./build
run: |
xcrun llvm-profdata merge -sparse tests/*.profraw -o ggml.profdata
xcrun llvm-cov report ./bin/test-grad0 -instr-profile=ggml.profdata
xcrun llvm-cov report ./bin/test-opt -instr-profile=ggml.profdata

build:

strategy:
Expand Down Expand Up @@ -112,7 +98,7 @@ jobs:

- name: Configure CMake
working-directory: ./build
run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_TEST_COVERAGE=ON -DGGML_METAL=OFF ..
run: cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGGML_METAL=OFF ..

- name: Build
working-directory: ./build
Expand All @@ -121,19 +107,3 @@ jobs:
- name: Test
working-directory: ./build
run: ctest --verbose --timeout 900

- name: Test Coverage for Ubuntu
if: matrix.os == 'ubuntu-latest'
working-directory: ./build
run: |
llvm-profdata merge -sparse tests/*.profraw -o ggml.profdata
llvm-cov report ./bin/test-grad0 -instr-profile=ggml.profdata
llvm-cov report ./bin/test-opt -instr-profile=ggml.profdata

- name: Test Coverage for MacOS
if: matrix.os == 'macos-latest'
working-directory: ./build
run: |
xcrun llvm-profdata merge -sparse tests/*.profraw -o ggml.profdata
xcrun llvm-cov report ./bin/test-grad0 -instr-profile=ggml.profdata
xcrun llvm-cov report ./bin/test-opt -instr-profile=ggml.profdata
11 changes: 2 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
build/
build-blas/
build-debug/
build-release/
build-sanitize-addr/
build-sanitize-thread/
build-cov/
build-ci-debug/
build-ci-release/
build-cublas/
build-*/
out/
tmp/
models/
Expand All @@ -19,6 +11,7 @@ CMakeSettings.json
.vscode/
.clangd

.venv/
.exrc
.cache
.DS_Store
Expand Down
Loading
Loading