Refactor more code to adhere to a stricter set of warnings

Author: VivekPanyam

source/.bazelrc

@@ -28,3 +28,6 @@ build:asan -c dbg --copt='-fsanitize=address' --copt='-fno-omit-frame-pointer' -
 
 # For profiling builds
 build:profile -c dbg --copt='-fno-omit-frame-pointer'
+
+# Build with warnings as errors in CI
+build:ci --copt='-Werror'

source/bazel/cc.bzl

@@ -17,6 +17,12 @@ _warnings = [
     # We're okay with these for now, but should refactor to remove if we can
     "-Wno-global-constructors",
     "-Wno-exit-time-destructors",
+
+    # It's okay if we use `default` in switch statements
+    "-Wno-switch-enum",
+
+    # Flexible array members
+    "-Wno-c99-extensions",
 ]
 
 _test_warnings = _warnings + [

source/neuropod/BUILD

@@ -13,8 +13,9 @@
 # limitations under the License.
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+load("//bazel:cc.bzl", "neuropod_cc_binary", "neuropod_cc_library")
 
-cc_library(
+neuropod_cc_library(
     name = "neuropod_hdrs",
     hdrs = [
         "neuropod.hh",
@@ -31,15 +32,15 @@ cc_library(
     ],
 )
 
-cc_library(
+neuropod_cc_library(
     name = "options",
     hdrs = ["options.hh"],
     visibility = [
         "//visibility:public",
     ],
 )
 
-cc_binary(
+neuropod_cc_binary(
     name = "libneuropod.so",
     linkopts = select({
         "@bazel_tools//src/conditions:darwin": ["-Wl,-rpath,@loader_path"],
@@ -55,7 +56,7 @@ cc_binary(
     ],
 )
 
-cc_library(
+neuropod_cc_library(
     name = "neuropod_impl",
     srcs = [
         "neuropod.cc",

source/neuropod/backends/BUILD

@@ -13,8 +13,9 @@
 # limitations under the License.
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+load("//bazel:cc.bzl", "neuropod_cc_library")
 
-cc_library(
+neuropod_cc_library(
     name = "neuropod_backend",
     srcs = [
         "neuropod_backend.cc",

source/neuropod/backends/neuropod_backend.cc

@@ -129,7 +129,7 @@ void validate_tensors_against_specs(const NeuropodValueMap &       tensors,
         }
 
         // Validate the shape
-        for (int i = 0; i < spec.dims.size(); i++)
+        for (size_t i = 0; i < spec.dims.size(); i++)
         {
             auto dim      = tensor->get_dims()[i];
             auto expected = spec.dims[i];
@@ -318,7 +318,7 @@ std::unique_ptr<NeuropodValueMap> NeuropodBackend::infer_internal(const Neuropod
     return out;
 }
 
-std::unique_ptr<NeuropodValueMap> NeuropodBackend::infer_internal(const NeuropodValueMap &inputs)
+std::unique_ptr<NeuropodValueMap> NeuropodBackend::infer_internal(const NeuropodValueMap & /*unused*/)
 {
     NEUROPOD_ERROR("Backend implementations must provide a `infer_internal` implementation");
 }

source/neuropod/backends/python_bridge/BUILD

@@ -13,8 +13,9 @@
 # limitations under the License.
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+load("//bazel:cc.bzl", "neuropod_cc_binary", "neuropod_cc_library")
 
-cc_binary(
+neuropod_cc_binary(
     name = "libneuropod_pythonbridge_backend.so",
     srcs = [
         "//neuropod:libneuropod.so",
@@ -33,7 +34,7 @@ cc_binary(
     ],
 )
 
-cc_library(
+neuropod_cc_library(
     name = "python_bridge",
     srcs = [
         "python_bridge.cc",

source/neuropod/backends/tensorflow/BUILD

@@ -14,8 +14,9 @@
 
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("//bazel:copy_libs.bzl", "copy_libs")
+load("//bazel:cc.bzl", "neuropod_cc_binary", "neuropod_cc_library")
 
-cc_binary(
+neuropod_cc_binary(
     name = "libneuropod_tensorflow_backend.so",
     srcs = [
         "//neuropod:libneuropod.so",
@@ -37,7 +38,7 @@ cc_binary(
     ],
 )
 
-cc_library(
+neuropod_cc_library(
     name = "tensorflow_backend",
     srcs = [
         "tf_backend.cc",

source/neuropod/backends/tensorflow/tf_backend.cc

@@ -186,12 +186,12 @@ void TensorflowNeuropodBackend::load_model_internal()
 
     // Create a buffer of the right size
     graph_stream->seekg(0, graph_stream->end);
-    std::streamsize   graph_length = graph_stream->tellg();
+    auto              graph_length = static_cast<size_t>(graph_stream->tellg());
     std::vector<char> buffer(graph_length);
 
     // Read into the buffer
     graph_stream->seekg(0, graph_stream->beg);
-    graph_stream->read(buffer.data(), graph_length);
+    graph_stream->read(buffer.data(), static_cast<std::streamsize>(graph_length));
     if (graph_stream->fail())
     {
         NEUROPOD_ERROR("Error reading TensorFlow GraphDef for neuropod {}", neuropod_path_);

source/neuropod/backends/tensorflow/tf_tensor.cc

@@ -81,7 +81,7 @@ class NeuropodTensorBuffer : public tensorflow::TensorBuffer
 
     void FillAllocationDescription(tensorflow::AllocationDescription *proto) const override
     {
-        tensorflow::int64 rb = size();
+        auto rb = static_cast<tensorflow::int64>(size());
         proto->set_requested_bytes(rb);
         proto->set_allocator_name(tensorflow::cpu_allocator()->Name());
     }
@@ -116,11 +116,11 @@ tensorflow::TensorShape get_tf_shape(const std::vector<int64_t> &dims)
 // Convert shapes
 std::vector<int64_t> get_dims(const tensorflow::Tensor &tensor)
 {
-    int                  num_dims = tensor.dims();
+    auto                 num_dims = static_cast<size_t>(tensor.dims());
     std::vector<int64_t> shape(num_dims);
-    for (int i = 0; i < num_dims; i++)
+    for (size_t i = 0; i < num_dims; i++)
     {
-        shape[i] = tensor.dim_size(i);
+        shape[i] = tensor.dim_size(static_cast<int>(i));
     }
 
     return shape;

source/neuropod/backends/tensorflow/tf_tensor.hh

@@ -160,26 +160,26 @@ public:
     void copy_from(const std::vector<std::string> &data)
     {
         auto flat = tensor_.flat<StringType>();
-        if (data.size() != flat.size())
+        if (data.size() != static_cast<size_t>(flat.size()))
         {
             NEUROPOD_ERROR("Supplied vector size ({}) does not match size of tensor ({})", data.size(), flat.size());
         }
 
-        for (int i = 0; i < data.size(); i++)
+        for (size_t i = 0; i < data.size(); i++)
         {
-            flat(i) = data[i];
+            flat(static_cast<long>(i)) = data[i];
         }
     }
 
     tensorflow::Tensor &get_native_data() { return tensor_; }
 
 protected:
-    std::string get(size_t index) const { return tensor_.flat<StringType>()(index); }
+    std::string get(size_t index) const { return tensor_.flat<StringType>()(static_cast<long>(index)); }
 
     void set(size_t index, const std::string &value)
     {
-        auto flat   = tensor_.flat<StringType>();
-        flat(index) = value;
+        auto flat                      = tensor_.flat<StringType>();
+        flat(static_cast<long>(index)) = value;
     }
 };