Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ common:mkl --platform_suffix=mkl
build:system --noincompatible_enable_cc_toolchain_resolution
build:system --platform_suffix=system

# Starting from XCode 26, llvm14 is not compatible with MacOS SDK anymore, so we override to llvm20
build --enable_platform_specific_config
build:macos --platforms=@rules_swiftnav//platforms:aarch64_darwin_llvm20

# Clang format config
build:clang-format-check --aspects @rules_swiftnav//clang_format:clang_format_check.bzl%clang_format_check_aspect
build:clang-format-check --@rules_swiftnav//clang_format:clang_format_config=//:clang_format_config
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
branches:
- 'master'

concurrency:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a commit to a PR will stop running workflows

group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:

ubuntu-gcc11:
Expand Down
17 changes: 16 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ cc_library(
"tests/test_covariance_utils.h",
"tests/test_utils.h",
],
copts = ["-Itests"],
copts = ["-Itests", "-std=c++17"],
includes = [
"include",
],
Expand All @@ -180,6 +180,7 @@ swift_cc_test_library(
includes = [
"tests",
],
standard=17,
visibility = ["//visibility:public"],
deps = ["@gtest"],
)
Expand All @@ -193,6 +194,7 @@ swift_cc_test_library(
"tests/test_core_distribution.h",
"tests/test_covariance_utils.h",
],
standard=17,
includes = ["tests"],
)

Expand Down Expand Up @@ -220,6 +222,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -235,6 +238,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -249,6 +253,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -266,6 +271,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -281,6 +287,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -302,6 +309,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -314,6 +322,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -326,6 +335,7 @@ swift_cc_test(
type = UNIT,
tags = ["exclusive"],
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -338,6 +348,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -350,6 +361,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -361,6 +373,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -372,6 +385,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

swift_cc_test(
Expand All @@ -387,6 +401,7 @@ swift_cc_test(
local_defines = ["CSV_IO_NO_THREAD"],
type = UNIT,
deps = TEST_DEPS,
standard=17,
)

# Meta-target that runs all tests
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" "${CMAKE_CURRENT_LIST_DI
set(SWIFT_CLANG_TIDY_RATCHET_FILE
"${PROJECT_SOURCE_DIR}/ci/clang_tidy_ratchet.yaml")

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

include(CCache)
include(ClangTidy)
include(SwiftCmakeOptions)
Expand Down Expand Up @@ -70,7 +73,7 @@ function(albatross_add_test target)
)
target_compile_features(${target}
PUBLIC
cxx_std_14
cxx_std_17
)
if (MKL_FOUND)
target_link_libraries(${target}
Expand Down
12 changes: 6 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(

bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "rules_swiftnav", version = "0.5.0")
bazel_dep(name = "rules_swiftnav", version = "0.8.0")

swift_cc_toolchain_ext = use_extension("@rules_swiftnav//cc:extensions.bzl", "swift_cc_toolchain_extension")
use_repo(
Expand All @@ -20,8 +20,8 @@ use_repo(
)

register_toolchains(
"@rules_swiftnav//cc/toolchains/llvm/aarch64-darwin:cc-toolchain-aarch64-darwin",
"@rules_swiftnav//cc/toolchains/llvm/x86_64-darwin:cc-toolchain-x86_64-darwin",
"@rules_swiftnav//cc/toolchains/llvm20/aarch64-darwin:cc-toolchain-aarch64-darwin",
"@rules_swiftnav//cc/toolchains/llvm20/x86_64-darwin:cc-toolchain-x86_64-darwin",
"@rules_swiftnav//cc/toolchains/llvm/aarch64-linux:cc-toolchain-aarch64-linux",
"@rules_swiftnav//cc/toolchains/llvm/x86_64-linux:cc-toolchain-x86_64-linux",
"@rules_swiftnav//cc/toolchains/llvm/x86_64-linux:cc-toolchain-intel-mkl",
Expand Down Expand Up @@ -60,16 +60,16 @@ local_path_override(
path = "third_party/googletest",
)

bazel_dep(name = "cereal", version = "1.2.2-80.swiftnav")
bazel_dep(name = "zlib", version = "1.2.13")
bazel_dep(name = "cereal", version = "1.2.2-81.swiftnav")
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
bazel_dep(name = "gzip_hpp", version = "0.1.0.swiftnav", repo_name = "gzip")
local_path_override(
module_name = "gzip_hpp",
path = "third_party/gzip-hpp",
)

bazel_dep(name = "zstd", version = "1.5.5.bcr.2")
bazel_dep(name = "threadpool", version = "0.1.0.swiftnav", repo_name = "ThreadPool")
bazel_dep(name = "threadpool", version = "0.1.1.swiftnav", repo_name = "ThreadPool")
local_path_override(
module_name = "threadpool",
path = "third_party/ThreadPool",
Expand Down
Loading
Loading