From 1243be71c4aa692aa9e828e0aade04a5c5285bf6 Mon Sep 17 00:00:00 2001 From: Dan Zheng Date: Sun, 25 Feb 2024 04:33:39 -0800 Subject: [PATCH] Copybara import of the project: -- e0179bad839b808265948e0141feba0844264a9d by Dan Zheng : Rename BUILD to BUILD.bazel. This fixes an error on macOS due to `build` and `BUILD` having conflicting names. -- 74b27074e10b7fcca2cac42aaae3637bea39d11b by Dan Zheng : Enable macos-latest in GitHub Actions CI. -- c08de58e6a58f685d84c9112ca2e74d354ecee77 by Dan Zheng : Fix concurrency key in GitHub Actions. Use matrix configuration in concurrency key. COPYBARA_INTEGRATE_REVIEW=https://github.com/google/gemma.cpp/pull/36 from dan-zheng:rename-build-bzl b4b978f02bee169ed83737af12714d1b66e3625d PiperOrigin-RevId: 610156681 --- .github/workflows/build.yml | 8 +++--- BUILD.bazel | 51 ------------------------------------- 2 files changed, 4 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 929e140..b0d4b6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,11 @@ -name: Build +name: build # Trigger on push or via manual dispatch. on: [push, workflow_dispatch] jobs: build: - runs-on: ${{matrix.os}} + runs-on: ${{ matrix.os }} name: ${{ matrix.os }} ${{ matrix.type }} timeout-minutes: 30 @@ -13,10 +13,10 @@ jobs: fail-fast: false matrix: type: ['Release'] - os: ['ubuntu-latest'] + os: ['ubuntu-latest', 'macos-latest'] concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.type }} cancel-in-progress: true steps: diff --git a/BUILD.bazel b/BUILD.bazel index 190690b..18dad30 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -114,54 +114,3 @@ cc_binary( "//:thread_pool", ], ) - -# copybara:strip_begin -cc_binary( - name = "run_csv", - srcs = [ - "run_csv.cc", - ], - deps = [ - ":app", - ":args", - ":gemma_lib", - "//compression:compress", - # copybara:import_next_line:hwy - "//:hwy", - # copybara:import_next_line:hwy - "//:nanobenchmark", - # copybara:import_next_line:hwy - "//:profiler", - # copybara:import_next_line:hwy - "//:thread_pool", - "//third_party/riegeli/bytes:file_reader", - "//third_party/riegeli/bytes:file_writer", - "//third_party/riegeli/csv:csv_reader", - "//third_party/riegeli/csv:csv_writer", - ], -) - -gensignature( - name = "gemma_sign", - srcs = [":gemma"], -) - -cc_test( - name = "benchmarks", - size = "large", - srcs = [ - "benchmarks.cc", - ], - tags = ["notap"], - deps = [ - ":app", - ":gemma_lib", - "//third_party/benchmark", - # copybara:import_next_line:hwy - "//:hwy", - # copybara:import_next_line:hwy - "//:thread_pool", - ], -) - -# copybara:strip_end