Merge pull request #891 from texasich:clean-gcc15-fix

PiperOrigin-RevId: 895822257
2026-04-07 04:32:10 -07:00 · 2026-04-07 04:32:10 -07:00 · 366b143fbf
parent 70513a1e0f f62856eccd
commit 366b143fbf
4 changed files with 78 additions and 38 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,6 +1,5 @@
 name: build

-# Trigger on push, pull request, or via manual dispatch.
 on:
  push:
  pull_request:
@ -10,56 +9,82 @@ on:
 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} (${{ matrix.preset }}) ${{ matrix.build_type }}
+    name: ${{ matrix.name }}
    timeout-minutes: 30

    strategy:
      fail-fast: false
      matrix:
-        # When adding another, also add to copybara's github_check_runs.
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        build_type: ['Release']
-        preset: ['make', 'windows']
-        exclude:
-          - os: ubuntu-latest
-            preset: windows
-          - os: macos-latest
-            preset: windows
-          - os: windows-latest
+        include:
+          - name: ubuntu-latest (make) Release
+            os: ubuntu-latest
            preset: make
+            build_type: Release
+            cc: gcc-13
+            cxx: g++-13
+
+          - name: ubuntu-latest (gcc-15) Release
+            os: ubuntu-latest
+            preset: make
+            build_type: Release
+            cc: gcc-15
+            cxx: g++-15
+
+          - name: macos-latest (make) Release
+            os: macos-latest
+            preset: make
+            build_type: Release
+            cc: clang
+            cxx: clang++
+
+          - name: windows-latest (windows) Release
+            os: windows-latest
+            preset: windows
+            build_type: Release

    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.preset }}-${{ matrix.build_type }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.name }}
      cancel-in-progress: true

    steps:
-    - uses: actions/checkout@v6
+      - uses: actions/checkout@v6

-    # Set up ccache
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2
+      - name: Install Linux toolchain
+        if: runner.os == 'Linux'
+        run: |
+          if [[ "${{ matrix.cc }}" == "gcc-15" ]]; then
+            sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+          fi
+          sudo apt-get update
+          sudo apt-get install -y ${{ matrix.cc }} ${{ matrix.cxx }}

-    - name: Configure CMake
-      run: >
-        cmake --preset ${{ matrix.preset }}
-        -S ${{ github.workspace }} -B ${{ github.workspace }}/build
-        -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        -D CMAKE_C_COMPILER_LAUNCHER=ccache
-        -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2

-    - name: Build
-      run: cmake --build ${{ github.workspace }}/build --preset ${{ matrix.preset }} --config ${{ matrix.build_type }} -j 4
+      - name: Configure CMake
+        run: >
+          cmake --preset ${{ matrix.preset }}
+          -S ${{ github.workspace }} -B ${{ github.workspace }}/build
+          -D CMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -D CMAKE_C_COMPILER=${{ matrix.cc || '' }}
+          -D CMAKE_CXX_COMPILER=${{ matrix.cxx || '' }}
+          -D CMAKE_C_COMPILER_LAUNCHER=ccache
+          -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
+          -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+          ${{ matrix.cc == 'gcc-15' && '-DCMAKE_CXX_FLAGS=-Wno-error=missing-declarations -Wno-error=missing-field-initializers' || '' }}

-    - name: Archive production artifacts
-      uses: actions/upload-artifact@v6
-      with:
-        name: gemma-${{ matrix.os }}-${{ matrix.preset }}-${{ matrix.build_type }}
-        path: |
-          ${{ github.workspace }}/build/${{ matrix.build_type }}/gemma.exe
-          ${{ github.workspace }}/build/${{ matrix.build_type }}/libgemma.lib
-          ${{ github.workspace }}/build/gemma
-          ${{ github.workspace }}/build/libgemma.a
+      - name: Build
+        run: cmake --build ${{ github.workspace }}/build --preset ${{ matrix.preset }} --config ${{ matrix.build_type }} -j 4
+
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: gemma-${{ matrix.os }}-${{ matrix.preset }}-${{ matrix.build_type }}-${{ matrix.cc || 'default' }}
+          path: |
+            ${{ github.workspace }}/build/${{ matrix.build_type }}/gemma.exe
+            ${{ github.workspace }}/build/${{ matrix.build_type }}/libgemma.lib
+            ${{ github.workspace }}/build/gemma
+            ${{ github.workspace }}/build/libgemma.a

  bazel:
    runs-on: ubuntu-latest
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -39,9 +39,16 @@ endif()
 FetchContent_Declare(highway GIT_REPOSITORY https://github.com/google/highway.git GIT_TAG c971dbe61bd2751923e3458666450bf95dfbbd98 EXCLUDE_FROM_ALL)
 FetchContent_MakeAvailable(highway)

+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
+   CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
+  # Gemma does not currently use AVX10.2-specific Highway paths, and GCC 15
+  # builds in CI can reject Highway's AVX10.2 target attribute.
+  target_compile_definitions(hwy PUBLIC HWY_DISABLED_TARGETS=HWY_AVX10_2)
+endif()
+
 ## Note: absl needs to be installed by sentencepiece. This will only happen if
 ## cmake is invoked with -DSPM_ENABLE_SHARED=OFF and -DSPM_ABSL_PROVIDER=module
-FetchContent_Declare(sentencepiece GIT_REPOSITORY https://github.com/google/sentencepiece GIT_TAG 53de76561cfc149d3c01037f0595669ad32a5e7c EXCLUDE_FROM_ALL)
+FetchContent_Declare(sentencepiece GIT_REPOSITORY https://github.com/google/sentencepiece GIT_TAG 9045b2f60fa2b323dfac0eaef8fc17565036f9f9 EXCLUDE_FROM_ALL)
 FetchContent_MakeAvailable(sentencepiece)

 FetchContent_Declare(json GIT_REPOSITORY https://github.com/nlohmann/json.git GIT_TAG 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03 EXCLUDE_FROM_ALL)
--- a/examples/hello_world/CMakeLists.txt
+++ b/examples/hello_world/CMakeLists.txt
@ -20,6 +20,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include(FetchContent)
 FetchContent_Declare(highway GIT_REPOSITORY https://github.com/google/highway.git GIT_TAG c971dbe61bd2751923e3458666450bf95dfbbd98)
 FetchContent_MakeAvailable(highway)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
+   CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
+  target_compile_definitions(hwy PUBLIC HWY_DISABLED_TARGETS=HWY_AVX10_2)
+endif()
 FetchContent_Declare(sentencepiece GIT_REPOSITORY https://github.com/google/sentencepiece GIT_TAG 9045b2f60fa2b323dfac0eaef8fc17565036f9f9)
 FetchContent_MakeAvailable(sentencepiece)

--- a/examples/simplified_gemma/CMakeLists.txt
+++ b/examples/simplified_gemma/CMakeLists.txt
@ -20,7 +20,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 include(FetchContent)
 FetchContent_Declare(highway GIT_REPOSITORY https://github.com/google/highway.git GIT_TAG c971dbe61bd2751923e3458666450bf95dfbbd98)
 FetchContent_MakeAvailable(highway)
-FetchContent_Declare(sentencepiece GIT_REPOSITORY https://github.com/google/sentencepiece GIT_TAG 53de76561cfc149d3c01037f0595669ad32a5e7c)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
+   CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15)
+  target_compile_definitions(hwy PUBLIC HWY_DISABLED_TARGETS=HWY_AVX10_2)
+endif()
+FetchContent_Declare(sentencepiece GIT_REPOSITORY https://github.com/google/sentencepiece GIT_TAG 9045b2f60fa2b323dfac0eaef8fc17565036f9f9)
 FetchContent_MakeAvailable(sentencepiece)