Fix: Replace float template parameter with int for C++17 compatibility

davisking · Aug 28, 2024 · 63e181c · 63e181c
1 parent f21f6d7
commit 63e181c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/dlib/dnn/layers.h b/dlib/dnn/layers.h
@@ -2136,30 +2136,21 @@ namespace dlib
 
 // ----------------------------------------------------------------------------------------
 
-    template <float DROP_RATE>
+    template <int DROP_RATE_PERCENT>
     class dropout_rate_ : public dropout_
     {
     public:
-        explicit dropout_rate_() : dropout_(DROP_RATE)
+        explicit dropout_rate_() : dropout_(static_cast<float>(DROP_RATE_PERCENT) / 100.0f)
         {
-            DLIB_CASSERT(0 <= DROP_RATE && DROP_RATE <= 1, 
-                "DROP_RATE must be between 0 and 1, inclusive.");
+            static_assert(DROP_RATE_PERCENT >= 0 && DROP_RATE_PERCENT <= 100,
+                "DROP_RATE_PERCENT must be between 0 and 100, inclusive.");
         }
     };
-
-    template <float DROP_RATE, typename SUBNET>
+    
+    template <int DROP_RATE, typename SUBNET>
     using dropout_rate = add_layer<dropout_rate_<DROP_RATE>, SUBNET>;
-
-    template <typename SUBNET>
-    using dropout_rate_5 = add_layer<dropout_rate_<0.05f>, SUBNET>;    
-    template <typename SUBNET>
-    using dropout_rate_10 = add_layer<dropout_rate_<0.10f>, SUBNET>;
-    template <typename SUBNET>
-    using dropout_rate_15 = add_layer<dropout_rate_<0.15f>, SUBNET>;
-    template <typename SUBNET>
-    using dropout_rate_20 = add_layer<dropout_rate_<0.20f>, SUBNET>;
     template <typename SUBNET>
-    using dropout_rate_25 = add_layer<dropout_rate_<0.25f>, SUBNET>;
+    using dropout_10 = add_layer<dropout_rate_<10>, SUBNET>;
 
 // ----------------------------------------------------------------------------------------
 

diff --git a/dlib/dnn/layers_abstract.h b/dlib/dnn/layers_abstract.h
@@ -1435,7 +1435,7 @@ namespace dlib
 
 // ----------------------------------------------------------------------------------------
 
-    template <float DROP_RATE>
+    template <int DROP_RATE_PERCENT>
     class dropout_rate_ : public dropout_
     {
         /*!
@@ -1451,7 +1451,7 @@ namespace dlib
                 flexibility and clarity in the network architecture definition.
 
             TEMPLATE PARAMETERS
-                - DROP_RATE: A float value between 0 and 1 that specifies the dropout rate.
+                - DROP_RATE_PERCENT: A int value between 0 and 100 that specifies the dropout rate.
                   This value is set at compile-time and cannot be changed during runtime.
         !*/
 
@@ -1464,7 +1464,7 @@ namespace dlib
         !*/
     };
 
-    template <float DROP_RATE, typename SUBNET>
+    template <int DROP_RATE, typename SUBNET>
     using dropout_rate = add_layer<dropout_rate_<DROP_RATE>, SUBNET>;
 
 // ----------------------------------------------------------------------------------------