From 5254a184d58a896a4392debe7e9b9307c8d48233 Mon Sep 17 00:00:00 2001 From: Jan de Cuveland Date: Fri, 15 Mar 2019 13:46:03 +0100 Subject: [PATCH] Fix build warnings --- lib/crcutil/CMakeLists.txt | 2 ++ lib/fles_libfabric/Connection.hpp | 2 -- lib/fles_libfabric/ConnectionGroup.hpp | 3 ++- lib/fles_libfabric/GNIProvider.hpp | 6 +++--- lib/fles_libfabric/InputChannelConnection.hpp | 6 ++---- lib/fles_libfabric/InputChannelSender.cpp | 1 - lib/fles_libfabric/RDMSocketsProvider.hpp | 6 +++--- lib/fles_libfabric/TimesliceBuilder.hpp | 1 - lib/fles_libfabric/VerbsProvider.hpp | 6 +++--- lib/fles_rdma/InputChannelSender.cpp | 1 - 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lib/crcutil/CMakeLists.txt b/lib/crcutil/CMakeLists.txt index 7a00c5ec6..84d94e311 100644 --- a/lib/crcutil/CMakeLists.txt +++ b/lib/crcutil/CMakeLists.txt @@ -9,6 +9,8 @@ if(APPLE) set(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols ") endif() +add_compile_options(-Wno-expansion-to-defined) + add_library(crcutil ${LIB_SOURCES} ${LIB_HEADERS}) target_include_directories(crcutil PUBLIC .) diff --git a/lib/fles_libfabric/Connection.hpp b/lib/fles_libfabric/Connection.hpp index 09eaabb1f..8a40206cc 100644 --- a/lib/fles_libfabric/Connection.hpp +++ b/lib/fles_libfabric/Connection.hpp @@ -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 diff --git a/lib/fles_libfabric/ConnectionGroup.hpp b/lib/fles_libfabric/ConnectionGroup.hpp index eb0ffb494..d817d1d41 100644 --- a/lib/fles_libfabric/ConnectionGroup.hpp +++ b/lib/fles_libfabric/ConnectionGroup.hpp @@ -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]; diff --git a/lib/fles_libfabric/GNIProvider.hpp b/lib/fles_libfabric/GNIProvider.hpp index 2a757ab4c..a5e8e5afd 100644 --- a/lib/fles_libfabric/GNIProvider.hpp +++ b/lib/fles_libfabric/GNIProvider.hpp @@ -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); diff --git a/lib/fles_libfabric/InputChannelConnection.hpp b/lib/fles_libfabric/InputChannelConnection.hpp index 086c267f5..e6e78af4f 100644 --- a/lib/fles_libfabric/InputChannelConnection.hpp +++ b/lib/fles_libfabric/InputChannelConnection.hpp @@ -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> get_private_data() override; @@ -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 diff --git a/lib/fles_libfabric/InputChannelSender.cpp b/lib/fles_libfabric/InputChannelSender.cpp index a261fd004..2c4dea848 100644 --- a/lib/fles_libfabric/InputChannelSender.cpp +++ b/lib/fles_libfabric/InputChannelSender.cpp @@ -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 diff --git a/lib/fles_libfabric/RDMSocketsProvider.hpp b/lib/fles_libfabric/RDMSocketsProvider.hpp index 5e4f5402c..ad4fd9b42 100644 --- a/lib/fles_libfabric/RDMSocketsProvider.hpp +++ b/lib/fles_libfabric/RDMSocketsProvider.hpp @@ -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); diff --git a/lib/fles_libfabric/TimesliceBuilder.hpp b/lib/fles_libfabric/TimesliceBuilder.hpp index 3180abd8f..eeeb0a83c 100644 --- a/lib/fles_libfabric/TimesliceBuilder.hpp +++ b/lib/fles_libfabric/TimesliceBuilder.hpp @@ -78,7 +78,6 @@ class TimesliceBuilder : public ConnectionGroup { // 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_; diff --git a/lib/fles_libfabric/VerbsProvider.hpp b/lib/fles_libfabric/VerbsProvider.hpp index 22f64041d..aeb0d6b35 100644 --- a/lib/fles_libfabric/VerbsProvider.hpp +++ b/lib/fles_libfabric/VerbsProvider.hpp @@ -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); diff --git a/lib/fles_rdma/InputChannelSender.cpp b/lib/fles_rdma/InputChannelSender.cpp index 9c24837b0..bc4063902 100644 --- a/lib/fles_rdma/InputChannelSender.cpp +++ b/lib/fles_rdma/InputChannelSender.cpp @@ -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