diff options
| -rw-r--r-- | .github/workflows/linux_build.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/mac_build.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/windows_build.yml | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 2e11e8c..a74eec9 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -13,24 +13,24 @@ jobs: matrix: config: [Release, Debug] standalone: [OFF, ON] - toolchain: [cmake/toolchain/linux-gnu.cmake, cmake/toolchain/linux-clang.cmake] + toolchain: [linux-gnu, linux-clang] steps: - uses: actions/checkout@v4 - name: Install dependencies run: sudo apt-get install cmake ninja-build libbz2-dev - name: Build run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} + cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/${{ matrix.toolchain }}.cmake cmake --build build-cmake -j - name: Create Package - if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' }} + if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' && matrix.toolchain == 'linux-gnu' }} run: | mkdir torch-release mv build-cmake/torch torch-release/ cp "$(ldconfig -p | grep libbz2.so.1.0 | tr ' ' '\n' | grep /| head -n1)" torch-release/ - name: Publish packaged artifacts - if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' }} + if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' && matrix.toolchain == 'linux-gnu' }} uses: actions/upload-artifact@v4 with: - name: torch-linux-x64-${{ matrix.toolchain }} + name: torch-linux-x64 path: torch-release
\ No newline at end of file diff --git a/.github/workflows/mac_build.yml b/.github/workflows/mac_build.yml index bf453ec..3b54f1f 100644 --- a/.github/workflows/mac_build.yml +++ b/.github/workflows/mac_build.yml @@ -13,33 +13,33 @@ jobs: matrix: config: [Release, Debug] standalone: [OFF, ON] - toolchain: [cmake/toolchain/macos-clang.cmake, cmake/toolchain/macos-clang-llvm.cmake, cmake/toolchain/macos-gnu.cmake] + toolchain: [macos-clang, macos-clang-llvm, macos-gnu] steps: - uses: actions/checkout@v4 - name: Install dependencies run: brew install cmake ninja xcodes - name: Download llvm - if: ${{ matrix.toolchain == 'cmake/toolchain/macos-clang-llvm.cmake' }} + if: ${{ matrix.toolchain == 'macos-clang-llvm' }} run: | brew install llvm lld echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Download gnu - if: ${{ matrix.toolchain == 'cmake/toolchain/macos-gnu.cmake' }} + if: ${{ matrix.toolchain == 'macos-gnu' }} run: | brew install gcc echo "/opt/homebrew/opt/gcc/bin" >> $GITHUB_PATH - name: Build run: | - cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} + cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/${{ matrix.toolchain }}.cmake cmake --build build-cmake -j - name: Create Package - if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' }} + if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' && matrix.toolchain == 'macos-clang' }} run: | mkdir torch-release mv build-cmake/torch torch-release/ - name: Publish packaged artifacts - if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' }} + if: ${{ matrix.config == 'Release' && matrix.standalone == 'ON' && matrix.toolchain == 'macos-clang' }} uses: actions/upload-artifact@v4 with: - name: torch-mac-bin-${{ matrix.toolchain }} + name: torch-mac-bin path: torch-release diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 5391d3a..3ef6b6e 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -12,19 +12,19 @@ jobs: strategy: matrix: config: [Release, Debug] - toolchain: [cmake/toolchain/windows-msvc.cmake, cmake/toolchain/windows-clang-cl.cmake] + toolchain: [windows-msvc, windows-clang-cl] standalone: [OFF, ON] generate: [Visual Studio 17 2022, Ninja] arch: [x64, Win32] exclude: - - toolchain: cmake/toolchain/windows-clang-cl.cmake + - toolchain: windows-clang-cl arch: Win32 steps: - uses: actions/checkout@v4 - name: Build Visual Studio if: ${{ matrix.generate == 'Visual Studio 17 2022' }} run: | - cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain }}" -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} + cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_TOOLCHAIN_FILE="cmake/toolchain/${{ matrix.toolchain }}.cmake" -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} cmake --build ./build/${{ matrix.arch }} - name: Setup Variables if: ${{ matrix.generate == 'Ninja' }} @@ -34,7 +34,7 @@ jobs: - name: Build Ninja if: ${{ matrix.generate == 'Ninja' }} run: | - cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} + cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_TOOLCHAIN_FILE="cmake/toolchain/${{ matrix.toolchain }}.cmake" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} cmake --build ./build/${{ matrix.arch }} - name: Publish packaged artifacts if: ${{ matrix.config == 'Release' && matrix.generate == 'Visual Studio 17 2022' && matrix.standalone == 'ON' }} |