From 09ce7e63491d7193e603b1fe548a16b9ebc6684e Mon Sep 17 00:00:00 2001
From: Marcin Junczys-Dowmunt <junczys@amu.edu.pl>
Date: Fri, 16 Sep 2016 23:55:47 +0200
Subject: [PATCH] renamed sgd.h to optimizers.h

---
 src/{sgd.h => optimizers.h} |  0
 src/train_mnist.cu          | 10 ++++------
 src/validate_mnist.cu       |  2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename src/{sgd.h => optimizers.h} (100%)

diff --git a/src/sgd.h b/src/optimizers.h
similarity index 100%
rename from src/sgd.h
rename to src/optimizers.h
diff --git a/src/train_mnist.cu b/src/train_mnist.cu
index e726ee83..5b32cc9f 100644
--- a/src/train_mnist.cu
+++ b/src/train_mnist.cu
@@ -1,17 +1,15 @@
 
 #include "marian.h"
 #include "mnist.h"
-#include "sgd.h"
-
-using namespace std;
+#include "optimizers.h"
 
 int main(int argc, char** argv) {
   const size_t IMAGE_SIZE = 784;
   const size_t LABEL_SIZE = 10;
   int numofdata;
 
-  vector<float> trainImages = datasets::mnist::ReadImages("../examples/mnist/t10k-images-idx3-ubyte", numofdata, IMAGE_SIZE);
-  vector<float> trainLabels = datasets::mnist::ReadLabels("../examples/mnist/t10k-labels-idx1-ubyte", numofdata, LABEL_SIZE);
+  std::vector<float> trainImages = datasets::mnist::ReadImages("../examples/mnist/t10k-images-idx3-ubyte", numofdata, IMAGE_SIZE);
+  std::vector<float> trainLabels = datasets::mnist::ReadLabels("../examples/mnist/t10k-labels-idx1-ubyte", numofdata, LABEL_SIZE);
 
   using namespace marian;
   using namespace keywords;
@@ -27,7 +25,7 @@ int main(int argc, char** argv) {
   auto scores = dot(x, w) + b;
   auto lr = softmax(scores);
   auto cost = named(-mean(sum(y * log(lr), axis=1), axis=0), "cost");
-  cerr << "lr=" << lr.Debug() << endl;
+  std::cerr << "lr=" << lr.Debug() << std::endl;
 
   Adagrad opt;
   opt(g, 300);
diff --git a/src/validate_mnist.cu b/src/validate_mnist.cu
index ceb262bd..34364929 100644
--- a/src/validate_mnist.cu
+++ b/src/validate_mnist.cu
@@ -2,7 +2,7 @@
 #include "marian.h"
 #include "mnist.h"
 #include "npz_converter.h"
-#include "sgd.h"
+#include "optimizers.h"
 
 using namespace marian;
 using namespace keywords;