Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address Clang warnings #595

Merged
merged 5 commits into from
Jan 7, 2025
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
3 changes: 3 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ Checks: |
-fuchsia-trailing-return,
-llvm-header-guard,
-google-runtime-references
CheckOptions:
- key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
value: true
2 changes: 1 addition & 1 deletion clang.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Toolchain for compiling with Clang
set(CMAKE_C_COMPILER "clang")
set(CMAKE_CXX_COMPILER "clang++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi -lc++")
2 changes: 2 additions & 0 deletions include/pisa/codec/block_codec.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ namespace pisa {
*/
class BlockCodec {
public:
virtual ~BlockCodec() = default;

/**
* Encodes a list of `n` unsigned integers and appends them to the output buffer.
*/
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/interpolative.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class InterpolativeBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_interpolative";

virtual ~InterpolativeBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/maskedvbyte.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class MaskedVByteBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_maskedvbyte";

virtual ~MaskedVByteBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/optpfor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class OptPForBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_optpfor";

virtual ~OptPForBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/qmx.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class QmxBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_qmx";

virtual ~QmxBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;

Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/simdbp.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ class SimdBpBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_simdbp";

virtual ~SimdBpBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/simple16.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class Simple16BlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_simple16";

virtual ~Simple16BlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/simple8b.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class Simple8bBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_simple8b";

virtual ~Simple8bBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/streamvbyte.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class StreamVByteBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_streamvbyte";

virtual ~StreamVByteBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/varint_g8iu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ class VarintG8IUBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_varintg8iu";

virtual ~VarintG8IUBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 2 additions & 0 deletions include/pisa/codec/varintgb.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,8 @@ class VarintGbBlockCodec: public BlockCodec {
public:
constexpr static std::string_view name = "block_varintgb";

virtual ~VarintGbBlockCodec() = default;

void encode(uint32_t const* in, uint32_t sum_of_values, size_t n, std::vector<uint8_t>& out)
const override;
uint8_t const*
Expand Down
2 changes: 1 addition & 1 deletion include/pisa/scorer/qld.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct qld: public WandIndexScorer<Wand> {
float term_occurrences = this->m_wdata.term_occurrence_count(term_id);
float term_component = collection_len / (mu * term_occurrences);

auto s = [this, mu, term_component, term_id](uint32_t doc, uint32_t freq) {
auto s = [this, mu, term_component](uint32_t doc, uint32_t freq) {
float doclen = this->m_wdata.doc_len(doc);
float a = std::log(mu / (doclen + mu));
float b = std::log1p(freq * term_component);
Expand Down
4 changes: 2 additions & 2 deletions include/pisa/span.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ namespace pisa {
* want checked access.
*/
template <typename T>
[[nodiscard]] constexpr auto at(std::span<T> const& span, typename std::span<T>::size_type pos)
-> std::span<T>::reference {
[[nodiscard]] constexpr auto at(std::span<T> const& span, typename std::span<T>::size_type pos) ->
typename std::span<T>::reference {
if (pos >= span.size()) {
throw std::out_of_range("out of range access to span");
}
Expand Down
11 changes: 4 additions & 7 deletions src/progress.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void progress::update(std::size_t inc) {

void progress::print_status() {
size_t progress = (100 * m_count) / m_goal;
std::chrono::seconds elapsed =
auto elapsed =
std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - m_start);
if (progress != m_progress or elapsed != m_elapsed) {
m_progress = progress;
Expand All @@ -43,12 +43,9 @@ void progress::print_status() {
}

std::ostream& progress::format_interval(std::ostream& out, std::chrono::seconds time) {
using std::chrono::hours;
using std::chrono::minutes;
using std::chrono::seconds;
hours h = std::chrono::duration_cast<hours>(time);
minutes m = std::chrono::duration_cast<minutes>(time - h);
seconds s = std::chrono::duration_cast<seconds>(time - h - m);
auto h = std::chrono::duration_cast<std::chrono::hours>(time);
auto m = std::chrono::duration_cast<std::chrono::minutes>(time - h);
auto s = std::chrono::duration_cast<std::chrono::seconds>(time - h - m);
if (h.count() > 0) {
out << h.count() << "h ";
}
Expand Down