move #ifndef VTR_ENABLE_CAPNPROTO to inside function defs instead of defining them multiple times

Author: soheilshahrouz

vpr/src/place/timing/delay_model/override_delay_model.cpp

@@ -199,45 +199,25 @@ void OverrideDelayModel::set_base_delay_model(std::unique_ptr<DeltaDelayModel> b
     base_delay_model_ = std::move(base_delay_model_obj);
 }
 
-/**
- * When writing capnp targetted serialization, always allow compilation when
- * VTR_ENABLE_CAPNPROTO=OFF. Generally this means throwing an exception instead.
- */
-#ifndef VTR_ENABLE_CAPNPROTO
-#    define DISABLE_ERROR                              \
-        "is disable because VTR_ENABLE_CAPNPROTO=OFF." \
-        "Re-compile with CMake option VTR_ENABLE_CAPNPROTO=ON to enable."
-
-void OverrideDelayModel::read(const std::string& /*file*/) {
-    VPR_THROW(VPR_ERROR_PLACE, "OverrideDelayModel::read " DISABLE_ERROR);
-}
-
-void OverrideDelayModel::write(const std::string& /*file*/) const {
-    VPR_THROW(VPR_ERROR_PLACE, "OverrideDelayModel::write " DISABLE_ERROR);
-}
-
-#else /* VTR_ENABLE_CAPNPROTO */
-
-static void ToFloat(float* out, const VprFloatEntry::Reader& in) {
-    // Getting a scalar field is always "get<field name>()".
-    *out = in.getValue();
-}
-
-static void FromFloat(VprFloatEntry::Builder* out, const float& in) {
-    // Setting a scalar field is always "set<field name>(value)".
-    out->setValue(in);
-}
-
 void OverrideDelayModel::read(const std::string& file) {
+#ifndef VTR_ENABLE_CAPNPROTO
+    VPR_THROW(VPR_ERROR_PLACE,
+          "OverrideDelayModel::read is disabled because VTR_ENABLE_CAPNPROTO=OFF. "
+          "Re-compile with CMake option VTR_ENABLE_CAPNPROTO=ON to enable.");
+#else
     MmapFile f(file);
 
     /* Increase reader limit to 1G words to allow for large files. */
     ::capnp::ReaderOptions opts = default_large_capnp_opts();
     ::capnp::FlatArrayMessageReader reader(f.getData(), opts);
 
+    auto toFloat = [](float* out, const VprFloatEntry::Reader& in) -> void {
+        *out = in.getValue();
+    };
+
     vtr::NdMatrix<float, 4> delays;
     auto model = reader.getRoot<VprOverrideDelayModel>();
-    ToNdMatrix<4, VprFloatEntry, float>(&delays, model.getDelays(), ToFloat);
+    ToNdMatrix<4, VprFloatEntry, float>(&delays, model.getDelays(), toFloat);
 
     base_delay_model_ = std::make_unique<DeltaDelayModel>(cross_layer_delay_, delays, is_flat_);
 
@@ -258,14 +238,24 @@ void OverrideDelayModel::read(const std::string& file) {
     }
 
     delay_overrides_ = vtr::make_flat_map2(std::move(overrides_arr));
+#endif
 }
 
 void OverrideDelayModel::write(const std::string& file) const {
+#ifndef VTR_ENABLE_CAPNPROTO
+    VPR_THROW(VPR_ERROR_PLACE,
+              "OverrideDelayModel::write is disabled because VTR_ENABLE_CAPNPROTO=OFF. "
+              "Re-compile with CMake option VTR_ENABLE_CAPNPROTO=ON to enable.\");
+#else
     ::capnp::MallocMessageBuilder builder;
     auto model = builder.initRoot<VprOverrideDelayModel>();
 
+    auto fromFloat = [](VprFloatEntry::Builder* out, const float& in) -> void {
+        out->setValue(in);
+    };
+
     auto delays = model.getDelays();
-    FromNdMatrix<4, VprFloatEntry, float>(&delays, base_delay_model_->delays(), FromFloat);
+    FromNdMatrix<4, VprFloatEntry, float>(&delays, base_delay_model_->delays(), fromFloat);
 
     // Non-scalar capnproto fields should be first initialized with
     // init<field  name>(count), and then accessed from the returned
@@ -285,6 +275,6 @@ void OverrideDelayModel::write(const std::string& file) const {
     }
 
     writeMessageToFile(file, &builder);
+#endif
 }
 
-#endif

vpr/src/place/timing/delay_model/simple_delay_model.cpp

@@ -51,26 +51,12 @@ float SimpleDelayModel::delay(const t_physical_tile_loc& from_loc, int /*from_pi
     return delays_[from_tile_idx][from_loc.layer_num][to_loc.layer_num][delta_x][delta_y];
 }
 
-/**
- * When writing capnp targetted serialization, always allow compilation when
- * VTR_ENABLE_CAPNPROTO=OFF. Generally this means throwing an exception instead.
- */
+void SimpleDelayModel::read(const std::string& file) {
 #ifndef VTR_ENABLE_CAPNPROTO
-
-#    define DISABLE_ERROR                              \
-        "is disable because VTR_ENABLE_CAPNPROTO=OFF." \
-        "Re-compile with CMake option VTR_ENABLE_CAPNPROTO=ON to enable."
-
-void SimpleDelayModel::read(const std::string& /*file*/) {
-    VPR_THROW(VPR_ERROR_PLACE, "SimpleDelayModel::read " DISABLE_ERROR);
-}
-
-void SimpleDelayModel::write(const std::string& /*file*/) const {
-    VPR_THROW(VPR_ERROR_PLACE, "SimpleDelayModel::write " DISABLE_ERROR);
-}
+    VPR_THROW(VPR_ERROR_PLACE,
+              "SimpleDelayModel::read is disabled because VTR_ENABLE_CAPNPROTO=OFF. "
+              "Re-compile with CMake option VTR_ENABLE_CAPNPROTO=ON to enable.\");
 #else
-
-void SimpleDelayModel::read(const std::string& file) {
     // MmapFile object creates an mmap of the specified path, and will munmap
     // when the object leaves scope.
     MmapFile f(file);
@@ -111,9 +97,15 @@ void SimpleDelayModel::read(const std::string& file) {
     // The second argument should be of type Matrix<X>::Reader where X is the
     // capnproto element type.
     ToNdMatrix<5, VprFloatEntry, float>(&delays_, model.getDelays(), toFloat);
+#endif
 }
 
 void SimpleDelayModel::write(const std::string& file) const {
+#ifndef VTR_ENABLE_CAPNPROTO
+    VPR_THROW(VPR_ERROR_PLACE,
+              "SimpleDelayModel::write is disabled because VTR_ENABLE_CAPNPROTO=OFF. "
+              "Re-compile with CMake option VTR_ENABLE_CAPNPROTO=ON to enable.\");
+#else
     // MallocMessageBuilder object generates capnproto message builder,
     // using malloc for buffer allocation.
     ::capnp::MallocMessageBuilder builder;
@@ -134,6 +126,5 @@ void SimpleDelayModel::write(const std::string& file) const {
 
     // writeMessageToFile writes message to the specified file.
     writeMessageToFile(file, &builder);
+#endif
 }
-
-#endif