Commit 030f5a0a authored by Davis King's avatar Davis King

A bit more cleanup

parent 47bdf95f
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
using namespace std; using namespace std;
using namespace dlib; using namespace dlib;
template <typename T> using ares = relu<add_prev1<affine<con<relu<affine<con<tag1<T>>>>>>>>; // ----------------------------------------------------------------------------------------
template <typename T> using res = relu<add_prev1<bn<con<relu<bn<con<tag1<T>>>>>>>>; template <typename T> using res = relu<add_prev1<bn<con<relu<bn<con<tag1<T>>>>>>>>;
std::tuple<relu_,add_prev1_,bn_,con_,relu_,bn_,con_> res_ ( std::tuple<relu_,add_prev1_,bn_,con_,relu_,bn_,con_> res_ (
unsigned long outputs, unsigned long outputs,
unsigned long stride = 1 unsigned long stride = 1
...@@ -24,6 +25,9 @@ std::tuple<relu_,add_prev1_,bn_,con_,relu_,bn_,con_> res_ ( ...@@ -24,6 +25,9 @@ std::tuple<relu_,add_prev1_,bn_,con_,relu_,bn_,con_> res_ (
con_(outputs,3,3,stride,stride)); con_(outputs,3,3,stride,stride));
} }
template <typename T> using ares = relu<add_prev1<affine<con<relu<affine<con<tag1<T>>>>>>>>;
// ----------------------------------------------------------------------------------------
int main(int argc, char** argv) try int main(int argc, char** argv) try
{ {
...@@ -87,6 +91,7 @@ int main(int argc, char** argv) try ...@@ -87,6 +91,7 @@ int main(int argc, char** argv) try
// You can access sub layers of the network like this: // You can access sub layers of the network like this:
net.subnet().subnet().get_output(); net.subnet().subnet().get_output();
layer<2>(net).get_output();
layer<avg_pool>(net).get_output(); layer<avg_pool>(net).get_output();
net.clean(); net.clean();
......
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