From 0ae1cd81d2952721c9b51210eff2cc99c4dbbab6 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 14 Jul 2018 22:54:52 +0000
Subject: [PATCH] Merge pull request #1212 from tinohager/master
---
src/reorg_layer.c | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/reorg_layer.c b/src/reorg_layer.c
index 9c8ea82..c298b40 100644
--- a/src/reorg_layer.c
+++ b/src/reorg_layer.c
@@ -77,44 +77,42 @@
void forward_reorg_layer(const layer l, network_state state)
{
- if (l.reverse) {
- reorg_cpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, l.output);
- }
- else {
- reorg_cpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, l.output);
- }
+ if (l.reverse) {
+ reorg_cpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, l.output);
+ }
+ else {
+ reorg_cpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, l.output);
+ }
}
void backward_reorg_layer(const layer l, network_state state)
{
- if (l.reverse) {
- reorg_cpu(l.delta, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, state.delta);
- }
- else {
- reorg_cpu(l.delta, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, state.delta);
- }
+ if (l.reverse) {
+ reorg_cpu(l.delta, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, state.delta);
+ }
+ else {
+ reorg_cpu(l.delta, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, state.delta);
+ }
}
#ifdef GPU
void forward_reorg_layer_gpu(layer l, network_state state)
{
- if (l.reverse) {
- reorg_ongpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, l.output_gpu);
- }
- else {
- reorg_ongpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, l.output_gpu);
- }
+ if (l.reverse) {
+ reorg_ongpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, l.output_gpu);
+ }
+ else {
+ reorg_ongpu(state.input, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, l.output_gpu);
+ }
}
void backward_reorg_layer_gpu(layer l, network_state state)
{
- if (l.reverse) {
- reorg_ongpu(l.delta_gpu, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, state.delta);
- //reorg_ongpu(l.delta_gpu, l.w, l.h, l.c, l.batch, l.stride, 0, state.delta);
- }
- else {
- reorg_ongpu(l.delta_gpu, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, state.delta);
- //reorg_ongpu(l.delta_gpu, l.w, l.h, l.c, l.batch, l.stride, 1, state.delta);
- }
+ if (l.reverse) {
+ reorg_ongpu(l.delta_gpu, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 0, state.delta);
+ }
+ else {
+ reorg_ongpu(l.delta_gpu, l.out_w, l.out_h, l.out_c, l.batch, l.stride, 1, state.delta);
+ }
}
#endif
--
Gitblit v1.10.0