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

Fix build warnings #48

Merged
merged 1 commit into from
Mar 15, 2019
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
2 changes: 2 additions & 0 deletions lib/crcutil/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ if(APPLE)
set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols <TARGET>")
endif()

add_compile_options(-Wno-expansion-to-defined)

add_library(crcutil ${LIB_SOURCES} ${LIB_HEADERS})

target_include_directories(crcutil PUBLIC .)
2 changes: 0 additions & 2 deletions lib/fles_libfabric/Connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,5 @@ class Connection {

/// Total number of RECV work requests.
uint64_t total_recv_requests_ = 0;

const uint32_t num_cqe_ = 1000000;
};
} // namespace tl_libfabric
3 changes: 2 additions & 1 deletion lib/fles_libfabric/ConnectionGroup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ class ConnectionGroup : public ConnectionGroupWorker {
int ne;
int ne_total = 0;

while (ne_total < conn_.size() && (ne = fi_cq_read(cq_, &wc, ne_max))) {
while (ne_total < int(conn_.size()) &&
(ne = fi_cq_read(cq_, &wc, ne_max))) {
if (ne == -FI_EAVAIL) { // error available
struct fi_cq_err_entry err;
char buffer[256];
Expand Down
6 changes: 3 additions & 3 deletions lib/fles_libfabric/GNIProvider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ class GNIProvider : public Provider {
/// The GNIProvider default destructor.
~GNIProvider();

virtual bool has_av() const { return true; };
virtual bool has_eq_at_eps() const { return false; };
virtual bool is_connection_oriented() const { return false; };
virtual bool has_av() const override { return true; };
virtual bool has_eq_at_eps() const override { return false; };
virtual bool is_connection_oriented() const override { return false; };

struct fi_info* get_info() override {
assert(info_ != nullptr);
Expand Down
6 changes: 2 additions & 4 deletions lib/fles_libfabric/InputChannelConnection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ class InputChannelConnection : public Connection {
/**
\param event RDMA connection manager event structure
*/
virtual void on_established(struct fi_eq_cm_entry* event) /*override*/;
virtual void on_established(struct fi_eq_cm_entry* event) override;
//
void dereg_mr();

virtual void on_rejected(struct fi_eq_err_entry* event) override;

virtual void on_disconnected(struct fi_eq_cm_entry* event) /*override*/;
virtual void on_disconnected(struct fi_eq_cm_entry* event) override;

virtual std::unique_ptr<std::vector<uint8_t>> get_private_data() override;

Expand Down Expand Up @@ -141,8 +141,6 @@ class InputChannelConnection : public Connection {

unsigned int max_pending_write_requests_{0};

uint_fast16_t remote_connection_index_;

fi_addr_t partner_addr_ = 0;
};
} // namespace tl_libfabric
1 change: 0 additions & 1 deletion lib/fles_libfabric/InputChannelSender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,6 @@ void InputChannelSender::post_send_data(uint64_t timeslice,
(desc_offset & data_source_.desc_buffer().size_mask()));
descs[num_sge++] = fi_mr_desc(mr_desc_);
}
int num_desc_sge = num_sge;
// data
if (data_length == 0) {
// zero chunks
Expand Down
6 changes: 3 additions & 3 deletions lib/fles_libfabric/RDMSocketsProvider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class RDMSocketsProvider : public Provider {

~RDMSocketsProvider();

virtual bool has_av() const { return true; };
virtual bool has_eq_at_eps() const { return false; };
virtual bool is_connection_oriented() const { return false; };
virtual bool has_av() const override { return true; };
virtual bool has_eq_at_eps() const override { return false; };
virtual bool is_connection_oriented() const override { return false; };

struct fi_info* get_info() override {
assert(info_ != nullptr);
Expand Down
1 change: 0 additions & 1 deletion lib/fles_libfabric/TimesliceBuilder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class TimesliceBuilder : public ConnectionGroup<ComputeNodeConnection> {
// used in connection-less mode
InputChannelStatusMessage recv_connect_message_ = InputChannelStatusMessage();

struct fid_mr* mr_send_ = nullptr;
struct fid_mr* mr_recv_ = nullptr;

TimesliceBuffer& timeslice_buffer_;
Expand Down
6 changes: 3 additions & 3 deletions lib/fles_libfabric/VerbsProvider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class VerbsProvider : public Provider {
/// The VerbsProvider default destructor.
~VerbsProvider();

virtual bool has_av() const { return false; };
virtual bool has_eq_at_eps() const { return true; };
virtual bool is_connection_oriented() const { return true; };
virtual bool has_av() const override { return false; };
virtual bool has_eq_at_eps() const override { return true; };
virtual bool is_connection_oriented() const override { return true; };

struct fi_info* get_info() override {
assert(info_ != nullptr);
Expand Down
1 change: 0 additions & 1 deletion lib/fles_rdma/InputChannelSender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ void InputChannelSender::post_send_data(uint64_t timeslice,
(desc_offset & data_source_.desc_buffer().size_mask()));
sge[num_sge++].lkey = mr_desc_->lkey;
}
int num_desc_sge = num_sge;
// data
if (data_length == 0) {
// zero chunks
Expand Down