Skip to content

Commit

Permalink
[Backport release-2.27] Rr/sc 60366 sparse global order reader merge (#…
Browse files Browse the repository at this point in the history
…5417) (#5443)

Backport of #5417 to release-2.27

---
TYPE: IMPROVEMENT
DESC: sparse global order reader determine global order of result tiles

---------

Co-authored-by: Ypatia Tsavliri <[email protected]>
Co-authored-by: Ryan Roelke <[email protected]>
Co-authored-by: Isaiah Norton <[email protected]>
Co-authored-by: Theodore Tsirpanis <[email protected]>
  • Loading branch information
5 people authored Feb 12, 2025
1 parent 497f5a9 commit 4bc25ea
Show file tree
Hide file tree
Showing 57 changed files with 9,331 additions and 787 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ trigger_pipeline:
TILEDB_REF: ${CI_COMMIT_REF_NAME}
trigger:
project: tiledb-inc/tiledb-internal
strategy: depend
strategy: depend
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ if (MSVC)
# C4456: local variable hiding previous local variable
# C4457: local variable hiding function parameter
# C4702: unreachable code
# C4706: assignment within conditional expression
# C4800: warning implicit cast int to bool
add_compile_options(/W4 /wd4101 /wd4146 /wd4244 /wd4251 /wd4456 /wd4457 /wd4702 /wd4800)
add_compile_options(/W4 /wd4101 /wd4146 /wd4244 /wd4251 /wd4456 /wd4457 /wd4702 /wd4706 /wd4800)
# Warnings as errors:
if (TILEDB_WERROR)
add_compile_options(/WX)
Expand Down Expand Up @@ -447,6 +448,7 @@ target_include_directories(local_install INTERFACE ${CMAKE_SOURCE_DIR})
enable_testing()

if(TILEDB_TESTS)
find_package(rapidcheck CONFIG REQUIRED)
# Add custom Catch2 entry point that suppresses message boxes on debug assertion
# failures on Windows CI.
find_package(Catch2 REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion scripts/find_heap_api_violations.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"zstd_compressor.h": ["std::unique_ptr<ZSTD_DCtx, decltype(&ZSTD_freeDCtx)> ctx_;", "std::unique_ptr<ZSTD_CCtx, decltype(&ZSTD_freeCCtx)> ctx_;"],
"posix.cc": ["std::unique_ptr<DIR, UniqueDIRDeleter>", "static std::unique_ptr<char, decltype(&free)> cwd_(getcwd(nullptr, 0), free);"],
"curl.h": ["std::unique_ptr<CURL, decltype(&curl_easy_cleanup)>"],
"pmr.h": ["std::unique_ptr", "unique_ptr<Tp> make_unique("],
"pmr.h": ["std::unique_ptr", "unique_ptr<Tp> make_unique(", "unique_ptr<Tp> emplace_unique("],
}


Expand Down
3 changes: 1 addition & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ target_link_libraries(tiledb_unit
Catch2::Catch2
tiledb_test_support_lib
configuration_definitions
rapidcheck
)

target_link_libraries(tiledb_unit PRIVATE $<BUILD_INTERFACE:common>)
Expand Down Expand Up @@ -370,9 +371,7 @@ endif()

# CI tests
add_subdirectory(ci)
if(WIN32)
add_subdirectory(performance)
endif()

add_custom_target(
check-package
Expand Down
23 changes: 23 additions & 0 deletions test/performance/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
# THE SOFTWARE.
#

if(WIN32)

# These options not exposed in bootstrap script.
option(TILEDB_TESTS_AWS_S3_CONFIG "Use an S3 config appropriate for AWS in tests" OFF)

Expand Down Expand Up @@ -94,3 +96,24 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU
LINK_FLAGS "-Wl,--no-as-needed -ldl"
)
endif()

endif()


add_executable(
tiledb_submit_a_b EXCLUDE_FROM_ALL
$<TARGET_OBJECTS:TILEDB_CORE_OBJECTS>
"tiledb_submit_a_b.cc"
)

target_include_directories(
tiledb_submit_a_b BEFORE PRIVATE
${TILEDB_CORE_INCLUDE_DIR}
${TILEDB_EXPORT_HEADER_DIR}
)

target_link_libraries(tiledb_submit_a_b
PUBLIC
TILEDB_CORE_OBJECTS_ILIB
tiledb_test_support_lib
)
Loading

0 comments on commit 4bc25ea

Please sign in to comment.