diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e108748d..2b48ad0bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,12 +133,12 @@ jobs: include: - build: "amd64-avx2" defines: "-DLLAMA_NATIVE=OFF" - # - build: "amd64-avx" - # defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF" - # - build: "amd64-avx512" - # defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF" - # - build: "amd64-vulkan" - # defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF" + - build: "amd64-avx" + defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF" + - build: "amd64-avx512" + defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF" + - build: "amd64-vulkan" + defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF" # - build: "arm64" # defines: "-A ARM64 -DLLAMA_NATIVE=OFF" @@ -224,8 +224,8 @@ jobs: include: - cuda: "12-0" flags: "-DCUDA_12_0=ON -DCUDA_11_7=OFF" - # - cuda: "11-7" - # flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON" + - cuda: "11-7" + flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON" steps: - name: Clone @@ -464,12 +464,12 @@ jobs: include: - build: "amd64-avx2" defines: "-DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - build: "amd64-avx" - # defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - build: "amd64-avx512" - # defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - build: "amd64-vulkan" - # defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - build: "amd64-avx" + defines: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - build: "amd64-avx512" + defines: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_BLAS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - build: "amd64-vulkan" + defines: "-DLLAMA_VULKAN=ON -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" # - build: "arm64" # defines: "-A ARM64 -DLLAMA_NATIVE=OFF -DLLAMA_BUILD_SERVER=ON -DBUILD_SHARED_LIBS=ON" @@ -592,21 +592,21 @@ jobs: - cuda: "12-0" instructions: "-DLLAMA_NATIVE=OFF" flags: "-DCUDA_12_0=ON -DCUDA_11_7=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - cuda: "12-0" - # instructions: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF" - # flags: "-DCUDA_12_0=ON -DCUDA_11_7=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - cuda: "12-0" - # instructions: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF" - # flags: "-DCUDA_12_0=ON -DCUDA_11_7=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - cuda: "11-7" - # instructions: "-DLLAMA_NATIVE=OFF" - # flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - cuda: "11-7" - # instructions: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF" - # flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" - # - cuda: "11-7" - # instructions: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF" - # flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - cuda: "12-0" + instructions: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF" + flags: "-DCUDA_12_0=ON -DCUDA_11_7=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - cuda: "12-0" + instructions: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF" + flags: "-DCUDA_12_0=ON -DCUDA_11_7=OFF -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - cuda: "11-7" + instructions: "-DLLAMA_NATIVE=OFF" + flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - cuda: "11-7" + instructions: "-DLLAMA_AVX2=OFF -DLLAMA_NATIVE=OFF" + flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" + - cuda: "11-7" + instructions: "-DLLAMA_AVX512=ON -DLLAMA_NATIVE=OFF" + flags: "-DCUDA_12_0=OFF -DCUDA_11_7=ON -DLLAMA_BUILD_SERVER=ON -DLLAMA_CUDA=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DWHISPER_SDL2=ON" steps: - name: Setup VSWhere.exe @@ -651,6 +651,7 @@ jobs: id: cmake_build shell: cmd run: | + cd cortex-cpp cmake -S ./nitro_deps -B ./build_deps/nitro_deps cmake --build ./build_deps/nitro_deps --config Release mkdir -p build @@ -663,14 +664,15 @@ jobs: shell: cmd run: | set PATH=%PATH%;C:\Program Files\7-Zip\ + cd cortex-cpp mkdir .\build\Release\engines\cortex.llamacpp\ robocopy .\build\engines\cortex.llamacpp\ .\build\Release\engines\cortex.llamacpp\ engine.dll robocopy build_deps\_install\bin\ .\build\Release\ zlib.dll robocopy build\bin\Release\ .\build\Release\ llama.dll robocopy build\bin\Release\ .\build\Release\ whisper.dll - robocopy .github\patches\windows\ .\build\Release\ msvcp140.dll - robocopy .github\patches\windows\ .\build\Release\ vcruntime140_1.dll - robocopy .github\patches\windows\ .\build\Release\ vcruntime140.dll + robocopy ..\.github\patches\windows\ .\build\Release\ msvcp140.dll + robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140_1.dll + robocopy ..\.github\patches\windows\ .\build\Release\ vcruntime140.dll robocopy "$env:SDL2_DIR\..\lib\2.28.5\" .\build\Release\ SDL2.dll dotnet tool install --global AzureSignTool %USERPROFILE%\.dotnet\tools\azuresigntool.exe sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.globalsign.com/tsa/r6advanced1 -v ".\build\Release\nitro.exe" @@ -682,7 +684,7 @@ jobs: if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' with: name: nitro-win-${{ matrix.instructions }}-cuda-${{ matrix.cuda }} - path: ./build/Release + path: ./cortex-cpp/build/Release - uses: actions/upload-release-asset@v1.0.1 if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') @@ -690,7 +692,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-draft-release.outputs.upload_url }} - asset_path: ./nitro.tar.gz + asset_path: ./cortex-cpp/nitro.tar.gz asset_name: nitro-${{ needs.create-draft-release.outputs.version }}-win-${{ matrix.instructions }}-cuda-${{ matrix.cuda }}.tar.gz asset_content_type: application/gzip