Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ DerivePointerAlignment: false
IncludeBlocks: Regroup
InsertBraces: true
Language: Cpp
NamespaceIndentation: Inner
NamespaceIndentation: None
PointerAlignment: Right
SpaceBeforeCpp11BracedList: true
SpaceBeforeCtorInitializerColon: true
Expand Down
7 changes: 3 additions & 4 deletions vortex-cxx/.clang-tidy → .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright the Vortex contributors
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright the Vortex contributors

Checks: |
-*,
Expand Down Expand Up @@ -43,7 +43,7 @@ Checks: |
-bugprone-unused-local-non-trivial-variable,
-bugprone-empty-catch,
WarningsAsErrors: '*'
HeaderFilterRegex: '(cpp|examples)/.*\.(cpp|hpp)$'
HeaderFilterRegex: '(examples)/.*\.(cpp|hpp)$'
FormatStyle: none
CheckOptions:
- key: readability-identifier-naming.ClassCase
Expand Down Expand Up @@ -90,4 +90,3 @@ CheckOptions:
value: lower_case
- key: cppcoreguidelines-rvalue-reference-param-not-moved.IgnoreUnnamedParams
value: true

44 changes: 33 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,8 @@ jobs:
command: check ${{ matrix.checks }}

cxx-test:
name: "C++ build"
timeout-minutes: 30
name: "C++ API tests"
timeout-minutes: 5
Comment thread
myrrc marked this conversation as resolved.
Comment thread
myrrc marked this conversation as resolved.
runs-on: >-
${{ github.repository == 'vortex-data/vortex'
&& format('runs-on={0}/runner=amd64-medium/image=ubuntu24-full-x64-pre-v2/extras=s3-cache/tag=cxx-build', github.run_id)
Expand All @@ -538,20 +538,42 @@ jobs:
- uses: ./.github/actions/setup-prebuild
with:
enable-sccache: "true"
Comment thread
myrrc marked this conversation as resolved.
- name: Build and run C++ unit tests
- name: Install Rust nightly toolchain
run: |
rustup toolchain install $NIGHTLY_TOOLCHAIN
rustup component add --toolchain $NIGHTLY_TOOLCHAIN rust-src rustfmt clippy llvm-tools-preview
- name: Build FFI library (asan)
Comment thread
myrrc marked this conversation as resolved.
run: |
RUSTFLAGS="-A warnings -Cunsafe-allow-abi-mismatch=sanitizer \
-C debuginfo=2 -C opt-level=0 -C strip=none -Zexternal-clangrt \
-Zsanitizer=address,leak" \
cargo +$NIGHTLY_TOOLCHAIN build --locked --no-default-features \
--target x86_64-unknown-linux-gnu -Zbuild-std \
-p vortex-ffi
- name: Build C++ tests (asan)
run: |
mkdir -p vortex-cxx/build
cmake -S vortex-cxx -B vortex-cxx/build -DVORTEX_ENABLE_TESTING=ON -DVORTEX_ENABLE_ASAN=ON
cmake -S vortex-cxx -B vortex-cxx/build -DBUILD_TESTS=ON -DSANITIZER=asan -DTARGET_TRIPLE="x86_64-unknown-linux-gnu"
cmake --build vortex-cxx/build --parallel $(nproc)
ctest --test-dir vortex-cxx/build -j $(nproc) -V
- name: Build and run the example in release mode
- name: Run C++ tests
run: |
vortex-cxx/build/tests/vortex_cxx_test
- name: Build and run examples
run: |
cmake -S vortex-cxx/examples -B vortex-cxx/examples/build -DCMAKE_BUILD_TYPE=Release
cmake -S vortex-cxx -B vortex-cxx/examples/build -DSANITIZER=asan -DBUILD_EXAMPLES=1 -DTARGET_TRIPLE="x86_64-unknown-linux-gnu"
cmake --build vortex-cxx/examples/build --parallel $(nproc)
vortex-cxx/examples/build/hello-vortex vortex-cxx/examples/goldenfiles/example.vortex
- uses: ./.github/actions/check-rebuild
with:
command: "cargo build --profile ci --locked -p vortex-cxx --lib"
cd vortex-cxx/examples/build/examples
Comment thread
myrrc marked this conversation as resolved.
# filesystem loop detected
rm -fr ../_deps/nanoarrow-src/python/subprojects/arrow-nanoarrow

./writer people0.vortex
Comment thread
myrrc marked this conversation as resolved.
./writer people1.vortex
./writer me.vortex

./scan '*.vortex'
./dtype me.vortex

./reader

sqllogic-test:
name: "SQL logic tests"
Expand Down
118 changes: 0 additions & 118 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ members = [
"vortex-cuda/gpu-scan-cli",
"vortex-cuda/macros",
"vortex-cuda/nvcomp",
"vortex-cxx",
"vortex-ffi",
"fuzz",
"vortex-jni",
Expand Down
5 changes: 1 addition & 4 deletions docs/Doxyfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROJECT_NAME = "Vortex C++"
OUTPUT_DIRECTORY = _build/doxygen-cpp

# Input sources
INPUT = ../vortex-cxx/cpp/include/vortex
INPUT = ../vortex-cxx/include/vortex
FILE_PATTERNS = *.hpp
RECURSIVE = NO

Expand All @@ -26,6 +26,3 @@ MACRO_EXPANSION = NO

# Suppress warnings about undocumented members (WIP API)
WARN_IF_UNDOCUMENTED = NO

# Exclude cxx bridge internals from documentation
EXCLUDE_SYMBOLS = ffi::*
17 changes: 0 additions & 17 deletions docs/api/cpp/dtypes.rst

This file was deleted.

9 changes: 0 additions & 9 deletions docs/api/cpp/expr.rst

This file was deleted.

17 changes: 0 additions & 17 deletions docs/api/cpp/file.rst

This file was deleted.

Loading
Loading