no longer need to put Eigen include in system directory. Need to put it in nplm's 3rdparty directory

10 files changed, 13 insertions, 13 deletions

diff --git a/src/Activation_function.h b/src/Activation_function.h
index eacba14..0264cd1 100644
--- a/src/Activation_function.h
+++ b/src/Activation_function.h
@@ -3,7 +3,7 @@
 
 #include <cmath>
 #include <string>
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 
 #include "util.h"
 
diff --git a/src/Makefile b/src/Makefile
index abc5335..1da279c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,14 +19,14 @@ OS:=$(shell uname -s)
 ### Required libraries. You must install these prior to building.
 
 # Set this to the root directory of Boost (should have a subdirectory named boost):
-BOOST=/Users/hieu/workspace/boost/boost_1_54_0
+BOOST=/home/hieu/workspace/boost/boost_1_55_0.gcc
 #BOOST=/usr
 #BOOST=/opt/local
 # Where to find Boost header files
 BOOST_INC=$(BOOST)/include
 
 # Set this to the root directory of Eigen (should have a subdirectory named Eigen):
-EIGEN=/Users/hieu/workspace/eigen
+EIGEN=/home/hieu/workspace/eigen-3
 
 ### Optional libraries.
 
diff --git a/src/SoftmaxLoss.h b/src/SoftmaxLoss.h
index 77d94ca..de5e043 100644
--- a/src/SoftmaxLoss.h
+++ b/src/SoftmaxLoss.h
@@ -1,7 +1,7 @@
 #ifndef SOFTMAXLOSS_H
 #define SOFTMAXLOSS_H
 
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 #include "multinomial.h"
 #include "util.h"
 
diff --git a/src/USCMatrix.h b/src/USCMatrix.h
index caa9553..092bc4e 100644
--- a/src/USCMatrix.h
+++ b/src/USCMatrix.h
@@ -1,7 +1,7 @@
 #ifndef USCMATRIX_H
 #define USCMATRIX_H
 
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 #include "maybe_omp.h"
 #include "util.h"
 
diff --git a/src/graphClasses.h b/src/graphClasses.h
index da5f1af..9f9e27c 100644
--- a/src/graphClasses.h
+++ b/src/graphClasses.h
@@ -3,7 +3,7 @@
 
 #include <cstdlib>
 #include "neuralClasses.h"
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 
 namespace nplm
 {
diff --git a/src/neuralClasses.h b/src/neuralClasses.h
index afd91f1..1b57763 100644
--- a/src/neuralClasses.h
+++ b/src/neuralClasses.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <boost/unordered_map.hpp> 
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 #include "maybe_omp.h"
 
 #include "util.h"
diff --git a/src/neuralLM.h b/src/neuralLM.h
index 953ad94..d9e7f52 100644
--- a/src/neuralLM.h
+++ b/src/neuralLM.h
@@ -11,7 +11,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 
 #include "param.h"
 #include "util.h"
diff --git a/src/testNeuralLM.cpp b/src/testNeuralLM.cpp
index fcbf59d..5805022 100644
--- a/src/testNeuralLM.cpp
+++ b/src/testNeuralLM.cpp
@@ -4,8 +4,8 @@
 #include <boost/algorithm/string/join.hpp>
 #include <tclap/CmdLine.h>
 
-#include <Eigen/Core>
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Core"
+#include "../3rdparty/Eigen/Dense"
 
 #include "param.h"
 
diff --git a/src/trainNeuralNetwork.cpp b/src/trainNeuralNetwork.cpp
index 50a6d64..fa27627 100644
--- a/src/trainNeuralNetwork.cpp
+++ b/src/trainNeuralNetwork.cpp
@@ -12,8 +12,8 @@
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/algorithm/string/join.hpp>
 
-#include <Eigen/Dense>
-#include <Eigen/Sparse>
+#include "../3rdparty/Eigen/Dense"
+#include "../3rdparty/Eigen/Sparse"
 #include "maybe_omp.h"
 #include <tclap/CmdLine.h>
 
diff --git a/src/util.h b/src/util.h
index c774a72..9c9b255 100644
--- a/src/util.h
+++ b/src/util.h
@@ -15,7 +15,7 @@
 #include <boost/chrono.hpp>
 #endif
 
-#include <Eigen/Dense>
+#include "../3rdparty/Eigen/Dense"
 
 #include "maybe_omp.h"