Skip to content

D
dlib
Commit feb81e1f authored by Davis King's avatar Davis King
Browse files
Options

Made fc<> always use a bias and added an fc_no_bias<> for the other case.

parent 6acddf99
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 5 deletions
dlib/dnn/layers.h
View file @ feb81e1f
...@@ -705,10 +705,15 @@ namespace dlib ...@@ -705,10 +705,15 @@ namespace dlib
template < template <
unsigned long num_outputs, unsigned long num_outputs,
fc_bias_mode bias_mode,
typename SUBNET typename SUBNET
> >
using fc = add_layer<fc_<num_outputs,bias_mode>, SUBNET>; using fc = add_layer<fc_<num_outputs,FC_HAS_BIAS>, SUBNET>;
template <
unsigned long num_outputs,
typename SUBNET
>
using fc_no_bias = add_layer<fc_<num_outputs,FC_NO_BIAS>, SUBNET>;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
dlib/dnn/layers_abstract.h
View file @ feb81e1f
...@@ -396,13 +396,17 @@ namespace dlib ...@@ -396,13 +396,17 @@ namespace dlib
!*/ !*/
}; };
template <
unsigned long num_outputs,
typename SUBNET
>
using fc = add_layer<fc_<num_outputs,FC_HAS_BIAS>, SUBNET>;
template < template <
unsigned long num_outputs, unsigned long num_outputs,
fc_bias_mode bias_mode,
typename SUBNET typename SUBNET
> >
using fc = add_layer<fc_<num_outputs,bias_mode>, SUBNET>; using fc_no_bias = add_layer<fc_<num_outputs,FC_NO_BIAS>, SUBNET>;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
dlib/test/dnn.cpp
View file @ feb81e1f
...@@ -1176,7 +1176,7 @@ namespace ...@@ -1176,7 +1176,7 @@ namespace
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template <unsigned long n, typename SUBNET> using rcon = max_pool<2,2,2,2,relu<bn_con<con<n,5,5,1,1,SUBNET>>>>; template <unsigned long n, typename SUBNET> using rcon = max_pool<2,2,2,2,relu<bn_con<con<n,5,5,1,1,SUBNET>>>>;
template <unsigned long n, typename SUBNET> using rfc = relu<bn_fc<fc<n,FC_HAS_BIAS,SUBNET>>>; template <unsigned long n, typename SUBNET> using rfc = relu<bn_fc<fc<n,SUBNET>>>;
void test_tagging( void test_tagging(
) )
...@@ -1190,6 +1190,8 @@ namespace ...@@ -1190,6 +1190,8 @@ namespace
DLIB_TEST(layer<skip1>(net).num_layers == 8+3+3); DLIB_TEST(layer<skip1>(net).num_layers == 8+3+3);
DLIB_TEST(&layer<skip1>(net).get_output() == &layer<tag1>(net).get_output()); DLIB_TEST(&layer<skip1>(net).get_output() == &layer<tag1>(net).get_output());
DLIB_TEST(&layer<skip1>(net).get_output() != &layer<tag1>(net).subnet().subnet().get_output()); DLIB_TEST(&layer<skip1>(net).get_output() != &layer<tag1>(net).subnet().subnet().get_output());
DLIB_TEST(net.subnet().subnet().subnet().layer_details().get_num_outputs() == 10);
DLIB_TEST(net2.subnet().subnet().subnet().layer_details().get_num_outputs() == 4);
} }
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment