From ba05a4a4444380bc827d4c013db8cdc05270853d Mon Sep 17 00:00:00 2001
From: oscarkramer <oscar.kramer@radiantsolutions.com>
Date: Tue, 4 Jun 2019 13:47:46 -0400
Subject: [PATCH] Dunno but just in case

---
 .idea/codeStyles/Project.xml |   29 -
 .idea/workspace.xml          |  527 +++------
 src/gemm.c                   |  257 ++---
 src/image.c                  | 2059 +++++++++++++++++-----------------
 4 files changed, 1348 insertions(+), 1524 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626c..00000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5cbaf07d..27c0090c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true" buildAllGenerated="true">
+  <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
     <generated>
       <config projectName="darknet" targetName="DarkNet" />
       <config projectName="darknet" targetName="darknet" />
@@ -13,25 +13,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3bfbf356-8fb4-42b7-9cf0-3c2abcc5c096" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/examples/attention.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/attention.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/captcha.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/captcha.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/classifier.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/classifier.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/coco.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/coco.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/detector.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/detector.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/instance-segmenter.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/instance-segmenter.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/regressor.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/regressor.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/segmenter.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/segmenter.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/super.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/super.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/swag.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/swag.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/tag.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/tag.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/voxel.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/voxel.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/writing.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/writing.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/examples/yolo.c" beforeDir="false" afterPath="$PROJECT_DIR$/examples/yolo.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/include/darknet.h" beforeDir="false" afterPath="$PROJECT_DIR$/include/darknet.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/data.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/data.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/data.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/data.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/network.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/network.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/parser.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/parser.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/gemm.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/gemm.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/image.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/image.c" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <ignored path="$PROJECT_DIR$/build/" />
@@ -41,133 +26,46 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
-  <component name="FUSProjectUsageTrigger">
-    <session id="1699346290">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="2" />
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.open.time.2" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="4" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="HIDE" value="18" />
-          <entry key="Makefile" value="1" />
-          <entry key="c" value="179" />
-          <entry key="cu" value="4" />
-          <entry key="gitignore" value="16" />
-          <entry key="h" value="102" />
-          <entry key="txt" value="1011" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="CMakeLists.txt" value="910" />
-          <entry key="ObjectiveC" value="303" />
-          <entry key="PLAIN_TEXT" value="118" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="HIDE" value="1" />
-          <entry key="Makefile" value="8" />
-          <entry key="OLD" value="2" />
-          <entry key="c" value="46" />
-          <entry key="cfg" value="4" />
-          <entry key="cpp" value="1" />
-          <entry key="cu" value="3" />
-          <entry key="darknet (disassembly)" value="1" />
-          <entry key="gitignore" value="1" />
-          <entry key="h" value="20" />
-          <entry key="mit" value="1" />
-          <entry key="txt" value="13" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="CMakeLists.txt" value="11" />
-          <entry key="Disassembly" value="1" />
-          <entry key="ObjectiveC" value="71" />
-          <entry key="PLAIN_TEXT" value="18" />
-        </counts>
-      </usages-collector>
-    </session>
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
   </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
   <component name="FileEditorManager">
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/examples/CMakeLists.txt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="90">
-                  <caret line="6" selection-start-line="6" selection-end-line="6" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/examples/darknet.c">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-360" />
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/parser.c">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="868">
-                  <caret line="1309" column="16" lean-forward="true" selection-start-line="1309" selection-start-column="16" selection-end-line="1309" selection-end-column="16" />
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/network.c">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="579">
-                  <caret line="219" column="6" lean-forward="true" selection-start-line="219" selection-start-column="6" selection-end-line="219" selection-end-column="6" />
+                <state relative-caret-position="300">
+                  <caret line="20" column="21" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/utils.c">
+            <entry file="file://$PROJECT_DIR$/src/gemm.c">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="707">
-                  <caret line="304" selection-start-line="304" selection-end-line="304" />
+                <state relative-caret-position="570">
+                  <caret line="94" selection-start-line="94" selection-end-line="94" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/normalization_layer.h">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="135">
+                  <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
                 </state>
               </provider>
             </entry>
           </file>
           <file pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/convolutional_layer.h">
+            <entry file="file://$PROJECT_DIR$/src/normalization_layer.c">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="165">
-                  <caret line="11" column="10" lean-forward="true" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/list.c">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="810">
-                  <caret line="54" selection-start-line="54" selection-end-line="54" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/option_list.c">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="221">
-                  <caret line="54" selection-start-line="54" selection-end-line="54" />
+                <state relative-caret-position="357">
+                  <caret line="65" column="5" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
                 </state>
               </provider>
             </entry>
@@ -179,76 +77,17 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-182">
-                  <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
+                <state relative-caret-position="720">
+                  <caret line="48" column="13" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/include/darknet.h">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="654">
-                  <caret line="130" column="16" lean-forward="true" selection-start-line="130" selection-start-column="16" selection-end-line="130" selection-end-column="16" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/CMakeLists.txt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="225">
-                  <caret line="15" selection-start-line="15" selection-end-line="15" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/crnn_layer.c">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="566">
-                  <caret line="73" column="41" selection-start-line="73" selection-start-column="41" selection-end-line="73" selection-end-column="41" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/utils.h">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="298">
-                  <caret line="33" column="40" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/src/data.c">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="221">
-                  <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/trace.txt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="90">
-                  <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/cfg/yolov2-tiny-voc.cfg">
-              <provider selected="true" editor-type-id="text-editor" />
-            </entry>
-          </file>
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/cfg/yolov2-tiny.cfg">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="165">
-                  <caret line="11" column="12" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
+                  <caret line="130" column="16" selection-start-line="130" selection-start-column="16" selection-end-line="130" selection-end-column="16" />
                 </state>
               </provider>
             </entry>
@@ -258,6 +97,15 @@
               <provider selected="true" editor-type-id="text-editor" />
             </entry>
           </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/convolutional_layer.c">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="221">
+                  <caret line="176" selection-start-line="176" selection-end-line="176" />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -280,10 +128,12 @@
       <find>conv  %5d  %2d</find>
       <find>load</find>
       <find>net</find>
-      <find>load_</find>
       <find>load_network</find>
       <find>char *filename</find>
       <find>load_networ</find>
+      <find>is_1</find>
+      <find>load_</find>
+      <find>bias</find>
     </findStrings>
     <replaceStrings>
       <replace>net-&gt;</replace>
@@ -304,7 +154,6 @@
       <list>
         <option value="$PROJECT_DIR$/examples/attention.c" />
         <option value="$PROJECT_DIR$/src/compare.c" />
-        <option value="$PROJECT_DIR$/src/image.c" />
         <option value="$PROJECT_DIR$/examples/swag.c" />
         <option value="$PROJECT_DIR$/examples/dice.c" />
         <option value="$PROJECT_DIR$/examples/writing.c" />
@@ -323,20 +172,16 @@
         <option value="$PROJECT_DIR$/src/parser.c" />
         <option value="$PROJECT_DIR$/include/darknet.h" />
         <option value="$PROJECT_DIR$/trace.txt" />
+        <option value="$PROJECT_DIR$/src/image.c" />
+        <option value="$PROJECT_DIR$/src/gemm.c" />
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
   <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="49" />
+    <option name="x" value="1920" />
     <option name="y" value="-4" />
-    <option name="width" value="1871" />
+    <option name="width" value="1920" />
     <option name="height" value="1204" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -351,17 +196,7 @@
           <expand>
             <path>
               <item name="darknet" type="b2602c69:ProjectViewProjectNode" />
-              <item name="darknet" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="darknet" type="b2602c69:ProjectViewProjectNode" />
-              <item name="darknet" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="darknet" type="b2602c69:ProjectViewProjectNode" />
-              <item name="darknet" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="odarknet" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -370,8 +205,12 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../ossimlabs" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="CMakeSettings" />
@@ -393,7 +232,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.darknet">
+  <component name="RunManager" selected="Application.Build All">
     <configuration name="Build All" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" CONFIG_NAME="Debug" EXPLICIT_BUILD_TARGET_NAME="all">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -404,15 +243,15 @@
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
-    <configuration name="darknet" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="detect cfg/yolov2-tiny.cfg weights/yolov2-tiny-voc.weights data/dog.jpg" WORKING_DIR="file://$PROJECT_DIR$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="darknet" TARGET_NAME="darknet" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="darknet" RUN_TARGET_NAME="darknet">
+    <configuration name="darknet" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="detect cfg/yolov2-tiny.cfg weights/yolov2-tiny.weights data/dog.jpg" WORKING_DIR="file://$PROJECT_DIR$" PASS_PARENT_ENVS_2="true" PROJECT_NAME="darknet" TARGET_NAME="darknet" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="darknet" RUN_TARGET_NAME="darknet">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
     <list>
       <item itemvalue="Application.Build All" />
-      <item itemvalue="Application.darknet" />
       <item itemvalue="Application.DarkNet" />
+      <item itemvalue="Application.darknet" />
     </list>
   </component>
   <component name="TaskManager">
@@ -426,17 +265,17 @@
       <workItem from="1551813347605" duration="22781000" />
       <workItem from="1552935465896" duration="2499000" />
       <workItem from="1552959859845" duration="7935000" />
+      <workItem from="1554929918445" duration="9028000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="46858000" />
+    <option name="totallyTimeSpent" value="55886000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="49" y="-4" width="1871" height="1204" extended-state="6" />
-    <editor active="true" />
+    <frame x="1920" y="-4" width="1920" height="1204" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18082191" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1782284" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -447,12 +286,12 @@
       <window_info anchor="bottom" id="TODO" order="5" />
       <window_info anchor="bottom" id="Docker" order="6" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" x="2179" y="294" width="1129" height="523" id="Messages" order="8" type="FLOATING" weight="0.2811918" />
+      <window_info anchor="bottom" x="637" y="24" width="1129" height="523" id="Messages" order="8" type="FLOATING" weight="0.2811918" />
       <window_info anchor="bottom" id="Terminal" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="Version Control" order="11" show_stripe_button="false" />
       <window_info anchor="bottom" x="72" y="421" width="1825" height="353" id="CMake" order="12" weight="0.32867783" />
-      <window_info anchor="bottom" x="1244" y="148" width="1871" height="997" id="Debug" order="13" type="WINDOWED" visible="true" weight="0.39851025" />
+      <window_info anchor="bottom" x="49" y="83" width="1871" height="997" id="Debug" order="13" type="WINDOWED" visible="true" weight="0.39851025" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -488,41 +327,18 @@
   <component name="UnknownFeatures">
     <option featureType="com.intellij.fileTypeFactory" implementationName="*.cfg" />
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/src/parser.c</url>
-          <line>1172</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/src/parser.c</url>
-          <line>921</line>
-          <option name="timeStamp" value="5" />
+          <url>file://$PROJECT_DIR$/src/gemm.c</url>
+          <line>93</line>
+          <option name="timeStamp" value="9" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/examples/voxel.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="83">
-          <caret line="119" column="42" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/go.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7005">
-          <caret line="467" selection-start-line="467" selection-end-line="467" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/avgpool_layer_kernels.cu" />
     <entry file="file://$PROJECT_DIR$/LICENSE.mit">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -551,13 +367,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/image.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2279">
-          <caret line="536" column="48" selection-start-line="536" selection-start-column="48" selection-end-line="536" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/local_layer.c">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -599,20 +408,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Makefile" />
-    <entry file="file://$PROJECT_DIR$/src/gemm.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="84" selection-start-line="84" selection-end-line="84" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/convolutional_layer.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="176" selection-start-line="176" selection-end-line="176" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/maxpool_layer.c">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
@@ -671,53 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/crnn_layer.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="566">
-          <caret line="73" column="41" selection-start-line="73" selection-start-column="41" selection-end-line="73" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/data.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="33" column="40" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-182">
-          <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/darknet.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-360" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/connected_layer.c">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="221">
@@ -725,9 +473,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/dropout_layer.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/utils.c">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="707">
+        <state relative-caret-position="4560">
           <caret line="304" selection-start-line="304" selection-end-line="304" />
         </state>
       </provider>
@@ -741,20 +496,45 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/option_list.c">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
+        <state relative-caret-position="810">
           <caret line="54" selection-start-line="54" selection-end-line="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dropout_layer.c">
+    <entry file="file://$PROJECT_DIR$/src/CMakeLists.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
+        <state relative-caret-position="225">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/cfg/yolov2-voc.cfg">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/src/crnn_layer.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1095">
+          <caret line="73" column="41" selection-start-line="73" selection-start-column="41" selection-end-line="73" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/utils.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="495">
+          <caret line="33" column="40" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/data.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/trace.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/cfg/yolov2-tiny-voc.cfg">
       <provider selected="true" editor-type-id="text-editor" />
@@ -766,38 +546,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/parser.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="868">
-          <caret line="1309" column="16" lean-forward="true" selection-start-line="1309" selection-start-column="16" selection-end-line="1309" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/trace.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/cfg/yolov2-voc.cfg">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/include/darknet.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="654">
-          <caret line="130" column="16" lean-forward="true" selection-start-line="130" selection-start-column="16" selection-end-line="130" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/network.c">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="579">
-          <caret line="219" column="6" lean-forward="true" selection-start-line="219" selection-start-column="6" selection-end-line="219" selection-end-column="6" />
+          <caret line="130" column="16" selection-start-line="130" selection-start-column="16" selection-end-line="130" selection-end-column="16" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/convolutional_layer.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
-          <caret line="11" column="10" lean-forward="true" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
+          <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/CMakeLists.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/darknet.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="403" column="33" selection-start-line="403" selection-start-column="33" selection-end-line="403" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/stb_image.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="8825">
+          <caret line="2427" column="69" selection-start-line="2427" selection-start-column="69" selection-end-line="2427" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/image.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="542">
+          <caret line="1308" column="37" selection-start-line="1308" selection-start-column="37" selection-end-line="1308" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/parser.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="921" selection-start-line="921" selection-end-line="921" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/gemm.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="94" selection-start-line="94" selection-end-line="94" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="720">
+          <caret line="48" column="13" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/convolutional_layer.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="176" selection-start-line="176" selection-end-line="176" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/network.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="20" column="21" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/normalization_layer.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="20" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/normalization_layer.c">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="65" column="5" selection-start-line="65" selection-start-column="5" selection-end-line="65" selection-end-column="5" />
         </state>
       </provider>
     </entry>
diff --git a/src/gemm.c b/src/gemm.c
index 648027f2..6024b39a 100644
--- a/src/gemm.c
+++ b/src/gemm.c
@@ -5,164 +5,169 @@
 #include <stdio.h>
 #include <math.h>
 
-void gemm_bin(int M, int N, int K, float ALPHA, 
-        char  *A, int lda, 
-        float *B, int ldb,
-        float *C, int ldc)
+void gemm_bin(int M, int N, int K, float ALPHA,
+              char  *A, int lda,
+              float *B, int ldb,
+              float *C, int ldc)
 {
-    int i,j,k;
-    for(i = 0; i < M; ++i){
-        for(k = 0; k < K; ++k){
-            char A_PART = A[i*lda+k];
-            if(A_PART){
-                for(j = 0; j < N; ++j){
-                    C[i*ldc+j] += B[k*ldb+j];
-                }
-            } else {
-                for(j = 0; j < N; ++j){
-                    C[i*ldc+j] -= B[k*ldb+j];
-                }
+   int i,j,k;
+   for(i = 0; i < M; ++i){
+      for(k = 0; k < K; ++k){
+         char A_PART = A[i*lda+k];
+         if(A_PART){
+            for(j = 0; j < N; ++j){
+               C[i*ldc+j] += B[k*ldb+j];
             }
-        }
-    }
+         } else {
+            for(j = 0; j < N; ++j){
+               C[i*ldc+j] -= B[k*ldb+j];
+            }
+         }
+      }
+   }
 }
 
 float *random_matrix(int rows, int cols)
 {
-    int i;
-    float *m = calloc(rows*cols, sizeof(float));
-    for(i = 0; i < rows*cols; ++i){
-        m[i] = (float)rand()/RAND_MAX;
-    }
-    return m;
+   int i;
+   float *m = calloc(rows*cols, sizeof(float));
+   for(i = 0; i < rows*cols; ++i){
+      m[i] = (float)rand()/RAND_MAX;
+   }
+   return m;
 }
 
 void time_random_matrix(int TA, int TB, int m, int k, int n)
 {
-    float *a;
-    if(!TA) a = random_matrix(m,k);
-    else a = random_matrix(k,m);
-    int lda = (!TA)?k:m;
-    float *b;
-    if(!TB) b = random_matrix(k,n);
-    else b = random_matrix(n,k);
-    int ldb = (!TB)?n:k;
+   float *a;
+   if(!TA) a = random_matrix(m,k);
+   else a = random_matrix(k,m);
+   int lda = (!TA)?k:m;
+   float *b;
+   if(!TB) b = random_matrix(k,n);
+   else b = random_matrix(n,k);
+   int ldb = (!TB)?n:k;
 
-    float *c = random_matrix(m,n);
-    int i;
-    clock_t start = clock(), end;
-    for(i = 0; i<10; ++i){
-        gemm_cpu(TA,TB,m,n,k,1,a,lda,b,ldb,1,c,n);
-    }
-    end = clock();
-    printf("Matrix Multiplication %dx%d * %dx%d, TA=%d, TB=%d: %lf ms\n",m,k,k,n, TA, TB, (float)(end-start)/CLOCKS_PER_SEC);
-    free(a);
-    free(b);
-    free(c);
+   float *c = random_matrix(m,n);
+   int i;
+   clock_t start = clock(), end;
+   for(i = 0; i<10; ++i){
+      gemm_cpu(TA,TB,m,n,k,1,a,lda,b,ldb,1,c,n);
+   }
+   end = clock();
+   printf("Matrix Multiplication %dx%d * %dx%d, TA=%d, TB=%d: %lf ms\n",m,k,k,n, TA, TB, (float)(end-start)/CLOCKS_PER_SEC);
+   free(a);
+   free(b);
+   free(c);
 }
 
 
-void gemm(int TA, int TB, int M, int N, int K, float ALPHA, 
-        float *A, int lda, 
-        float *B, int ldb,
-        float BETA,
-        float *C, int ldc)
+void gemm(int TA, int TB, int M, int N, int K, float ALPHA,
+          float *A, int lda,
+          float *B, int ldb,
+          float BETA,
+          float *C, int ldc)
 {
-    gemm_cpu( TA,  TB,  M, N, K, ALPHA,A,lda, B, ldb,BETA,C,ldc);
+   gemm_cpu( TA,  TB,  M, N, K, ALPHA,A,lda, B, ldb,BETA,C,ldc);
 }
 
-void gemm_nn(int M, int N, int K, float ALPHA, 
-        float *A, int lda, 
-        float *B, int ldb,
-        float *C, int ldc)
+void gemm_nn(int M, int N, int K, float ALPHA,
+             float *A, int lda,
+             float *B, int ldb,
+             float *C, int ldc)
 {
-    int i,j,k;
-    #pragma omp parallel for
-    for(i = 0; i < M; ++i){
-        for(k = 0; k < K; ++k){
-            register float A_PART = ALPHA*A[i*lda+k];
-            for(j = 0; j < N; ++j){
-                C[i*ldc+j] += A_PART*B[k*ldb+j];
+   int i,j,k;
+#pragma omp parallel for
+   for(i = 0; i < M; ++i){
+      for(k = 0; k < K; ++k){
+         register float A_PART = ALPHA*A[i*lda+k];
+         for(j = 0; j < N; ++j){
+            C[i*ldc+j] += A_PART*B[k*ldb+j];
+            if (i==0 && j==26688)
+            {
+               unsigned short p =  B[k*ldb+j]*255;
+               fprintf(stderr,"j=%d,  A=%f,  B=%f (0x%02x),  C=%f\n",j, A_PART, B[k*ldb+j],p,C[i*ldc+j]);
             }
-        }
-    }
+         }
+      }
+   }
 }
 
-void gemm_nt(int M, int N, int K, float ALPHA, 
-        float *A, int lda, 
-        float *B, int ldb,
-        float *C, int ldc)
+void gemm_nt(int M, int N, int K, float ALPHA,
+             float *A, int lda,
+             float *B, int ldb,
+             float *C, int ldc)
 {
-    int i,j,k;
-    #pragma omp parallel for
-    for(i = 0; i < M; ++i){
-        for(j = 0; j < N; ++j){
-            register float sum = 0;
-            for(k = 0; k < K; ++k){
-                sum += ALPHA*A[i*lda+k]*B[j*ldb + k];
-            }
-            C[i*ldc+j] += sum;
-        }
-    }
+   int i,j,k;
+#pragma omp parallel for
+   for(i = 0; i < M; ++i){
+      for(j = 0; j < N; ++j){
+         register float sum = 0;
+         for(k = 0; k < K; ++k){
+            sum += ALPHA*A[i*lda+k]*B[j*ldb + k];
+         }
+         C[i*ldc+j] += sum;
+      }
+   }
 }
 
-void gemm_tn(int M, int N, int K, float ALPHA, 
-        float *A, int lda, 
-        float *B, int ldb,
-        float *C, int ldc)
+void gemm_tn(int M, int N, int K, float ALPHA,
+             float *A, int lda,
+             float *B, int ldb,
+             float *C, int ldc)
 {
-    int i,j,k;
-    #pragma omp parallel for
-    for(i = 0; i < M; ++i){
-        for(k = 0; k < K; ++k){
-            register float A_PART = ALPHA*A[k*lda+i];
-            for(j = 0; j < N; ++j){
-                C[i*ldc+j] += A_PART*B[k*ldb+j];
-            }
-        }
-    }
+   int i,j,k;
+#pragma omp parallel for
+   for(i = 0; i < M; ++i){
+      for(k = 0; k < K; ++k){
+         register float A_PART = ALPHA*A[k*lda+i];
+         for(j = 0; j < N; ++j){
+            C[i*ldc+j] += A_PART*B[k*ldb+j];
+         }
+      }
+   }
 }
 
-void gemm_tt(int M, int N, int K, float ALPHA, 
-        float *A, int lda, 
-        float *B, int ldb,
-        float *C, int ldc)
+void gemm_tt(int M, int N, int K, float ALPHA,
+             float *A, int lda,
+             float *B, int ldb,
+             float *C, int ldc)
 {
-    int i,j,k;
-    #pragma omp parallel for
-    for(i = 0; i < M; ++i){
-        for(j = 0; j < N; ++j){
-            register float sum = 0;
-            for(k = 0; k < K; ++k){
-                sum += ALPHA*A[i+k*lda]*B[k+j*ldb];
-            }
-            C[i*ldc+j] += sum;
-        }
-    }
+   int i,j,k;
+#pragma omp parallel for
+   for(i = 0; i < M; ++i){
+      for(j = 0; j < N; ++j){
+         register float sum = 0;
+         for(k = 0; k < K; ++k){
+            sum += ALPHA*A[i+k*lda]*B[k+j*ldb];
+         }
+         C[i*ldc+j] += sum;
+      }
+   }
 }
 
 
-void gemm_cpu(int TA, int TB, int M, int N, int K, float ALPHA, 
-        float *A, int lda, 
-        float *B, int ldb,
-        float BETA,
-        float *C, int ldc)
+void gemm_cpu(int TA, int TB, int M, int N, int K, float ALPHA,
+              float *A, int lda,
+              float *B, int ldb,
+              float BETA,
+              float *C, int ldc)
 {
-    //printf("cpu: %d %d %d %d %d %f %d %d %f %d\n",TA, TB, M, N, K, ALPHA, lda, ldb, BETA, ldc);
-    int i, j;
-    for(i = 0; i < M; ++i){
-        for(j = 0; j < N; ++j){
-            C[i*ldc + j] *= BETA;
-        }
-    }
-    if(!TA && !TB)
-        gemm_nn(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
-    else if(TA && !TB)
-        gemm_tn(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
-    else if(!TA && TB)
-        gemm_nt(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
-    else
-        gemm_tt(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
+   //printf("cpu: %d %d %d %d %d %f %d %d %f %d\n",TA, TB, M, N, K, ALPHA, lda, ldb, BETA, ldc);
+   int i, j;
+   for(i = 0; i < M; ++i){
+      for(j = 0; j < N; ++j){
+         C[i*ldc + j] *= BETA;
+      }
+   }
+   if(!TA && !TB)
+      gemm_nn(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
+   else if(TA && !TB)
+      gemm_tn(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
+   else if(!TA && TB)
+      gemm_nt(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
+   else
+      gemm_tt(M, N, K, ALPHA,A,lda, B, ldb,C,ldc);
 }
 
 #ifdef GPU
diff --git a/src/image.c b/src/image.c
index d508cf68..0eebde7d 100644
--- a/src/image.c
+++ b/src/image.c
@@ -16,1256 +16,1256 @@ float colors[6][3] = { {1,0,1}, {0,0,1},{0,1,1},{0,1,0},{1,1,0},{1,0,0} };
 
 float get_color(int c, int x, int max)
 {
-    float ratio = ((float)x/max)*5;
-    int i = floor(ratio);
-    int j = ceil(ratio);
-    ratio -= i;
-    float r = (1-ratio) * colors[i][c] + ratio*colors[j][c];
-    //printf("%f\n", r);
-    return r;
+   float ratio = ((float)x/max)*5;
+   int i = floor(ratio);
+   int j = ceil(ratio);
+   ratio -= i;
+   float r = (1-ratio) * colors[i][c] + ratio*colors[j][c];
+   //printf("%f\n", r);
+   return r;
 }
 
 dn_image mask_to_rgb(dn_image mask)
 {
-    int n = mask.c;
-    dn_image im = make_image(mask.w, mask.h, 3);
-    int i, j;
-    for(j = 0; j < n; ++j){
-        int offset = j*123457 % n;
-        float red = get_color(2,offset,n);
-        float green = get_color(1,offset,n);
-        float blue = get_color(0,offset,n);
-        for(i = 0; i < im.w*im.h; ++i){
-            im.data[i + 0*im.w*im.h] += mask.data[j*im.h*im.w + i]*red;
-            im.data[i + 1*im.w*im.h] += mask.data[j*im.h*im.w + i]*green;
-            im.data[i + 2*im.w*im.h] += mask.data[j*im.h*im.w + i]*blue;
-        }
-    }
-    return im;
+   int n = mask.c;
+   dn_image im = make_image(mask.w, mask.h, 3);
+   int i, j;
+   for(j = 0; j < n; ++j){
+      int offset = j*123457 % n;
+      float red = get_color(2,offset,n);
+      float green = get_color(1,offset,n);
+      float blue = get_color(0,offset,n);
+      for(i = 0; i < im.w*im.h; ++i){
+         im.data[i + 0*im.w*im.h] += mask.data[j*im.h*im.w + i]*red;
+         im.data[i + 1*im.w*im.h] += mask.data[j*im.h*im.w + i]*green;
+         im.data[i + 2*im.w*im.h] += mask.data[j*im.h*im.w + i]*blue;
+      }
+   }
+   return im;
 }
 
 static float get_pixel(dn_image m, int x, int y, int c)
 {
-    assert(x < m.w && y < m.h && c < m.c);
-    return m.data[c*m.h*m.w + y*m.w + x];
+   assert(x < m.w && y < m.h && c < m.c);
+   return m.data[c*m.h*m.w + y*m.w + x];
 }
 static float get_pixel_extend(dn_image m, int x, int y, int c)
 {
-    if(x < 0 || x >= m.w || y < 0 || y >= m.h) return 0;
-    /*
-    if(x < 0) x = 0;
-    if(x >= m.w) x = m.w-1;
-    if(y < 0) y = 0;
-    if(y >= m.h) y = m.h-1;
-    */
-    if(c < 0 || c >= m.c) return 0;
-    return get_pixel(m, x, y, c);
+   if(x < 0 || x >= m.w || y < 0 || y >= m.h) return 0;
+   /*
+   if(x < 0) x = 0;
+   if(x >= m.w) x = m.w-1;
+   if(y < 0) y = 0;
+   if(y >= m.h) y = m.h-1;
+   */
+   if(c < 0 || c >= m.c) return 0;
+   return get_pixel(m, x, y, c);
 }
 static void set_pixel(dn_image m, int x, int y, int c, float val)
 {
-    if (x < 0 || y < 0 || c < 0 || x >= m.w || y >= m.h || c >= m.c) return;
-    assert(x < m.w && y < m.h && c < m.c);
-    m.data[c*m.h*m.w + y*m.w + x] = val;
+   if (x < 0 || y < 0 || c < 0 || x >= m.w || y >= m.h || c >= m.c) return;
+   assert(x < m.w && y < m.h && c < m.c);
+   m.data[c*m.h*m.w + y*m.w + x] = val;
 }
 static void add_pixel(dn_image m, int x, int y, int c, float val)
 {
-    assert(x < m.w && y < m.h && c < m.c);
-    m.data[c*m.h*m.w + y*m.w + x] += val;
+   assert(x < m.w && y < m.h && c < m.c);
+   m.data[c*m.h*m.w + y*m.w + x] += val;
 }
 
 static float bilinear_interpolate(dn_image im, float x, float y, int c)
 {
-    int ix = (int) floorf(x);
-    int iy = (int) floorf(y);
+   int ix = (int) floorf(x);
+   int iy = (int) floorf(y);
 
-    float dx = x - ix;
-    float dy = y - iy;
+   float dx = x - ix;
+   float dy = y - iy;
 
-    float val = (1-dy) * (1-dx) * get_pixel_extend(im, ix, iy, c) + 
-        dy     * (1-dx) * get_pixel_extend(im, ix, iy+1, c) + 
-        (1-dy) *   dx   * get_pixel_extend(im, ix+1, iy, c) +
-        dy     *   dx   * get_pixel_extend(im, ix+1, iy+1, c);
-    return val;
+   float val = (1-dy) * (1-dx) * get_pixel_extend(im, ix, iy, c) +
+               dy     * (1-dx) * get_pixel_extend(im, ix, iy+1, c) +
+               (1-dy) *   dx   * get_pixel_extend(im, ix+1, iy, c) +
+               dy     *   dx   * get_pixel_extend(im, ix+1, iy+1, c);
+   return val;
 }
 
 
 void composite_image(dn_image source, dn_image dest, int dx, int dy)
 {
-    int x,y,k;
-    for(k = 0; k < source.c; ++k){
-        for(y = 0; y < source.h; ++y){
-            for(x = 0; x < source.w; ++x){
-                float val = get_pixel(source, x, y, k);
-                float val2 = get_pixel_extend(dest, dx+x, dy+y, k);
-                set_pixel(dest, dx+x, dy+y, k, val * val2);
-            }
-        }
-    }
+   int x,y,k;
+   for(k = 0; k < source.c; ++k){
+      for(y = 0; y < source.h; ++y){
+         for(x = 0; x < source.w; ++x){
+            float val = get_pixel(source, x, y, k);
+            float val2 = get_pixel_extend(dest, dx+x, dy+y, k);
+            set_pixel(dest, dx+x, dy+y, k, val * val2);
+         }
+      }
+   }
 }
 
 dn_image border_image(dn_image a, int border)
 {
-    dn_image b = make_image(a.w + 2*border, a.h + 2*border, a.c);
-    int x,y,k;
-    for(k = 0; k < b.c; ++k){
-        for(y = 0; y < b.h; ++y){
-            for(x = 0; x < b.w; ++x){
-                float val = get_pixel_extend(a, x - border, y - border, k);
-                if(x - border < 0 || x - border >= a.w || y - border < 0 || y - border >= a.h) val = 1;
-                set_pixel(b, x, y, k, val);
-            }
-        }
-    }
-    return b;
+   dn_image b = make_image(a.w + 2*border, a.h + 2*border, a.c);
+   int x,y,k;
+   for(k = 0; k < b.c; ++k){
+      for(y = 0; y < b.h; ++y){
+         for(x = 0; x < b.w; ++x){
+            float val = get_pixel_extend(a, x - border, y - border, k);
+            if(x - border < 0 || x - border >= a.w || y - border < 0 || y - border >= a.h) val = 1;
+            set_pixel(b, x, y, k, val);
+         }
+      }
+   }
+   return b;
 }
 
 dn_image tile_images(dn_image a, dn_image b, int dx)
 {
-    if(a.w == 0) return copy_image(b);
-    dn_image c = make_image(a.w + b.w + dx, (a.h > b.h) ? a.h : b.h, (a.c > b.c) ? a.c : b.c);
-    fill_cpu(c.w*c.h*c.c, 1, c.data, 1);
-    embed_image(a, c, 0, 0); 
-    composite_image(b, c, a.w + dx, 0);
-    return c;
+   if(a.w == 0) return copy_image(b);
+   dn_image c = make_image(a.w + b.w + dx, (a.h > b.h) ? a.h : b.h, (a.c > b.c) ? a.c : b.c);
+   fill_cpu(c.w*c.h*c.c, 1, c.data, 1);
+   embed_image(a, c, 0, 0);
+   composite_image(b, c, a.w + dx, 0);
+   return c;
 }
 
 dn_image get_label(dn_image **characters, char *string, int size)
 {
-    size = size/10;
-    if(size > 7) size = 7;
-    dn_image label = make_empty_image(0,0,0);
-    while(*string){
-        dn_image l = characters[size][(int)*string];
-        dn_image n = tile_images(label, l, -size - 1 + (size+1)/2);
-        free_image(label);
-        label = n;
-        ++string;
-    }
-    dn_image b = border_image(label, label.h*.25);
-    free_image(label);
-    return b;
+   size = size/10;
+   if(size > 7) size = 7;
+   dn_image label = make_empty_image(0,0,0);
+   while(*string){
+      dn_image l = characters[size][(int)*string];
+      dn_image n = tile_images(label, l, -size - 1 + (size+1)/2);
+      free_image(label);
+      label = n;
+      ++string;
+   }
+   dn_image b = border_image(label, label.h*.25);
+   free_image(label);
+   return b;
 }
 
 void draw_label(dn_image a, int r, int c, dn_image label, const float *rgb)
 {
-    int w = label.w;
-    int h = label.h;
-    if (r - h >= 0) r = r - h;
+   int w = label.w;
+   int h = label.h;
+   if (r - h >= 0) r = r - h;
 
-    int i, j, k;
-    for(j = 0; j < h && j + r < a.h; ++j){
-        for(i = 0; i < w && i + c < a.w; ++i){
-            for(k = 0; k < label.c; ++k){
-                float val = get_pixel(label, i, j, k);
-                set_pixel(a, i+c, j+r, k, rgb[k] * val);
-            }
-        }
-    }
+   int i, j, k;
+   for(j = 0; j < h && j + r < a.h; ++j){
+      for(i = 0; i < w && i + c < a.w; ++i){
+         for(k = 0; k < label.c; ++k){
+            float val = get_pixel(label, i, j, k);
+            set_pixel(a, i+c, j+r, k, rgb[k] * val);
+         }
+      }
+   }
 }
 
 void draw_box(dn_image a, int x1, int y1, int x2, int y2, float r, float g, float b)
 {
-    //normalize_image(a);
-    int i;
-    if(x1 < 0) x1 = 0;
-    if(x1 >= a.w) x1 = a.w-1;
-    if(x2 < 0) x2 = 0;
-    if(x2 >= a.w) x2 = a.w-1;
+   //normalize_image(a);
+   int i;
+   if(x1 < 0) x1 = 0;
+   if(x1 >= a.w) x1 = a.w-1;
+   if(x2 < 0) x2 = 0;
+   if(x2 >= a.w) x2 = a.w-1;
 
-    if(y1 < 0) y1 = 0;
-    if(y1 >= a.h) y1 = a.h-1;
-    if(y2 < 0) y2 = 0;
-    if(y2 >= a.h) y2 = a.h-1;
+   if(y1 < 0) y1 = 0;
+   if(y1 >= a.h) y1 = a.h-1;
+   if(y2 < 0) y2 = 0;
+   if(y2 >= a.h) y2 = a.h-1;
 
-    for(i = x1; i <= x2; ++i){
-        a.data[i + y1*a.w + 0*a.w*a.h] = r;
-        a.data[i + y2*a.w + 0*a.w*a.h] = r;
+   for(i = x1; i <= x2; ++i){
+      a.data[i + y1*a.w + 0*a.w*a.h] = r;
+      a.data[i + y2*a.w + 0*a.w*a.h] = r;
 
-        a.data[i + y1*a.w + 1*a.w*a.h] = g;
-        a.data[i + y2*a.w + 1*a.w*a.h] = g;
+      a.data[i + y1*a.w + 1*a.w*a.h] = g;
+      a.data[i + y2*a.w + 1*a.w*a.h] = g;
 
-        a.data[i + y1*a.w + 2*a.w*a.h] = b;
-        a.data[i + y2*a.w + 2*a.w*a.h] = b;
-    }
-    for(i = y1; i <= y2; ++i){
-        a.data[x1 + i*a.w + 0*a.w*a.h] = r;
-        a.data[x2 + i*a.w + 0*a.w*a.h] = r;
+      a.data[i + y1*a.w + 2*a.w*a.h] = b;
+      a.data[i + y2*a.w + 2*a.w*a.h] = b;
+   }
+   for(i = y1; i <= y2; ++i){
+      a.data[x1 + i*a.w + 0*a.w*a.h] = r;
+      a.data[x2 + i*a.w + 0*a.w*a.h] = r;
 
-        a.data[x1 + i*a.w + 1*a.w*a.h] = g;
-        a.data[x2 + i*a.w + 1*a.w*a.h] = g;
+      a.data[x1 + i*a.w + 1*a.w*a.h] = g;
+      a.data[x2 + i*a.w + 1*a.w*a.h] = g;
 
-        a.data[x1 + i*a.w + 2*a.w*a.h] = b;
-        a.data[x2 + i*a.w + 2*a.w*a.h] = b;
-    }
+      a.data[x1 + i*a.w + 2*a.w*a.h] = b;
+      a.data[x2 + i*a.w + 2*a.w*a.h] = b;
+   }
 }
 
 void draw_box_width(dn_image a, int x1, int y1, int x2, int y2, int w, float r, float g, float b)
 {
-    int i;
-    for(i = 0; i < w; ++i){
-        draw_box(a, x1+i, y1+i, x2-i, y2-i, r, g, b);
-    }
+   int i;
+   for(i = 0; i < w; ++i){
+      draw_box(a, x1+i, y1+i, x2-i, y2-i, r, g, b);
+   }
 }
 
 void draw_bbox(dn_image a, dn_box bbox, int w, float r, float g, float b)
 {
-    int left  = (bbox.x-bbox.w/2)*a.w;
-    int right = (bbox.x+bbox.w/2)*a.w;
-    int top   = (bbox.y-bbox.h/2)*a.h;
-    int bot   = (bbox.y+bbox.h/2)*a.h;
+   int left  = (bbox.x-bbox.w/2)*a.w;
+   int right = (bbox.x+bbox.w/2)*a.w;
+   int top   = (bbox.y-bbox.h/2)*a.h;
+   int bot   = (bbox.y+bbox.h/2)*a.h;
 
-    int i;
-    for(i = 0; i < w; ++i){
-        draw_box(a, left+i, top+i, right-i, bot-i, r, g, b);
-    }
+   int i;
+   for(i = 0; i < w; ++i){
+      draw_box(a, left+i, top+i, right-i, bot-i, r, g, b);
+   }
 }
 
 dn_image **load_alphabet()
 {
-    int i, j;
-    const int nsize = 8;
-    dn_image **alphabets = calloc(nsize, sizeof(dn_image));
-    for(j = 0; j < nsize; ++j){
-        alphabets[j] = calloc(128, sizeof(dn_image));
-        for(i = 32; i < 127; ++i){
-            char buff[256];
-            sprintf(buff, "data/labels/%d_%d.png", i, j);
-            alphabets[j][i] = load_image_color(buff, 0, 0);
-        }
-    }
-    return alphabets;
+   int i, j;
+   const int nsize = 8;
+   dn_image **alphabets = calloc(nsize, sizeof(dn_image));
+   for(j = 0; j < nsize; ++j){
+      alphabets[j] = calloc(128, sizeof(dn_image));
+      for(i = 32; i < 127; ++i){
+         char buff[256];
+         sprintf(buff, "data/labels/%d_%d.png", i, j);
+         alphabets[j][i] = load_image_color(buff, 0, 0);
+      }
+   }
+   return alphabets;
 }
 
 void draw_detections(dn_image im, detection *dets, int num, float thresh, char **names, dn_image **alphabet, int classes)
 {
-    int i,j;
+   int i,j;
 
-    for(i = 0; i < num; ++i){
-        char labelstr[4096] = {0};
-        int class = -1;
-        for(j = 0; j < classes; ++j){
-            if (dets[i].prob[j] > thresh){
-                if (class < 0) {
-                    strcat(labelstr, names[j]);
-                    class = j;
-                } else {
-                    strcat(labelstr, ", ");
-                    strcat(labelstr, names[j]);
-                }
-                printf("%s: %.0f%%\n", names[j], dets[i].prob[j]*100);
+   for(i = 0; i < num; ++i){
+      char labelstr[4096] = {0};
+      int class = -1;
+      for(j = 0; j < classes; ++j){
+         if (dets[i].prob[j] > thresh){
+            if (class < 0) {
+               strcat(labelstr, names[j]);
+               class = j;
+            } else {
+               strcat(labelstr, ", ");
+               strcat(labelstr, names[j]);
             }
-        }
-        if(class >= 0){
-            int width = im.h * .006;
+            printf("%s: %.0f%%\n", names[j], dets[i].prob[j]*100);
+         }
+      }
+      if(class >= 0){
+         int width = im.h * .006;
 
-            /*
-               if(0){
-               width = pow(prob, 1./2.)*10+1;
-               alphabet = 0;
-               }
-             */
-
-            //printf("%d %s: %.0f%%\n", i, names[class], prob*100);
-            int offset = class*123457 % classes;
-            float red = get_color(2,offset,classes);
-            float green = get_color(1,offset,classes);
-            float blue = get_color(0,offset,classes);
-            float rgb[3];
-
-            //width = prob*20+2;
-
-            rgb[0] = red;
-            rgb[1] = green;
-            rgb[2] = blue;
-            dn_box b = dets[i].bbox;
-            //printf("%f %f %f %f\n", b.x, b.y, b.w, b.h);
-
-            int left  = (b.x-b.w/2.)*im.w;
-            int right = (b.x+b.w/2.)*im.w;
-            int top   = (b.y-b.h/2.)*im.h;
-            int bot   = (b.y+b.h/2.)*im.h;
-
-            if(left < 0) left = 0;
-            if(right > im.w-1) right = im.w-1;
-            if(top < 0) top = 0;
-            if(bot > im.h-1) bot = im.h-1;
-
-            draw_box_width(im, left, top, right, bot, width, red, green, blue);
-            if (alphabet) {
-                dn_image label = get_label(alphabet, labelstr, (im.h*.03));
-                draw_label(im, top + width, left, label, rgb);
-                free_image(label);
+         /*
+            if(0){
+            width = pow(prob, 1./2.)*10+1;
+            alphabet = 0;
             }
-            if (dets[i].mask){
-                dn_image mask = float_to_image(14, 14, 1, dets[i].mask);
-                dn_image resized_mask = resize_image(mask, b.w*im.w, b.h*im.h);
-                dn_image tmask = threshold_image(resized_mask, .5);
-                embed_image(tmask, im, left, top);
-                free_image(mask);
-                free_image(resized_mask);
-                free_image(tmask);
-            }
-        }
-    }
+          */
+
+         //printf("%d %s: %.0f%%\n", i, names[class], prob*100);
+         int offset = class*123457 % classes;
+         float red = get_color(2,offset,classes);
+         float green = get_color(1,offset,classes);
+         float blue = get_color(0,offset,classes);
+         float rgb[3];
+
+         //width = prob*20+2;
+
+         rgb[0] = red;
+         rgb[1] = green;
+         rgb[2] = blue;
+         dn_box b = dets[i].bbox;
+         //printf("%f %f %f %f\n", b.x, b.y, b.w, b.h);
+
+         int left  = (b.x-b.w/2.)*im.w;
+         int right = (b.x+b.w/2.)*im.w;
+         int top   = (b.y-b.h/2.)*im.h;
+         int bot   = (b.y+b.h/2.)*im.h;
+
+         if(left < 0) left = 0;
+         if(right > im.w-1) right = im.w-1;
+         if(top < 0) top = 0;
+         if(bot > im.h-1) bot = im.h-1;
+
+         draw_box_width(im, left, top, right, bot, width, red, green, blue);
+         if (alphabet) {
+            dn_image label = get_label(alphabet, labelstr, (im.h*.03));
+            draw_label(im, top + width, left, label, rgb);
+            free_image(label);
+         }
+         if (dets[i].mask){
+            dn_image mask = float_to_image(14, 14, 1, dets[i].mask);
+            dn_image resized_mask = resize_image(mask, b.w*im.w, b.h*im.h);
+            dn_image tmask = threshold_image(resized_mask, .5);
+            embed_image(tmask, im, left, top);
+            free_image(mask);
+            free_image(resized_mask);
+            free_image(tmask);
+         }
+      }
+   }
 }
 
 void transpose_image(dn_image im)
 {
-    assert(im.w == im.h);
-    int n, m;
-    int c;
-    for(c = 0; c < im.c; ++c){
-        for(n = 0; n < im.w-1; ++n){
-            for(m = n + 1; m < im.w; ++m){
-                float swap = im.data[m + im.w*(n + im.h*c)];
-                im.data[m + im.w*(n + im.h*c)] = im.data[n + im.w*(m + im.h*c)];
-                im.data[n + im.w*(m + im.h*c)] = swap;
-            }
-        }
-    }
+   assert(im.w == im.h);
+   int n, m;
+   int c;
+   for(c = 0; c < im.c; ++c){
+      for(n = 0; n < im.w-1; ++n){
+         for(m = n + 1; m < im.w; ++m){
+            float swap = im.data[m + im.w*(n + im.h*c)];
+            im.data[m + im.w*(n + im.h*c)] = im.data[n + im.w*(m + im.h*c)];
+            im.data[n + im.w*(m + im.h*c)] = swap;
+         }
+      }
+   }
 }
 
 void rotate_image_cw(dn_image im, int times)
 {
-    assert(im.w == im.h);
-    times = (times + 400) % 4;
-    int i, x, y, c;
-    int n = im.w;
-    for(i = 0; i < times; ++i){
-        for(c = 0; c < im.c; ++c){
-            for(x = 0; x < n/2; ++x){
-                for(y = 0; y < (n-1)/2 + 1; ++y){
-                    float temp = im.data[y + im.w*(x + im.h*c)];
-                    im.data[y + im.w*(x + im.h*c)] = im.data[n-1-x + im.w*(y + im.h*c)];
-                    im.data[n-1-x + im.w*(y + im.h*c)] = im.data[n-1-y + im.w*(n-1-x + im.h*c)];
-                    im.data[n-1-y + im.w*(n-1-x + im.h*c)] = im.data[x + im.w*(n-1-y + im.h*c)];
-                    im.data[x + im.w*(n-1-y + im.h*c)] = temp;
-                }
+   assert(im.w == im.h);
+   times = (times + 400) % 4;
+   int i, x, y, c;
+   int n = im.w;
+   for(i = 0; i < times; ++i){
+      for(c = 0; c < im.c; ++c){
+         for(x = 0; x < n/2; ++x){
+            for(y = 0; y < (n-1)/2 + 1; ++y){
+               float temp = im.data[y + im.w*(x + im.h*c)];
+               im.data[y + im.w*(x + im.h*c)] = im.data[n-1-x + im.w*(y + im.h*c)];
+               im.data[n-1-x + im.w*(y + im.h*c)] = im.data[n-1-y + im.w*(n-1-x + im.h*c)];
+               im.data[n-1-y + im.w*(n-1-x + im.h*c)] = im.data[x + im.w*(n-1-y + im.h*c)];
+               im.data[x + im.w*(n-1-y + im.h*c)] = temp;
             }
-        }
-    }
+         }
+      }
+   }
 }
 
 void flip_image(dn_image a)
 {
-    int i,j,k;
-    for(k = 0; k < a.c; ++k){
-        for(i = 0; i < a.h; ++i){
-            for(j = 0; j < a.w/2; ++j){
-                int index = j + a.w*(i + a.h*(k));
-                int flip = (a.w - j - 1) + a.w*(i + a.h*(k));
-                float swap = a.data[flip];
-                a.data[flip] = a.data[index];
-                a.data[index] = swap;
-            }
-        }
-    }
+   int i,j,k;
+   for(k = 0; k < a.c; ++k){
+      for(i = 0; i < a.h; ++i){
+         for(j = 0; j < a.w/2; ++j){
+            int index = j + a.w*(i + a.h*(k));
+            int flip = (a.w - j - 1) + a.w*(i + a.h*(k));
+            float swap = a.data[flip];
+            a.data[flip] = a.data[index];
+            a.data[index] = swap;
+         }
+      }
+   }
 }
 
 dn_image image_distance(dn_image a, dn_image b)
 {
-    int i,j;
-    dn_image dist = make_image(a.w, a.h, 1);
-    for(i = 0; i < a.c; ++i){
-        for(j = 0; j < a.h*a.w; ++j){
-            dist.data[j] += pow(a.data[i*a.h*a.w+j]-b.data[i*a.h*a.w+j],2);
-        }
-    }
-    for(j = 0; j < a.h*a.w; ++j){
-        dist.data[j] = sqrt(dist.data[j]);
-    }
-    return dist;
+   int i,j;
+   dn_image dist = make_image(a.w, a.h, 1);
+   for(i = 0; i < a.c; ++i){
+      for(j = 0; j < a.h*a.w; ++j){
+         dist.data[j] += pow(a.data[i*a.h*a.w+j]-b.data[i*a.h*a.w+j],2);
+      }
+   }
+   for(j = 0; j < a.h*a.w; ++j){
+      dist.data[j] = sqrt(dist.data[j]);
+   }
+   return dist;
 }
 
 void ghost_image(dn_image source, dn_image dest, int dx, int dy)
 {
-    int x,y,k;
-    float max_dist = sqrt((-source.w/2. + .5)*(-source.w/2. + .5));
-    for(k = 0; k < source.c; ++k){
-        for(y = 0; y < source.h; ++y){
-            for(x = 0; x < source.w; ++x){
-                float dist = sqrt((x - source.w/2. + .5)*(x - source.w/2. + .5) + (y - source.h/2. + .5)*(y - source.h/2. + .5));
-                float alpha = (1 - dist/max_dist);
-                if(alpha < 0) alpha = 0;
-                float v1 = get_pixel(source, x,y,k);
-                float v2 = get_pixel(dest, dx+x,dy+y,k);
-                float val = alpha*v1 + (1-alpha)*v2;
-                set_pixel(dest, dx+x, dy+y, k, val);
-            }
-        }
-    }
+   int x,y,k;
+   float max_dist = sqrt((-source.w/2. + .5)*(-source.w/2. + .5));
+   for(k = 0; k < source.c; ++k){
+      for(y = 0; y < source.h; ++y){
+         for(x = 0; x < source.w; ++x){
+            float dist = sqrt((x - source.w/2. + .5)*(x - source.w/2. + .5) + (y - source.h/2. + .5)*(y - source.h/2. + .5));
+            float alpha = (1 - dist/max_dist);
+            if(alpha < 0) alpha = 0;
+            float v1 = get_pixel(source, x,y,k);
+            float v2 = get_pixel(dest, dx+x,dy+y,k);
+            float val = alpha*v1 + (1-alpha)*v2;
+            set_pixel(dest, dx+x, dy+y, k, val);
+         }
+      }
+   }
 }
 
 void blocky_image(dn_image im, int s)
 {
-    int i,j,k;
-    for(k = 0; k < im.c; ++k){
-        for(j = 0; j < im.h; ++j){
-            for(i = 0; i < im.w; ++i){
-                im.data[i + im.w*(j + im.h*k)] = im.data[i/s*s + im.w*(j/s*s + im.h*k)];
-            }
-        }
-    }
+   int i,j,k;
+   for(k = 0; k < im.c; ++k){
+      for(j = 0; j < im.h; ++j){
+         for(i = 0; i < im.w; ++i){
+            im.data[i + im.w*(j + im.h*k)] = im.data[i/s*s + im.w*(j/s*s + im.h*k)];
+         }
+      }
+   }
 }
 
 void censor_image(dn_image im, int dx, int dy, int w, int h)
 {
-    int i,j,k;
-    int s = 32;
-    if(dx < 0) dx = 0;
-    if(dy < 0) dy = 0;
+   int i,j,k;
+   int s = 32;
+   if(dx < 0) dx = 0;
+   if(dy < 0) dy = 0;
 
-    for(k = 0; k < im.c; ++k){
-        for(j = dy; j < dy + h && j < im.h; ++j){
-            for(i = dx; i < dx + w && i < im.w; ++i){
-                im.data[i + im.w*(j + im.h*k)] = im.data[i/s*s + im.w*(j/s*s + im.h*k)];
-                //im.data[i + j*im.w + k*im.w*im.h] = 0;
-            }
-        }
-    }
+   for(k = 0; k < im.c; ++k){
+      for(j = dy; j < dy + h && j < im.h; ++j){
+         for(i = dx; i < dx + w && i < im.w; ++i){
+            im.data[i + im.w*(j + im.h*k)] = im.data[i/s*s + im.w*(j/s*s + im.h*k)];
+            //im.data[i + j*im.w + k*im.w*im.h] = 0;
+         }
+      }
+   }
 }
 
 void embed_image(dn_image source, dn_image dest, int dx, int dy)
 {
-    int x,y,k;
-    for(k = 0; k < source.c; ++k){
-        for(y = 0; y < source.h; ++y){
-            for(x = 0; x < source.w; ++x){
-                float val = get_pixel(source, x,y,k);
-                set_pixel(dest, dx+x, dy+y, k, val);
-            }
-        }
-    }
+   int x,y,k;
+   for(k = 0; k < source.c; ++k){
+      for(y = 0; y < source.h; ++y){
+         for(x = 0; x < source.w; ++x){
+            float val = get_pixel(source, x,y,k);
+            set_pixel(dest, dx+x, dy+y, k, val);
+         }
+      }
+   }
 }
 
 dn_image collapse_image_layers(dn_image source, int border)
 {
-    int h = source.h;
-    h = (h+border)*source.c - border;
-    dn_image dest = make_image(source.w, h, 1);
-    int i;
-    for(i = 0; i < source.c; ++i){
-        dn_image layer = get_image_layer(source, i);
-        int h_offset = i*(source.h+border);
-        embed_image(layer, dest, 0, h_offset);
-        free_image(layer);
-    }
-    return dest;
+   int h = source.h;
+   h = (h+border)*source.c - border;
+   dn_image dest = make_image(source.w, h, 1);
+   int i;
+   for(i = 0; i < source.c; ++i){
+      dn_image layer = get_image_layer(source, i);
+      int h_offset = i*(source.h+border);
+      embed_image(layer, dest, 0, h_offset);
+      free_image(layer);
+   }
+   return dest;
 }
 
 void constrain_image(dn_image im)
 {
-    int i;
-    for(i = 0; i < im.w*im.h*im.c; ++i){
-        if(im.data[i] < 0) im.data[i] = 0;
-        if(im.data[i] > 1) im.data[i] = 1;
-    }
+   int i;
+   for(i = 0; i < im.w*im.h*im.c; ++i){
+      if(im.data[i] < 0) im.data[i] = 0;
+      if(im.data[i] > 1) im.data[i] = 1;
+   }
 }
 
 void normalize_image(dn_image p)
 {
-    int i;
-    float min = 9999999;
-    float max = -999999;
+   int i;
+   float min = 9999999;
+   float max = -999999;
 
-    for(i = 0; i < p.h*p.w*p.c; ++i){
-        float v = p.data[i];
-        if(v < min) min = v;
-        if(v > max) max = v;
-    }
-    if(max - min < .000000001){
-        min = 0;
-        max = 1;
-    }
-    for(i = 0; i < p.c*p.w*p.h; ++i){
-        p.data[i] = (p.data[i] - min)/(max-min);
-    }
+   for(i = 0; i < p.h*p.w*p.c; ++i){
+      float v = p.data[i];
+      if(v < min) min = v;
+      if(v > max) max = v;
+   }
+   if(max - min < .000000001){
+      min = 0;
+      max = 1;
+   }
+   for(i = 0; i < p.c*p.w*p.h; ++i){
+      p.data[i] = (p.data[i] - min)/(max-min);
+   }
 }
 
 void normalize_image2(dn_image p)
 {
-    float *min = calloc(p.c, sizeof(float));
-    float *max = calloc(p.c, sizeof(float));
-    int i,j;
-    for(i = 0; i < p.c; ++i) min[i] = max[i] = p.data[i*p.h*p.w];
+   float *min = calloc(p.c, sizeof(float));
+   float *max = calloc(p.c, sizeof(float));
+   int i,j;
+   for(i = 0; i < p.c; ++i) min[i] = max[i] = p.data[i*p.h*p.w];
 
-    for(j = 0; j < p.c; ++j){
-        for(i = 0; i < p.h*p.w; ++i){
-            float v = p.data[i+j*p.h*p.w];
-            if(v < min[j]) min[j] = v;
-            if(v > max[j]) max[j] = v;
-        }
-    }
-    for(i = 0; i < p.c; ++i){
-        if(max[i] - min[i] < .000000001){
-            min[i] = 0;
-            max[i] = 1;
-        }
-    }
-    for(j = 0; j < p.c; ++j){
-        for(i = 0; i < p.w*p.h; ++i){
-            p.data[i+j*p.h*p.w] = (p.data[i+j*p.h*p.w] - min[j])/(max[j]-min[j]);
-        }
-    }
-    free(min);
-    free(max);
+   for(j = 0; j < p.c; ++j){
+      for(i = 0; i < p.h*p.w; ++i){
+         float v = p.data[i+j*p.h*p.w];
+         if(v < min[j]) min[j] = v;
+         if(v > max[j]) max[j] = v;
+      }
+   }
+   for(i = 0; i < p.c; ++i){
+      if(max[i] - min[i] < .000000001){
+         min[i] = 0;
+         max[i] = 1;
+      }
+   }
+   for(j = 0; j < p.c; ++j){
+      for(i = 0; i < p.w*p.h; ++i){
+         p.data[i+j*p.h*p.w] = (p.data[i+j*p.h*p.w] - min[j])/(max[j]-min[j]);
+      }
+   }
+   free(min);
+   free(max);
 }
 
 void copy_image_into(dn_image src, dn_image dest)
 {
-    memcpy(dest.data, src.data, src.h*src.w*src.c*sizeof(float));
+   memcpy(dest.data, src.data, src.h*src.w*src.c*sizeof(float));
 }
 
 dn_image copy_image(dn_image p)
 {
-    dn_image copy = p;
-    copy.data = calloc(p.h*p.w*p.c, sizeof(float));
-    memcpy(copy.data, p.data, p.h*p.w*p.c*sizeof(float));
-    return copy;
+   dn_image copy = p;
+   copy.data = calloc(p.h*p.w*p.c, sizeof(float));
+   memcpy(copy.data, p.data, p.h*p.w*p.c*sizeof(float));
+   return copy;
 }
 
 void rgbgr_image(dn_image im)
 {
-    int i;
-    for(i = 0; i < im.w*im.h; ++i){
-        float swap = im.data[i];
-        im.data[i] = im.data[i+im.w*im.h*2];
-        im.data[i+im.w*im.h*2] = swap;
-    }
+   int i;
+   for(i = 0; i < im.w*im.h; ++i){
+      float swap = im.data[i];
+      im.data[i] = im.data[i+im.w*im.h*2];
+      im.data[i+im.w*im.h*2] = swap;
+   }
 }
 
 int show_image(dn_image p, const char *name, int ms)
 {
 #ifdef OPENCV
-    int c = show_image_cv(p, name, ms);
+   int c = show_image_cv(p, name, ms);
     return c;
 #else
-    fprintf(stderr, "Not compiled with OpenCV, saving to %s.png instead\n", name);
-    save_image(p, name);
-    return -1;
+   fprintf(stderr, "Not compiled with OpenCV, saving to %s.png instead\n", name);
+   save_image(p, name);
+   return -1;
 #endif
 }
 
 void save_image_options(dn_image im, const char *name, IMTYPE f, int quality)
 {
-    char buff[256];
-    //sprintf(buff, "%s (%d)", name, windows);
-    if(f == PNG)       sprintf(buff, "%s.png", name);
-    else if (f == BMP) sprintf(buff, "%s.bmp", name);
-    else if (f == TGA) sprintf(buff, "%s.tga", name);
-    else if (f == JPG) sprintf(buff, "%s.jpg", name);
-    else               sprintf(buff, "%s.png", name);
-    unsigned char *data = calloc(im.w*im.h*im.c, sizeof(char));
-    int i,k;
-    for(k = 0; k < im.c; ++k){
-        for(i = 0; i < im.w*im.h; ++i){
-            data[i*im.c+k] = (unsigned char) (255*im.data[i + k*im.w*im.h]);
-        }
-    }
-    int success = 0;
-    if(f == PNG)       success = stbi_write_png(buff, im.w, im.h, im.c, data, im.w*im.c);
-    else if (f == BMP) success = stbi_write_bmp(buff, im.w, im.h, im.c, data);
-    else if (f == TGA) success = stbi_write_tga(buff, im.w, im.h, im.c, data);
-    else if (f == JPG) success = stbi_write_jpg(buff, im.w, im.h, im.c, data, quality);
-    free(data);
-    if(!success) fprintf(stderr, "Failed to write image %s\n", buff);
+   char buff[256];
+   //sprintf(buff, "%s (%d)", name, windows);
+   if(f == PNG)       sprintf(buff, "%s.png", name);
+   else if (f == BMP) sprintf(buff, "%s.bmp", name);
+   else if (f == TGA) sprintf(buff, "%s.tga", name);
+   else if (f == JPG) sprintf(buff, "%s.jpg", name);
+   else               sprintf(buff, "%s.png", name);
+   unsigned char *data = calloc(im.w*im.h*im.c, sizeof(char));
+   int i,k;
+   for(k = 0; k < im.c; ++k){
+      for(i = 0; i < im.w*im.h; ++i){
+         data[i*im.c+k] = (unsigned char) (255*im.data[i + k*im.w*im.h]);
+      }
+   }
+   int success = 0;
+   if(f == PNG)       success = stbi_write_png(buff, im.w, im.h, im.c, data, im.w*im.c);
+   else if (f == BMP) success = stbi_write_bmp(buff, im.w, im.h, im.c, data);
+   else if (f == TGA) success = stbi_write_tga(buff, im.w, im.h, im.c, data);
+   else if (f == JPG) success = stbi_write_jpg(buff, im.w, im.h, im.c, data, quality);
+   free(data);
+   if(!success) fprintf(stderr, "Failed to write image %s\n", buff);
 }
 
 void save_image(dn_image im, const char *name)
 {
-    save_image_options(im, name, JPG, 80);
+   save_image_options(im, name, JPG, 80);
 }
 
 void show_image_layers(dn_image p, char *name)
 {
-    int i;
-    char buff[256];
-    for(i = 0; i < p.c; ++i){
-        sprintf(buff, "%s - Layer %d", name, i);
-        dn_image layer = get_image_layer(p, i);
-        show_image(layer, buff, 1);
-        free_image(layer);
-    }
+   int i;
+   char buff[256];
+   for(i = 0; i < p.c; ++i){
+      sprintf(buff, "%s - Layer %d", name, i);
+      dn_image layer = get_image_layer(p, i);
+      show_image(layer, buff, 1);
+      free_image(layer);
+   }
 }
 
 void show_image_collapsed(dn_image p, char *name)
 {
-    dn_image c = collapse_image_layers(p, 1);
-    show_image(c, name, 1);
-    free_image(c);
+   dn_image c = collapse_image_layers(p, 1);
+   show_image(c, name, 1);
+   free_image(c);
 }
 
 dn_image make_empty_image(int w, int h, int c)
 {
-    dn_image out;
-    out.data = 0;
-    out.h = h;
-    out.w = w;
-    out.c = c;
-    return out;
+   dn_image out;
+   out.data = 0;
+   out.h = h;
+   out.w = w;
+   out.c = c;
+   return out;
 }
 
 dn_image make_image(int w, int h, int c)
 {
-    dn_image out = make_empty_image(w,h,c);
-    out.data = calloc(h*w*c, sizeof(float));
-    return out;
+   dn_image out = make_empty_image(w,h,c);
+   out.data = calloc(h*w*c, sizeof(float));
+   return out;
 }
 
 dn_image make_random_image(int w, int h, int c)
 {
-    dn_image out = make_empty_image(w,h,c);
-    out.data = calloc(h*w*c, sizeof(float));
-    int i;
-    for(i = 0; i < w*h*c; ++i){
-        out.data[i] = (rand_normal() * .25) + .5;
-    }
-    return out;
+   dn_image out = make_empty_image(w,h,c);
+   out.data = calloc(h*w*c, sizeof(float));
+   int i;
+   for(i = 0; i < w*h*c; ++i){
+      out.data[i] = (rand_normal() * .25) + .5;
+   }
+   return out;
 }
 
 dn_image float_to_image(int w, int h, int c, float *data)
 {
-    dn_image out = make_empty_image(w,h,c);
-    out.data = data;
-    return out;
+   dn_image out = make_empty_image(w,h,c);
+   out.data = data;
+   return out;
 }
 
 void place_image(dn_image im, int w, int h, int dx, int dy, dn_image canvas)
 {
-    int x, y, c;
-    for(c = 0; c < im.c; ++c){
-        for(y = 0; y < h; ++y){
-            for(x = 0; x < w; ++x){
-                float rx = ((float)x / w) * im.w;
-                float ry = ((float)y / h) * im.h;
-                float val = bilinear_interpolate(im, rx, ry, c);
-                set_pixel(canvas, x + dx, y + dy, c, val);
-            }
-        }
-    }
+   int x, y, c;
+   for(c = 0; c < im.c; ++c){
+      for(y = 0; y < h; ++y){
+         for(x = 0; x < w; ++x){
+            float rx = ((float)x / w) * im.w;
+            float ry = ((float)y / h) * im.h;
+            float val = bilinear_interpolate(im, rx, ry, c);
+            set_pixel(canvas, x + dx, y + dy, c, val);
+         }
+      }
+   }
 }
 
 dn_image center_crop_image(dn_image im, int w, int h)
 {
-    int m = (im.w < im.h) ? im.w : im.h;   
-    dn_image c = crop_image(im, (im.w - m) / 2, (im.h - m)/2, m, m);
-    dn_image r = resize_image(c, w, h);
-    free_image(c);
-    return r;
+   int m = (im.w < im.h) ? im.w : im.h;
+   dn_image c = crop_image(im, (im.w - m) / 2, (im.h - m)/2, m, m);
+   dn_image r = resize_image(c, w, h);
+   free_image(c);
+   return r;
 }
 
 dn_image rotate_crop_image(dn_image im, float rad, float s, int w, int h, float dx, float dy, float aspect)
 {
-    int x, y, c;
-    float cx = im.w/2.;
-    float cy = im.h/2.;
-    dn_image rot = make_image(w, h, im.c);
-    for(c = 0; c < im.c; ++c){
-        for(y = 0; y < h; ++y){
-            for(x = 0; x < w; ++x){
-                float rx = cos(rad)*((x - w/2.)/s*aspect + dx/s*aspect) - sin(rad)*((y - h/2.)/s + dy/s) + cx;
-                float ry = sin(rad)*((x - w/2.)/s*aspect + dx/s*aspect) + cos(rad)*((y - h/2.)/s + dy/s) + cy;
-                float val = bilinear_interpolate(im, rx, ry, c);
-                set_pixel(rot, x, y, c, val);
-            }
-        }
-    }
-    return rot;
+   int x, y, c;
+   float cx = im.w/2.;
+   float cy = im.h/2.;
+   dn_image rot = make_image(w, h, im.c);
+   for(c = 0; c < im.c; ++c){
+      for(y = 0; y < h; ++y){
+         for(x = 0; x < w; ++x){
+            float rx = cos(rad)*((x - w/2.)/s*aspect + dx/s*aspect) - sin(rad)*((y - h/2.)/s + dy/s) + cx;
+            float ry = sin(rad)*((x - w/2.)/s*aspect + dx/s*aspect) + cos(rad)*((y - h/2.)/s + dy/s) + cy;
+            float val = bilinear_interpolate(im, rx, ry, c);
+            set_pixel(rot, x, y, c, val);
+         }
+      }
+   }
+   return rot;
 }
 
 dn_image rotate_image(dn_image im, float rad)
 {
-    int x, y, c;
-    float cx = im.w/2.;
-    float cy = im.h/2.;
-    dn_image rot = make_image(im.w, im.h, im.c);
-    for(c = 0; c < im.c; ++c){
-        for(y = 0; y < im.h; ++y){
-            for(x = 0; x < im.w; ++x){
-                float rx = cos(rad)*(x-cx) - sin(rad)*(y-cy) + cx;
-                float ry = sin(rad)*(x-cx) + cos(rad)*(y-cy) + cy;
-                float val = bilinear_interpolate(im, rx, ry, c);
-                set_pixel(rot, x, y, c, val);
-            }
-        }
-    }
-    return rot;
+   int x, y, c;
+   float cx = im.w/2.;
+   float cy = im.h/2.;
+   dn_image rot = make_image(im.w, im.h, im.c);
+   for(c = 0; c < im.c; ++c){
+      for(y = 0; y < im.h; ++y){
+         for(x = 0; x < im.w; ++x){
+            float rx = cos(rad)*(x-cx) - sin(rad)*(y-cy) + cx;
+            float ry = sin(rad)*(x-cx) + cos(rad)*(y-cy) + cy;
+            float val = bilinear_interpolate(im, rx, ry, c);
+            set_pixel(rot, x, y, c, val);
+         }
+      }
+   }
+   return rot;
 }
 
 void fill_image(dn_image m, float s)
 {
-    int i;
-    for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] = s;
+   int i;
+   for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] = s;
 }
 
 void translate_image(dn_image m, float s)
 {
-    int i;
-    for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
+   int i;
+   for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] += s;
 }
 
 void scale_image(dn_image m, float s)
 {
-    int i;
-    for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] *= s;
+   int i;
+   for(i = 0; i < m.h*m.w*m.c; ++i) m.data[i] *= s;
 }
 
 dn_image crop_image(dn_image im, int dx, int dy, int w, int h)
 {
-    dn_image cropped = make_image(w, h, im.c);
-    int i, j, k;
-    for(k = 0; k < im.c; ++k){
-        for(j = 0; j < h; ++j){
-            for(i = 0; i < w; ++i){
-                int r = j + dy;
-                int c = i + dx;
-                float val = 0;
-                r = constrain_int(r, 0, im.h-1);
-                c = constrain_int(c, 0, im.w-1);
-                val = get_pixel(im, c, r, k);
-                set_pixel(cropped, i, j, k, val);
-            }
-        }
-    }
-    return cropped;
+   dn_image cropped = make_image(w, h, im.c);
+   int i, j, k;
+   for(k = 0; k < im.c; ++k){
+      for(j = 0; j < h; ++j){
+         for(i = 0; i < w; ++i){
+            int r = j + dy;
+            int c = i + dx;
+            float val = 0;
+            r = constrain_int(r, 0, im.h-1);
+            c = constrain_int(c, 0, im.w-1);
+            val = get_pixel(im, c, r, k);
+            set_pixel(cropped, i, j, k, val);
+         }
+      }
+   }
+   return cropped;
 }
 
 int best_3d_shift_r(dn_image a, dn_image b, int min, int max)
 {
-    if(min == max) return min;
-    int mid = floor((min + max) / 2.);
-    dn_image c1 = crop_image(b, 0, mid, b.w, b.h);
-    dn_image c2 = crop_image(b, 0, mid+1, b.w, b.h);
-    float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 10);
-    float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 10);
-    free_image(c1);
-    free_image(c2);
-    if(d1 < d2) return best_3d_shift_r(a, b, min, mid);
-    else return best_3d_shift_r(a, b, mid+1, max);
+   if(min == max) return min;
+   int mid = floor((min + max) / 2.);
+   dn_image c1 = crop_image(b, 0, mid, b.w, b.h);
+   dn_image c2 = crop_image(b, 0, mid+1, b.w, b.h);
+   float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 10);
+   float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 10);
+   free_image(c1);
+   free_image(c2);
+   if(d1 < d2) return best_3d_shift_r(a, b, min, mid);
+   else return best_3d_shift_r(a, b, mid+1, max);
 }
 
 int best_3d_shift(dn_image a, dn_image b, int min, int max)
 {
-    int i;
-    int best = 0;
-    float best_distance = FLT_MAX;
-    for(i = min; i <= max; i += 2){
-        dn_image c = crop_image(b, 0, i, b.w, b.h);
-        float d = dist_array(c.data, a.data, a.w*a.h*a.c, 100);
-        if(d < best_distance){
-            best_distance = d;
-            best = i;
-        }
-        printf("%d %f\n", i, d);
-        free_image(c);
-    }
-    return best;
+   int i;
+   int best = 0;
+   float best_distance = FLT_MAX;
+   for(i = min; i <= max; i += 2){
+      dn_image c = crop_image(b, 0, i, b.w, b.h);
+      float d = dist_array(c.data, a.data, a.w*a.h*a.c, 100);
+      if(d < best_distance){
+         best_distance = d;
+         best = i;
+      }
+      printf("%d %f\n", i, d);
+      free_image(c);
+   }
+   return best;
 }
 
 void composite_3d(char *f1, char *f2, char *out, int delta)
 {
-    if(!out) out = "out";
-    dn_image a = load_image(f1, 0,0,0);
-    dn_image b = load_image(f2, 0,0,0);
-    int shift = best_3d_shift_r(a, b, -a.h/100, a.h/100);
+   if(!out) out = "out";
+   dn_image a = load_image(f1, 0,0,0);
+   dn_image b = load_image(f2, 0,0,0);
+   int shift = best_3d_shift_r(a, b, -a.h/100, a.h/100);
 
-    dn_image c1 = crop_image(b, 10, shift, b.w, b.h);
-    float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 100);
-    dn_image c2 = crop_image(b, -10, shift, b.w, b.h);
-    float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 100);
+   dn_image c1 = crop_image(b, 10, shift, b.w, b.h);
+   float d1 = dist_array(c1.data, a.data, a.w*a.h*a.c, 100);
+   dn_image c2 = crop_image(b, -10, shift, b.w, b.h);
+   float d2 = dist_array(c2.data, a.data, a.w*a.h*a.c, 100);
 
-    if(d2 < d1 && 0){
-        dn_image swap = a;
-        a = b;
-        b = swap;
-        shift = -shift;
-        printf("swapped, %d\n", shift);
-    }
-    else{
-        printf("%d\n", shift);
-    }
+   if(d2 < d1 && 0){
+      dn_image swap = a;
+      a = b;
+      b = swap;
+      shift = -shift;
+      printf("swapped, %d\n", shift);
+   }
+   else{
+      printf("%d\n", shift);
+   }
 
-    dn_image c = crop_image(b, delta, shift, a.w, a.h);
-    int i;
-    for(i = 0; i < c.w*c.h; ++i){
-        c.data[i] = a.data[i];
-    }
-    save_image(c, out);
+   dn_image c = crop_image(b, delta, shift, a.w, a.h);
+   int i;
+   for(i = 0; i < c.w*c.h; ++i){
+      c.data[i] = a.data[i];
+   }
+   save_image(c, out);
 }
 
 void letterbox_image_into(dn_image im, int w, int h, dn_image boxed)
 {
-    int new_w = im.w;
-    int new_h = im.h;
-    if (((float)w/im.w) < ((float)h/im.h)) {
-        new_w = w;
-        new_h = (im.h * w)/im.w;
-    } else {
-        new_h = h;
-        new_w = (im.w * h)/im.h;
-    }
-    dn_image resized = resize_image(im, new_w, new_h);
-    embed_image(resized, boxed, (w-new_w)/2, (h-new_h)/2); 
-    free_image(resized);
+   int new_w = im.w;
+   int new_h = im.h;
+   if (((float)w/im.w) < ((float)h/im.h)) {
+      new_w = w;
+      new_h = (im.h * w)/im.w;
+   } else {
+      new_h = h;
+      new_w = (im.w * h)/im.h;
+   }
+   dn_image resized = resize_image(im, new_w, new_h);
+   embed_image(resized, boxed, (w-new_w)/2, (h-new_h)/2);
+   free_image(resized);
 }
 
 dn_image letterbox_image(dn_image im, int w, int h)
 {
-    int new_w = im.w;
-    int new_h = im.h;
-    if (((float)w/im.w) < ((float)h/im.h)) {
-        new_w = w;
-        new_h = (im.h * w)/im.w;
-    } else {
-        new_h = h;
-        new_w = (im.w * h)/im.h;
-    }
-    dn_image resized = resize_image(im, new_w, new_h);
-    dn_image boxed = make_image(w, h, im.c);
-    fill_image(boxed, .5);
-    //int i;
-    //for(i = 0; i < boxed.w*boxed.h*boxed.c; ++i) boxed.data[i] = 0;
-    embed_image(resized, boxed, (w-new_w)/2, (h-new_h)/2); 
-    free_image(resized);
-    return boxed;
+   int new_w = im.w;
+   int new_h = im.h;
+   if (((float)w/im.w) < ((float)h/im.h)) {
+      new_w = w;
+      new_h = (im.h * w)/im.w;
+   } else {
+      new_h = h;
+      new_w = (im.w * h)/im.h;
+   }
+   dn_image resized = resize_image(im, new_w, new_h);
+   dn_image boxed = make_image(w, h, im.c);
+   fill_image(boxed, .5);
+   //int i;
+   //for(i = 0; i < boxed.w*boxed.h*boxed.c; ++i) boxed.data[i] = 0;
+   embed_image(resized, boxed, (w-new_w)/2, (h-new_h)/2);
+   free_image(resized);
+   return boxed;
 }
 
 dn_image resize_max(dn_image im, int max)
 {
-    int w = im.w;
-    int h = im.h;
-    if(w > h){
-        h = (h * max) / w;
-        w = max;
-    } else {
-        w = (w * max) / h;
-        h = max;
-    }
-    if(w == im.w && h == im.h) return im;
-    dn_image resized = resize_image(im, w, h);
-    return resized;
+   int w = im.w;
+   int h = im.h;
+   if(w > h){
+      h = (h * max) / w;
+      w = max;
+   } else {
+      w = (w * max) / h;
+      h = max;
+   }
+   if(w == im.w && h == im.h) return im;
+   dn_image resized = resize_image(im, w, h);
+   return resized;
 }
 
 dn_image resize_min(dn_image im, int min)
 {
-    int w = im.w;
-    int h = im.h;
-    if(w < h){
-        h = (h * min) / w;
-        w = min;
-    } else {
-        w = (w * min) / h;
-        h = min;
-    }
-    if(w == im.w && h == im.h) return im;
-    dn_image resized = resize_image(im, w, h);
-    return resized;
+   int w = im.w;
+   int h = im.h;
+   if(w < h){
+      h = (h * min) / w;
+      w = min;
+   } else {
+      w = (w * min) / h;
+      h = min;
+   }
+   if(w == im.w && h == im.h) return im;
+   dn_image resized = resize_image(im, w, h);
+   return resized;
 }
 
 dn_image random_crop_image(dn_image im, int w, int h)
 {
-    int dx = rand_int(0, im.w - w);
-    int dy = rand_int(0, im.h - h);
-    dn_image crop = crop_image(im, dx, dy, w, h);
-    return crop;
+   int dx = rand_int(0, im.w - w);
+   int dy = rand_int(0, im.h - h);
+   dn_image crop = crop_image(im, dx, dy, w, h);
+   return crop;
 }
 
 augment_args random_augment_args(dn_image im, float angle, float aspect, int low, int high, int w, int h)
 {
-    augment_args a = {0};
-    aspect = rand_scale(aspect);
-    int r = rand_int(low, high);
-    int min = (im.h < im.w*aspect) ? im.h : im.w*aspect;
-    float scale = (float)r / min;
+   augment_args a = {0};
+   aspect = rand_scale(aspect);
+   int r = rand_int(low, high);
+   int min = (im.h < im.w*aspect) ? im.h : im.w*aspect;
+   float scale = (float)r / min;
 
-    float rad = rand_uniform(-angle, angle) * TWO_PI / 360.;
+   float rad = rand_uniform(-angle, angle) * TWO_PI / 360.;
 
-    float dx = (im.w*scale/aspect - w) / 2.;
-    float dy = (im.h*scale - w) / 2.;
-    //if(dx < 0) dx = 0;
-    //if(dy < 0) dy = 0;
-    dx = rand_uniform(-dx, dx);
-    dy = rand_uniform(-dy, dy);
+   float dx = (im.w*scale/aspect - w) / 2.;
+   float dy = (im.h*scale - w) / 2.;
+   //if(dx < 0) dx = 0;
+   //if(dy < 0) dy = 0;
+   dx = rand_uniform(-dx, dx);
+   dy = rand_uniform(-dy, dy);
 
-    a.rad = rad;
-    a.scale = scale;
-    a.w = w;
-    a.h = h;
-    a.dx = dx;
-    a.dy = dy;
-    a.aspect = aspect;
-    return a;
+   a.rad = rad;
+   a.scale = scale;
+   a.w = w;
+   a.h = h;
+   a.dx = dx;
+   a.dy = dy;
+   a.aspect = aspect;
+   return a;
 }
 
 dn_image random_augment_image(dn_image im, float angle, float aspect, int low, int high, int w, int h)
 {
-    augment_args a = random_augment_args(im, angle, aspect, low, high, w, h);
-    dn_image crop = rotate_crop_image(im, a.rad, a.scale, a.w, a.h, a.dx, a.dy, a.aspect);
-    return crop;
+   augment_args a = random_augment_args(im, angle, aspect, low, high, w, h);
+   dn_image crop = rotate_crop_image(im, a.rad, a.scale, a.w, a.h, a.dx, a.dy, a.aspect);
+   return crop;
 }
 
 float three_way_max(float a, float b, float c)
 {
-    return (a > b) ? ( (a > c) ? a : c) : ( (b > c) ? b : c) ;
+   return (a > b) ? ( (a > c) ? a : c) : ( (b > c) ? b : c) ;
 }
 
 float three_way_min(float a, float b, float c)
 {
-    return (a < b) ? ( (a < c) ? a : c) : ( (b < c) ? b : c) ;
+   return (a < b) ? ( (a < c) ? a : c) : ( (b < c) ? b : c) ;
 }
 
 void yuv_to_rgb(dn_image im)
 {
-    assert(im.c == 3);
-    int i, j;
-    float r, g, b;
-    float y, u, v;
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            y = get_pixel(im, i , j, 0);
-            u = get_pixel(im, i , j, 1);
-            v = get_pixel(im, i , j, 2);
+   assert(im.c == 3);
+   int i, j;
+   float r, g, b;
+   float y, u, v;
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         y = get_pixel(im, i , j, 0);
+         u = get_pixel(im, i , j, 1);
+         v = get_pixel(im, i , j, 2);
 
-            r = y + 1.13983*v;
-            g = y + -.39465*u + -.58060*v;
-            b = y + 2.03211*u;
+         r = y + 1.13983*v;
+         g = y + -.39465*u + -.58060*v;
+         b = y + 2.03211*u;
 
-            set_pixel(im, i, j, 0, r);
-            set_pixel(im, i, j, 1, g);
-            set_pixel(im, i, j, 2, b);
-        }
-    }
+         set_pixel(im, i, j, 0, r);
+         set_pixel(im, i, j, 1, g);
+         set_pixel(im, i, j, 2, b);
+      }
+   }
 }
 
 void rgb_to_yuv(dn_image im)
 {
-    assert(im.c == 3);
-    int i, j;
-    float r, g, b;
-    float y, u, v;
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            r = get_pixel(im, i , j, 0);
-            g = get_pixel(im, i , j, 1);
-            b = get_pixel(im, i , j, 2);
+   assert(im.c == 3);
+   int i, j;
+   float r, g, b;
+   float y, u, v;
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         r = get_pixel(im, i , j, 0);
+         g = get_pixel(im, i , j, 1);
+         b = get_pixel(im, i , j, 2);
 
-            y = .299*r + .587*g + .114*b;
-            u = -.14713*r + -.28886*g + .436*b;
-            v = .615*r + -.51499*g + -.10001*b;
+         y = .299*r + .587*g + .114*b;
+         u = -.14713*r + -.28886*g + .436*b;
+         v = .615*r + -.51499*g + -.10001*b;
 
-            set_pixel(im, i, j, 0, y);
-            set_pixel(im, i, j, 1, u);
-            set_pixel(im, i, j, 2, v);
-        }
-    }
+         set_pixel(im, i, j, 0, y);
+         set_pixel(im, i, j, 1, u);
+         set_pixel(im, i, j, 2, v);
+      }
+   }
 }
 
 // http://www.cs.rit.edu/~ncs/color/t_convert.html
 void rgb_to_hsv(dn_image im)
 {
-    assert(im.c == 3);
-    int i, j;
-    float r, g, b;
-    float h, s, v;
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            r = get_pixel(im, i , j, 0);
-            g = get_pixel(im, i , j, 1);
-            b = get_pixel(im, i , j, 2);
-            float max = three_way_max(r,g,b);
-            float min = three_way_min(r,g,b);
-            float delta = max - min;
-            v = max;
-            if(max == 0){
-                s = 0;
-                h = 0;
-            }else{
-                s = delta/max;
-                if(r == max){
-                    h = (g - b) / delta;
-                } else if (g == max) {
-                    h = 2 + (b - r) / delta;
-                } else {
-                    h = 4 + (r - g) / delta;
-                }
-                if (h < 0) h += 6;
-                h = h/6.;
+   assert(im.c == 3);
+   int i, j;
+   float r, g, b;
+   float h, s, v;
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         r = get_pixel(im, i , j, 0);
+         g = get_pixel(im, i , j, 1);
+         b = get_pixel(im, i , j, 2);
+         float max = three_way_max(r,g,b);
+         float min = three_way_min(r,g,b);
+         float delta = max - min;
+         v = max;
+         if(max == 0){
+            s = 0;
+            h = 0;
+         }else{
+            s = delta/max;
+            if(r == max){
+               h = (g - b) / delta;
+            } else if (g == max) {
+               h = 2 + (b - r) / delta;
+            } else {
+               h = 4 + (r - g) / delta;
             }
-            set_pixel(im, i, j, 0, h);
-            set_pixel(im, i, j, 1, s);
-            set_pixel(im, i, j, 2, v);
-        }
-    }
+            if (h < 0) h += 6;
+            h = h/6.;
+         }
+         set_pixel(im, i, j, 0, h);
+         set_pixel(im, i, j, 1, s);
+         set_pixel(im, i, j, 2, v);
+      }
+   }
 }
 
 void hsv_to_rgb(dn_image im)
 {
-    assert(im.c == 3);
-    int i, j;
-    float r, g, b;
-    float h, s, v;
-    float f, p, q, t;
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            h = 6 * get_pixel(im, i , j, 0);
-            s = get_pixel(im, i , j, 1);
-            v = get_pixel(im, i , j, 2);
-            if (s == 0) {
-                r = g = b = v;
+   assert(im.c == 3);
+   int i, j;
+   float r, g, b;
+   float h, s, v;
+   float f, p, q, t;
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         h = 6 * get_pixel(im, i , j, 0);
+         s = get_pixel(im, i , j, 1);
+         v = get_pixel(im, i , j, 2);
+         if (s == 0) {
+            r = g = b = v;
+         } else {
+            int index = floor(h);
+            f = h - index;
+            p = v*(1-s);
+            q = v*(1-s*f);
+            t = v*(1-s*(1-f));
+            if(index == 0){
+               r = v; g = t; b = p;
+            } else if(index == 1){
+               r = q; g = v; b = p;
+            } else if(index == 2){
+               r = p; g = v; b = t;
+            } else if(index == 3){
+               r = p; g = q; b = v;
+            } else if(index == 4){
+               r = t; g = p; b = v;
             } else {
-                int index = floor(h);
-                f = h - index;
-                p = v*(1-s);
-                q = v*(1-s*f);
-                t = v*(1-s*(1-f));
-                if(index == 0){
-                    r = v; g = t; b = p;
-                } else if(index == 1){
-                    r = q; g = v; b = p;
-                } else if(index == 2){
-                    r = p; g = v; b = t;
-                } else if(index == 3){
-                    r = p; g = q; b = v;
-                } else if(index == 4){
-                    r = t; g = p; b = v;
-                } else {
-                    r = v; g = p; b = q;
-                }
+               r = v; g = p; b = q;
             }
-            set_pixel(im, i, j, 0, r);
-            set_pixel(im, i, j, 1, g);
-            set_pixel(im, i, j, 2, b);
-        }
-    }
+         }
+         set_pixel(im, i, j, 0, r);
+         set_pixel(im, i, j, 1, g);
+         set_pixel(im, i, j, 2, b);
+      }
+   }
 }
 
 void grayscale_image_3c(dn_image im)
 {
-    assert(im.c == 3);
-    int i, j, k;
-    float scale[] = {0.299, 0.587, 0.114};
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            float val = 0;
-            for(k = 0; k < 3; ++k){
-                val += scale[k]*get_pixel(im, i, j, k);
-            }
-            im.data[0*im.h*im.w + im.w*j + i] = val;
-            im.data[1*im.h*im.w + im.w*j + i] = val;
-            im.data[2*im.h*im.w + im.w*j + i] = val;
-        }
-    }
+   assert(im.c == 3);
+   int i, j, k;
+   float scale[] = {0.299, 0.587, 0.114};
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         float val = 0;
+         for(k = 0; k < 3; ++k){
+            val += scale[k]*get_pixel(im, i, j, k);
+         }
+         im.data[0*im.h*im.w + im.w*j + i] = val;
+         im.data[1*im.h*im.w + im.w*j + i] = val;
+         im.data[2*im.h*im.w + im.w*j + i] = val;
+      }
+   }
 }
 
 dn_image grayscale_image(dn_image im)
 {
-    assert(im.c == 3);
-    int i, j, k;
-    dn_image gray = make_image(im.w, im.h, 1);
-    float scale[] = {0.299, 0.587, 0.114};
-    for(k = 0; k < im.c; ++k){
-        for(j = 0; j < im.h; ++j){
-            for(i = 0; i < im.w; ++i){
-                gray.data[i+im.w*j] += scale[k]*get_pixel(im, i, j, k);
-            }
-        }
-    }
-    return gray;
+   assert(im.c == 3);
+   int i, j, k;
+   dn_image gray = make_image(im.w, im.h, 1);
+   float scale[] = {0.299, 0.587, 0.114};
+   for(k = 0; k < im.c; ++k){
+      for(j = 0; j < im.h; ++j){
+         for(i = 0; i < im.w; ++i){
+            gray.data[i+im.w*j] += scale[k]*get_pixel(im, i, j, k);
+         }
+      }
+   }
+   return gray;
 }
 
 dn_image threshold_image(dn_image im, float thresh)
 {
-    int i;
-    dn_image t = make_image(im.w, im.h, im.c);
-    for(i = 0; i < im.w*im.h*im.c; ++i){
-        t.data[i] = im.data[i]>thresh ? 1 : 0;
-    }
-    return t;
+   int i;
+   dn_image t = make_image(im.w, im.h, im.c);
+   for(i = 0; i < im.w*im.h*im.c; ++i){
+      t.data[i] = im.data[i]>thresh ? 1 : 0;
+   }
+   return t;
 }
 
 dn_image blend_image(dn_image fore, dn_image back, float alpha)
 {
-    assert(fore.w == back.w && fore.h == back.h && fore.c == back.c);
-    dn_image blend = make_image(fore.w, fore.h, fore.c);
-    int i, j, k;
-    for(k = 0; k < fore.c; ++k){
-        for(j = 0; j < fore.h; ++j){
-            for(i = 0; i < fore.w; ++i){
-                float val = alpha * get_pixel(fore, i, j, k) + 
-                    (1 - alpha)* get_pixel(back, i, j, k);
-                set_pixel(blend, i, j, k, val);
-            }
-        }
-    }
-    return blend;
+   assert(fore.w == back.w && fore.h == back.h && fore.c == back.c);
+   dn_image blend = make_image(fore.w, fore.h, fore.c);
+   int i, j, k;
+   for(k = 0; k < fore.c; ++k){
+      for(j = 0; j < fore.h; ++j){
+         for(i = 0; i < fore.w; ++i){
+            float val = alpha * get_pixel(fore, i, j, k) +
+                        (1 - alpha)* get_pixel(back, i, j, k);
+            set_pixel(blend, i, j, k, val);
+         }
+      }
+   }
+   return blend;
 }
 
 void scale_image_channel(dn_image im, int c, float v)
 {
-    int i, j;
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            float pix = get_pixel(im, i, j, c);
-            pix = pix*v;
-            set_pixel(im, i, j, c, pix);
-        }
-    }
+   int i, j;
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         float pix = get_pixel(im, i, j, c);
+         pix = pix*v;
+         set_pixel(im, i, j, c, pix);
+      }
+   }
 }
 
 void translate_image_channel(dn_image im, int c, float v)
 {
-    int i, j;
-    for(j = 0; j < im.h; ++j){
-        for(i = 0; i < im.w; ++i){
-            float pix = get_pixel(im, i, j, c);
-            pix = pix+v;
-            set_pixel(im, i, j, c, pix);
-        }
-    }
+   int i, j;
+   for(j = 0; j < im.h; ++j){
+      for(i = 0; i < im.w; ++i){
+         float pix = get_pixel(im, i, j, c);
+         pix = pix+v;
+         set_pixel(im, i, j, c, pix);
+      }
+   }
 }
 
 dn_image binarize_image(dn_image im)
 {
-    dn_image c = copy_image(im);
-    int i;
-    for(i = 0; i < im.w * im.h * im.c; ++i){
-        if(c.data[i] > .5) c.data[i] = 1;
-        else c.data[i] = 0;
-    }
-    return c;
+   dn_image c = copy_image(im);
+   int i;
+   for(i = 0; i < im.w * im.h * im.c; ++i){
+      if(c.data[i] > .5) c.data[i] = 1;
+      else c.data[i] = 0;
+   }
+   return c;
 }
 
 void saturate_image(dn_image im, float sat)
 {
-    rgb_to_hsv(im);
-    scale_image_channel(im, 1, sat);
-    hsv_to_rgb(im);
-    constrain_image(im);
+   rgb_to_hsv(im);
+   scale_image_channel(im, 1, sat);
+   hsv_to_rgb(im);
+   constrain_image(im);
 }
 
 void hue_image(dn_image im, float hue)
 {
-    rgb_to_hsv(im);
-    int i;
-    for(i = 0; i < im.w*im.h; ++i){
-        im.data[i] = im.data[i] + hue;
-        if (im.data[i] > 1) im.data[i] -= 1;
-        if (im.data[i] < 0) im.data[i] += 1;
-    }
-    hsv_to_rgb(im);
-    constrain_image(im);
+   rgb_to_hsv(im);
+   int i;
+   for(i = 0; i < im.w*im.h; ++i){
+      im.data[i] = im.data[i] + hue;
+      if (im.data[i] > 1) im.data[i] -= 1;
+      if (im.data[i] < 0) im.data[i] += 1;
+   }
+   hsv_to_rgb(im);
+   constrain_image(im);
 }
 
 void exposure_image(dn_image im, float sat)
 {
-    rgb_to_hsv(im);
-    scale_image_channel(im, 2, sat);
-    hsv_to_rgb(im);
-    constrain_image(im);
+   rgb_to_hsv(im);
+   scale_image_channel(im, 2, sat);
+   hsv_to_rgb(im);
+   constrain_image(im);
 }
 
 void distort_image(dn_image im, float hue, float sat, float val)
 {
-    rgb_to_hsv(im);
-    scale_image_channel(im, 1, sat);
-    scale_image_channel(im, 2, val);
-    int i;
-    for(i = 0; i < im.w*im.h; ++i){
-        im.data[i] = im.data[i] + hue;
-        if (im.data[i] > 1) im.data[i] -= 1;
-        if (im.data[i] < 0) im.data[i] += 1;
-    }
-    hsv_to_rgb(im);
-    constrain_image(im);
+   rgb_to_hsv(im);
+   scale_image_channel(im, 1, sat);
+   scale_image_channel(im, 2, val);
+   int i;
+   for(i = 0; i < im.w*im.h; ++i){
+      im.data[i] = im.data[i] + hue;
+      if (im.data[i] > 1) im.data[i] -= 1;
+      if (im.data[i] < 0) im.data[i] += 1;
+   }
+   hsv_to_rgb(im);
+   constrain_image(im);
 }
 
 void random_distort_image(dn_image im, float hue, float saturation, float exposure)
 {
-    float dhue = rand_uniform(-hue, hue);
-    float dsat = rand_scale(saturation);
-    float dexp = rand_scale(exposure);
-    distort_image(im, dhue, dsat, dexp);
+   float dhue = rand_uniform(-hue, hue);
+   float dsat = rand_scale(saturation);
+   float dexp = rand_scale(exposure);
+   distort_image(im, dhue, dsat, dexp);
 }
 
 void saturate_exposure_image(dn_image im, float sat, float exposure)
 {
-    rgb_to_hsv(im);
-    scale_image_channel(im, 1, sat);
-    scale_image_channel(im, 2, exposure);
-    hsv_to_rgb(im);
-    constrain_image(im);
+   rgb_to_hsv(im);
+   scale_image_channel(im, 1, sat);
+   scale_image_channel(im, 2, exposure);
+   hsv_to_rgb(im);
+   constrain_image(im);
 }
 
 dn_image resize_image(dn_image im, int w, int h)
 {
-    dn_image resized = make_image(w, h, im.c);
-    dn_image part = make_image(w, im.h, im.c);
-    int r, c, k;
-    float w_scale = (float)(im.w - 1) / (w - 1);
-    float h_scale = (float)(im.h - 1) / (h - 1);
-    for(k = 0; k < im.c; ++k){
-        for(r = 0; r < im.h; ++r){
-            for(c = 0; c < w; ++c){
-                float val = 0;
-                if(c == w-1 || im.w == 1){
-                    val = get_pixel(im, im.w-1, r, k);
-                } else {
-                    float sx = c*w_scale;
-                    int ix = (int) sx;
-                    float dx = sx - ix;
-                    val = (1 - dx) * get_pixel(im, ix, r, k) + dx * get_pixel(im, ix+1, r, k);
-                }
-                set_pixel(part, c, r, k, val);
+   dn_image resized = make_image(w, h, im.c);
+   dn_image part = make_image(w, im.h, im.c);
+   int r, c, k;
+   float w_scale = (float)(im.w - 1) / (w - 1);
+   float h_scale = (float)(im.h - 1) / (h - 1);
+   for(k = 0; k < im.c; ++k){
+      for(r = 0; r < im.h; ++r){
+         for(c = 0; c < w; ++c){
+            float val = 0;
+            if(c == w-1 || im.w == 1){
+               val = get_pixel(im, im.w-1, r, k);
+            } else {
+               float sx = c*w_scale;
+               int ix = (int) sx;
+               float dx = sx - ix;
+               val = (1 - dx) * get_pixel(im, ix, r, k) + dx * get_pixel(im, ix+1, r, k);
             }
-        }
-    }
-    for(k = 0; k < im.c; ++k){
-        for(r = 0; r < h; ++r){
-            float sy = r*h_scale;
-            int iy = (int) sy;
-            float dy = sy - iy;
-            for(c = 0; c < w; ++c){
-                float val = (1-dy) * get_pixel(part, c, iy, k);
-                set_pixel(resized, c, r, k, val);
-            }
-            if(r == h-1 || im.h == 1) continue;
-            for(c = 0; c < w; ++c){
-                float val = dy * get_pixel(part, c, iy+1, k);
-                add_pixel(resized, c, r, k, val);
-            }
-        }
-    }
+            set_pixel(part, c, r, k, val);
+         }
+      }
+   }
+   for(k = 0; k < im.c; ++k){
+      for(r = 0; r < h; ++r){
+         float sy = r*h_scale;
+         int iy = (int) sy;
+         float dy = sy - iy;
+         for(c = 0; c < w; ++c){
+            float val = (1-dy) * get_pixel(part, c, iy, k);
+            set_pixel(resized, c, r, k, val);
+         }
+         if(r == h-1 || im.h == 1) continue;
+         for(c = 0; c < w; ++c){
+            float val = dy * get_pixel(part, c, iy+1, k);
+            add_pixel(resized, c, r, k, val);
+         }
+      }
+   }
 
-    free_image(part);
-    return resized;
+   free_image(part);
+   return resized;
 }
 
 
 void test_resize(const char *filename)
 {
-    dn_image im = load_image(filename, 0,0, 3);
-    float mag = mag_array(im.data, im.w*im.h*im.c);
-    printf("L2 Norm: %f\n", mag);
-    dn_image gray = grayscale_image(im);
+   dn_image im = load_image(filename, 0,0, 3);
+   float mag = mag_array(im.data, im.w*im.h*im.c);
+   printf("L2 Norm: %f\n", mag);
+   dn_image gray = grayscale_image(im);
 
-    dn_image c1 = copy_image(im);
-    dn_image c2 = copy_image(im);
-    dn_image c3 = copy_image(im);
-    dn_image c4 = copy_image(im);
-    distort_image(c1, .1, 1.5, 1.5);
-    distort_image(c2, -.1, .66666, .66666);
-    distort_image(c3, .1, 1.5, .66666);
-    distort_image(c4, .1, .66666, 1.5);
+   dn_image c1 = copy_image(im);
+   dn_image c2 = copy_image(im);
+   dn_image c3 = copy_image(im);
+   dn_image c4 = copy_image(im);
+   distort_image(c1, .1, 1.5, 1.5);
+   distort_image(c2, -.1, .66666, .66666);
+   distort_image(c3, .1, 1.5, .66666);
+   distort_image(c4, .1, .66666, 1.5);
 
 
-    show_image(im,   "Original", 1);
-    show_image(gray, "Gray", 1);
-    show_image(c1, "C1", 1);
-    show_image(c2, "C2", 1);
-    show_image(c3, "C3", 1);
-    show_image(c4, "C4", 1);
+   show_image(im,   "Original", 1);
+   show_image(gray, "Gray", 1);
+   show_image(c1, "C1", 1);
+   show_image(c2, "C2", 1);
+   show_image(c3, "C3", 1);
+   show_image(c4, "C4", 1);
 #ifdef OPENCV
-    while(1){
+   while(1){
         image aug = random_augment_image(im, 0, .75, 320, 448, 320, 320);
         show_image(aug, "aug", 1);
         free_image(aug);
@@ -1292,175 +1292,184 @@ void test_resize(const char *filename)
 
 dn_image load_image_stb(const char *filename, int channels)
 {
-    int w, h, c;
-    unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
-    if (!data) {
-        fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
-        exit(0);
-    }
-    if(channels) c = channels;
-    int i,j,k;
-    dn_image im = make_image(w, h, c);
-    for(k = 0; k < c; ++k){
-        for(j = 0; j < h; ++j){
-            for(i = 0; i < w; ++i){
-                int dst_index = i + w*j + w*h*k;
-                int src_index = k + c*i + c*w*j;
-                im.data[dst_index] = (float)data[src_index]/255.;
-            }
-        }
-    }
-    free(data);
-    return im;
+   int w, h, c;
+   void* data;
+   int is_16bit = stbi_is_16_bit(filename);
+   if (is_16bit)
+      data = stbi_load_16(filename, &w, &h, &c, channels);
+   else
+      data = stbi_load(filename, &w, &h, &c, channels);
+   if (!data) {
+      fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
+      exit(0);
+   }
+   if(channels)
+      c = channels;
+   int i, j, k, dst_index, src_index;
+   dn_image im = make_image(w, h, c);
+   for(k = 0; k < c; ++k){
+      for(j = 0; j < h; ++j){
+         for(i = 0; i < w; ++i){
+            dst_index = i + w*j + w*h*k;
+            src_index = k + c*i + c*w*j;
+            if (is_16bit)
+               im.data[dst_index] =  (float) ((unsigned short*)data)[src_index] / 65535.0;
+            else
+               im.data[dst_index] =  (float) ((unsigned char*)data)[src_index] / 255.0;
+         }
+      }
+   }
+   free(data);
+   return im;
 }
 
 dn_image load_image(const char *filename, int w, int h, int c)
 {
 #ifdef OPENCV
-    image out = load_image_cv(filename, c);
+   image out = load_image_cv(filename, c);
 #else
-    dn_image out = load_image_stb(filename, c);
+   dn_image out = load_image_stb(filename, c);
 #endif
 
-    if((h && w) && (h != out.h || w != out.w)){
-        dn_image resized = resize_image(out, w, h);
-        free_image(out);
-        out = resized;
-    }
-    return out;
+   if((h && w) && (h != out.h || w != out.w)){
+      dn_image resized = resize_image(out, w, h);
+      free_image(out);
+      out = resized;
+   }
+   return out;
 }
 
 dn_image load_image_color(const char *filename, int w, int h)
 {
-    return load_image(filename, w, h, 3);
+   return load_image(filename, w, h, 3);
 }
 
 dn_image get_image_layer(dn_image m, int l)
 {
-    dn_image out = make_image(m.w, m.h, 1);
-    int i;
-    for(i = 0; i < m.h*m.w; ++i){
-        out.data[i] = m.data[i+l*m.h*m.w];
-    }
-    return out;
+   dn_image out = make_image(m.w, m.h, 1);
+   int i;
+   for(i = 0; i < m.h*m.w; ++i){
+      out.data[i] = m.data[i+l*m.h*m.w];
+   }
+   return out;
 }
 void print_image(dn_image m)
 {
-    int i, j, k;
-    for(i =0 ; i < m.c; ++i){
-        for(j =0 ; j < m.h; ++j){
-            for(k = 0; k < m.w; ++k){
-                printf("%.2lf, ", m.data[i*m.h*m.w + j*m.w + k]);
-                if(k > 30) break;
-            }
-            printf("\n");
-            if(j > 30) break;
-        }
-        printf("\n");
-    }
-    printf("\n");
+   int i, j, k;
+   for(i =0 ; i < m.c; ++i){
+      for(j =0 ; j < m.h; ++j){
+         for(k = 0; k < m.w; ++k){
+            printf("%.2lf, ", m.data[i*m.h*m.w + j*m.w + k]);
+            if(k > 30) break;
+         }
+         printf("\n");
+         if(j > 30) break;
+      }
+      printf("\n");
+   }
+   printf("\n");
 }
 
 dn_image collapse_images_vert(dn_image *ims, int n)
 {
-    int color = 1;
-    int border = 1;
-    int h,w,c;
-    w = ims[0].w;
-    h = (ims[0].h + border) * n - border;
-    c = ims[0].c;
-    if(c != 3 || !color){
-        w = (w+border)*c - border;
-        c = 1;
-    }
+   int color = 1;
+   int border = 1;
+   int h,w,c;
+   w = ims[0].w;
+   h = (ims[0].h + border) * n - border;
+   c = ims[0].c;
+   if(c != 3 || !color){
+      w = (w+border)*c - border;
+      c = 1;
+   }
 
-    dn_image filters = make_image(w, h, c);
-    int i,j;
-    for(i = 0; i < n; ++i){
-        int h_offset = i*(ims[0].h+border);
-        dn_image copy = copy_image(ims[i]);
-        //normalize_image(copy);
-        if(c == 3 && color){
-            embed_image(copy, filters, 0, h_offset);
-        }
-        else{
-            for(j = 0; j < copy.c; ++j){
-                int w_offset = j*(ims[0].w+border);
-                dn_image layer = get_image_layer(copy, j);
-                embed_image(layer, filters, w_offset, h_offset);
-                free_image(layer);
-            }
-        }
-        free_image(copy);
-    }
-    return filters;
-} 
+   dn_image filters = make_image(w, h, c);
+   int i,j;
+   for(i = 0; i < n; ++i){
+      int h_offset = i*(ims[0].h+border);
+      dn_image copy = copy_image(ims[i]);
+      //normalize_image(copy);
+      if(c == 3 && color){
+         embed_image(copy, filters, 0, h_offset);
+      }
+      else{
+         for(j = 0; j < copy.c; ++j){
+            int w_offset = j*(ims[0].w+border);
+            dn_image layer = get_image_layer(copy, j);
+            embed_image(layer, filters, w_offset, h_offset);
+            free_image(layer);
+         }
+      }
+      free_image(copy);
+   }
+   return filters;
+}
 
 dn_image collapse_images_horz(dn_image *ims, int n)
 {
-    int color = 1;
-    int border = 1;
-    int h,w,c;
-    int size = ims[0].h;
-    h = size;
-    w = (ims[0].w + border) * n - border;
-    c = ims[0].c;
-    if(c != 3 || !color){
-        h = (h+border)*c - border;
-        c = 1;
-    }
+   int color = 1;
+   int border = 1;
+   int h,w,c;
+   int size = ims[0].h;
+   h = size;
+   w = (ims[0].w + border) * n - border;
+   c = ims[0].c;
+   if(c != 3 || !color){
+      h = (h+border)*c - border;
+      c = 1;
+   }
 
-    dn_image filters = make_image(w, h, c);
-    int i,j;
-    for(i = 0; i < n; ++i){
-        int w_offset = i*(size+border);
-        dn_image copy = copy_image(ims[i]);
-        //normalize_image(copy);
-        if(c == 3 && color){
-            embed_image(copy, filters, w_offset, 0);
-        }
-        else{
-            for(j = 0; j < copy.c; ++j){
-                int h_offset = j*(size+border);
-                dn_image layer = get_image_layer(copy, j);
-                embed_image(layer, filters, w_offset, h_offset);
-                free_image(layer);
-            }
-        }
-        free_image(copy);
-    }
-    return filters;
-} 
+   dn_image filters = make_image(w, h, c);
+   int i,j;
+   for(i = 0; i < n; ++i){
+      int w_offset = i*(size+border);
+      dn_image copy = copy_image(ims[i]);
+      //normalize_image(copy);
+      if(c == 3 && color){
+         embed_image(copy, filters, w_offset, 0);
+      }
+      else{
+         for(j = 0; j < copy.c; ++j){
+            int h_offset = j*(size+border);
+            dn_image layer = get_image_layer(copy, j);
+            embed_image(layer, filters, w_offset, h_offset);
+            free_image(layer);
+         }
+      }
+      free_image(copy);
+   }
+   return filters;
+}
 
 void show_image_normalized(dn_image im, const char *name)
 {
-    dn_image c = copy_image(im);
-    normalize_image(c);
-    show_image(c, name, 1);
-    free_image(c);
+   dn_image c = copy_image(im);
+   normalize_image(c);
+   show_image(c, name, 1);
+   free_image(c);
 }
 
 void show_images(dn_image *ims, int n, char *window)
 {
-    dn_image m = collapse_images_vert(ims, n);
-    /*
-       int w = 448;
-       int h = ((float)m.h/m.w) * 448;
-       if(h > 896){
-       h = 896;
-       w = ((float)m.w/m.h) * 896;
-       }
-       image sized = resize_image(m, w, h);
-     */
-    normalize_image(m);
-    save_image(m, window);
-    show_image(m, window, 1);
-    free_image(m);
+   dn_image m = collapse_images_vert(ims, n);
+   /*
+      int w = 448;
+      int h = ((float)m.h/m.w) * 448;
+      if(h > 896){
+      h = 896;
+      w = ((float)m.w/m.h) * 896;
+      }
+      image sized = resize_image(m, w, h);
+    */
+   normalize_image(m);
+   save_image(m, window);
+   show_image(m, window, 1);
+   free_image(m);
 }
 
 void free_image(dn_image m)
 {
-    if(m.data){
-        free(m.data);
-    }
+   if(m.data){
+      free(m.data);
+   }
 }