Many of the header files contained an absolute path to Eigen. I have fixed that here so that it only relies on the Makefile

10 files changed, 20 insertions, 10 deletions

diff --git a/src/Activation_function.h b/src/Activation_function.h
index 7f41444..66342bb 100644
--- a/src/Activation_function.h
+++ b/src/Activation_function.h
@@ -3,7 +3,8 @@
 
 #include <cmath>
 #include <string>
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 
 #include "util.h"
 
diff --git a/src/SoftmaxLoss.h b/src/SoftmaxLoss.h
index beb37d6..bc55762 100644
--- a/src/SoftmaxLoss.h
+++ b/src/SoftmaxLoss.h
@@ -1,7 +1,8 @@
 	#ifndef SOFTMAXLOSS_H
 #define SOFTMAXLOSS_H
 
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 #include "multinomial.h"
 #include "util.h"
 
diff --git a/src/USCMatrix.h b/src/USCMatrix.h
index 06d1ab3..02aeb33 100644
--- a/src/USCMatrix.h
+++ b/src/USCMatrix.h
@@ -1,7 +1,8 @@
 #ifndef USCMATRIX_H
 #define USCMATRIX_H
 
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 #include "maybe_omp.h"
 #include "util.h"
 
diff --git a/src/graphClasses.h b/src/graphClasses.h
index c23935d..d3c0c4a 100644
--- a/src/graphClasses.h
+++ b/src/graphClasses.h
@@ -3,7 +3,8 @@
 
 #include <cstdlib>
 #include "neuralClasses.h"
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 
 namespace nplm
 {
diff --git a/src/neuralClasses.h b/src/neuralClasses.h
index a4c9158..26dae06 100644
--- a/src/neuralClasses.h
+++ b/src/neuralClasses.h
@@ -7,7 +7,8 @@
 #include <vector>
 
 #include <boost/unordered_map.hpp> 
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 #include "maybe_omp.h"
 
 #include "util.h"
diff --git a/src/neuralLM.h b/src/neuralLM.h
index 9de37cb..2004596 100644
--- a/src/neuralLM.h
+++ b/src/neuralLM.h
@@ -6,7 +6,8 @@
 #include <cstdlib>
 #include <boost/shared_ptr.hpp>
 
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 
 #include "util.h"
 #include "vocabulary.h"
diff --git a/src/neuralNetwork.h b/src/neuralNetwork.h
index fd451f1..ef96488 100644
--- a/src/neuralNetwork.h
+++ b/src/neuralNetwork.h
@@ -3,7 +3,8 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 
 #include "util.h"
 #include "model.h"
diff --git a/src/testNeuralLM.cpp b/src/testNeuralLM.cpp
index 9e9a042..4f3713d 100644
--- a/src/testNeuralLM.cpp
+++ b/src/testNeuralLM.cpp
@@ -6,7 +6,8 @@
 #include <tclap/CmdLine.h>
 
 #include <Eigen/Core>
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 
 #include "param.h"
 
diff --git a/src/trainNeuralNetwork.cpp b/src/trainNeuralNetwork.cpp
index c8fcb68..663baba 100644
--- a/src/trainNeuralNetwork.cpp
+++ b/src/trainNeuralNetwork.cpp
@@ -16,7 +16,8 @@
 # include <boost/interprocess/managed_mapped_file.hpp>
 #include <boost/interprocess/containers/vector.hpp>
 
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 #include <Eigen/Sparse>
 #include "maybe_omp.h"
 #include <tclap/CmdLine.h>
diff --git a/src/util.h b/src/util.h
index e4b04e6..a8453aa 100644
--- a/src/util.h
+++ b/src/util.h
@@ -15,7 +15,8 @@
 #include <boost/chrono.hpp>
 #endif
 
-#include <../3rdparty/Eigen/Dense>
+//#include <../3rdparty/Eigen/Dense>
+#include <Eigen/Dense>
 
 #include "maybe_omp.h"