forked from ggerganov/whisper.cpp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'ggerganov/master'
* ggerganov/master: whisper : Replace WHISPER_PRINT_DEBUG with WHISPER_LOG_DEBUG (ggerganov#1681) sync : ggml (ggml_scale, ggml_row_size, etc.) (ggerganov#1677) docker : Dockerize whisper.cpp (ggerganov#1674) CI : Add coverage for talk-llama when WHISPER_CUBLAS=1 (ggerganov#1672) examples : Revert CMakeLists.txt for talk-llama (ggerganov#1669) cmake : set default CUDA architectures (ggerganov#1667)
- Loading branch information
Showing
26 changed files
with
3,716 additions
and
1,646 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| ARG UBUNTU_VERSION=22.04 | ||
| # This needs to generally match the container host's environment. | ||
| ARG CUDA_VERSION=12.3.1 | ||
| # Target the CUDA build image | ||
| ARG BASE_CUDA_DEV_CONTAINER=nvidia/cuda:${CUDA_VERSION}-devel-ubuntu${UBUNTU_VERSION} | ||
| # Target the CUDA runtime image | ||
| ARG BASE_CUDA_RUN_CONTAINER=nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_VERSION} | ||
|
|
||
| FROM ${BASE_CUDA_DEV_CONTAINER} AS build | ||
| WORKDIR /app | ||
|
|
||
| # Unless otherwise specified, we make a fat build. | ||
| ARG CUDA_DOCKER_ARCH=all | ||
| # Set nvcc architecture | ||
| ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH} | ||
| # Enable cuBLAS | ||
| ENV WHISPER_CUBLAS=1 | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y build-essential \ | ||
| && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* | ||
|
|
||
| COPY .. . | ||
| RUN make | ||
|
|
||
| FROM ${BASE_CUDA_RUN_CONTAINER} AS runtime | ||
| WORKDIR /app | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y curl ffmpeg \ | ||
| && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* | ||
|
|
||
| COPY --from=build /app /app | ||
| ENTRYPOINT [ "bash", "-c" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| FROM ubuntu:22.04 AS build | ||
| WORKDIR /app | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y build-essential \ | ||
| && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* | ||
|
|
||
| COPY .. . | ||
| RUN make | ||
|
|
||
| FROM ubuntu:22.04 AS runtime | ||
| WORKDIR /app | ||
|
|
||
| RUN apt-get update && \ | ||
| apt-get install -y curl ffmpeg \ | ||
| && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/* | ||
|
|
||
| COPY --from=build /app /app | ||
| ENTRYPOINT [ "bash", "-c" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| name: Publish Docker image | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| push_to_registry: | ||
| name: Push Docker image to Docker Hub | ||
| if: github.event.pull_request.draft == false | ||
|
|
||
| runs-on: ubuntu-latest | ||
| env: | ||
| COMMIT_SHA: ${{ github.sha }} | ||
| strategy: | ||
| matrix: | ||
| config: | ||
| - { tag: "main", dockerfile: ".devops/main.Dockerfile", platform: "linux/amd64,linux/arm64" } | ||
| - { tag: "main-cuda", dockerfile: ".devops/main-cuda.Dockerfile", platform: "linux/amd64" } | ||
|
|
||
| steps: | ||
| - name: Check out the repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v3 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| - name: Log in to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.repository_owner }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Build and push Docker image (versioned) | ||
| if: github.event_name == 'push' | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| push: true | ||
| platforms: ${{ matrix.config.platforms }} | ||
| tags: "ghcr.io/${{ github.repository }}:${{ matrix.config.tag }}-${{ env.COMMIT_SHA }}" | ||
| file: ${{ matrix.config.dockerfile }} | ||
|
|
||
| - name: Build and push Docker image (tagged) | ||
| uses: docker/build-push-action@v4 | ||
| with: | ||
| context: . | ||
| push: ${{ github.event_name == 'push' }} | ||
| platforms: ${{ matrix.config.platforms }} | ||
| tags: "ghcr.io/${{ github.repository }}:${{ matrix.config.tag }}" | ||
| file: ${{ matrix.config.dockerfile }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,14 @@ | ||
| if (WHISPER_SDL2) | ||
| # talk-llama | ||
| set(TARGET talk-llama) | ||
| #add_executable(${TARGET} talk-llama.cpp llama.cpp) | ||
| #target_include_directories(${TARGET} PRIVATE ${SDL2_INCLUDE_DIRS}) | ||
| #target_link_libraries(${TARGET} PRIVATE common common-sdl whisper ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) | ||
|
|
||
| # TODO: this is temporary | ||
| # need to export ggml symbols for MSVC, but too lazy .. | ||
| add_executable(${TARGET} | ||
| talk-llama.cpp | ||
| llama.cpp | ||
| ../common.cpp | ||
| ../common-sdl.cpp | ||
| ../../ggml.c | ||
| ../../ggml-alloc.c | ||
| ../../ggml-backend.c | ||
| ../../ggml-quants.c | ||
| ../../whisper.cpp) | ||
| add_executable(${TARGET} talk-llama.cpp llama.cpp) | ||
| target_include_directories(${TARGET} PRIVATE ${SDL2_INCLUDE_DIRS}) | ||
| target_link_libraries(${TARGET} PRIVATE common common-sdl whisper ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) | ||
|
|
||
| if(WIN32) | ||
| # It requires Windows 8.1 or later for PrefetchVirtualMemory | ||
| target_compile_definitions(${TARGET} PRIVATE -D_WIN32_WINNT=0x0602) | ||
| # It requires Windows 8.1 or later for PrefetchVirtualMemory | ||
| target_compile_definitions(${TARGET} PRIVATE -D_WIN32_WINNT=0x0602) | ||
| endif() | ||
|
|
||
| target_include_directories(${TARGET} PRIVATE ${SDL2_INCLUDE_DIRS} ../../) | ||
| target_link_libraries(${TARGET} PRIVATE ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) | ||
|
|
||
| include(DefaultTargetOptions) | ||
| endif () |
Oops, something went wrong.