sync

17 files changed, 46 insertions, 14 deletions

diff --git a/bench/basicbench.cxxlist b/bench/basicbench.cxxlist
index 5d670ef4b..a8ab34e0d 100644
--- a/bench/basicbench.cxxlist
+++ b/bench/basicbench.cxxlist
@@ -4,18 +4,25 @@
 # CLIST[((g++))]="g++-3.4 -O3 -DNDEBUG -finline-limit=20000"
 
 # CLIST[((g++))]="g++-4.1 -O3 -DNDEBUG"
-CLIST[((g++))]="g++-4.1 -O3 -DNDEBUG -finline-limit=20000"
+#CLIST[((g++))]="g++-4.1 -O3 -DNDEBUG -finline-limit=20000"
 
 # CLIST[((g++))]="g++-4.2 -O3 -DNDEBUG"
-CLIST[((g++))]="g++-4.2 -O3 -DNDEBUG -finline-limit=20000"
+#CLIST[((g++))]="g++-4.2 -O3 -DNDEBUG -finline-limit=20000"
 # CLIST[((g++))]="g++-4.2 -O3 -DNDEBUG -finline-limit=20000 -fprofile-generate"
 # CLIST[((g++))]="g++-4.2 -O3 -DNDEBUG -finline-limit=20000 -fprofile-use"
 
 # CLIST[((g++))]="g++-4.3 -O3 -DNDEBUG"
-CLIST[((g++))]="g++-4.3 -O3 -DNDEBUG -finline-limit=20000"
+#CLIST[((g++))]="g++-4.3 -O3 -DNDEBUG -finline-limit=20000"
 # CLIST[((g++))]="g++-4.3 -O3 -DNDEBUG -finline-limit=20000 -fprofile-generate"
 # CLIST[((g++))]="g++-4.3 -O3 -DNDEBUG -finline-limit=20000 -fprofile-use"
 
-# CLIST[((g++))]="icpc -fast -DNDEBUG -fno-exceptions -no-inline-max-size"
 # CLIST[((g++))]="icpc -fast -DNDEBUG -fno-exceptions -no-inline-max-size -prof-genx"
-# CLIST[((g++))]="icpc -fast -DNDEBUG -fno-exceptions -no-inline-max-size -prof-use"
\ No newline at end of file
+# CLIST[((g++))]="icpc -fast -DNDEBUG -fno-exceptions -no-inline-max-size -prof-use"
+
+#CLIST[((g++))]="/opt/intel/Compiler/11.1/072/bin/intel64/icpc -fast -DNDEBUG -fno-exceptions -no-inline-max-size -lrt"
+CLIST[((g++))]="/home/orzel/svn/llvm/Release/bin/clang++ -O3 -DNDEBUG -DEIGEN_DONT_VECTORIZE -lrt"
+CLIST[((g++))]="/home/orzel/svn/llvm/Release/bin/clang++ -O3 -DNDEBUG -lrt"
+CLIST[((g++))]="g++-4.4.4 -O3 -DNDEBUG -DEIGEN_DONT_VECTORIZE -lrt"
+CLIST[((g++))]="g++-4.4.4 -O3 -DNDEBUG -lrt"
+CLIST[((g++))]="g++-4.5.0 -O3 -DNDEBUG -DEIGEN_DONT_VECTORIZE -lrt"
+CLIST[((g++))]="g++-4.5.0 -O3 -DNDEBUG -lrt"
diff --git a/bench/basicbenchmark.cpp b/bench/basicbenchmark.cpp
index bd500c06a..a26ea853f 100644
--- a/bench/basicbenchmark.cpp
+++ b/bench/basicbenchmark.cpp
@@ -1,4 +1,5 @@
 
+#include <iostream>
 #include "BenchUtil.h"
 #include "basicbenchmark.h"
 
diff --git a/bench/benchBlasGemm.cpp b/bench/benchBlasGemm.cpp
index a4a9e780a..85fbdb219 100644
--- a/bench/benchBlasGemm.cpp
+++ b/bench/benchBlasGemm.cpp
@@ -7,7 +7,8 @@
 // #define EIGEN_DEFAULT_TO_ROW_MAJOR
 #define _FLOAT
 
-#include <Eigen/Array>
+#include <iostream>
+
 #include <Eigen/Core>
 #include "BenchTimer.h"
 
diff --git a/bench/benchCholesky.cpp b/bench/benchCholesky.cpp
index c722d6b98..ca9bb20bc 100644
--- a/bench/benchCholesky.cpp
+++ b/bench/benchCholesky.cpp
@@ -8,7 +8,9 @@
 //  -DTRIES=10
 //  -DSCALAR=double
 
-#include <Eigen/Array>
+#include <iostream>
+
+#include <Eigen/Core>
 #include <Eigen/Cholesky>
 #include <bench/BenchUtil.h>
 using namespace Eigen;
diff --git a/bench/benchEigenSolver.cpp b/bench/benchEigenSolver.cpp
index 395bff3f9..de2fa600e 100644
--- a/bench/benchEigenSolver.cpp
+++ b/bench/benchEigenSolver.cpp
@@ -9,7 +9,9 @@
 //  -DTRIES=10
 //  -DSCALAR=double
 
-#include <Eigen/Array>
+#include <iostream>
+
+#include <Eigen/Core>
 #include <Eigen/QR>
 #include <bench/BenchUtil.h>
 using namespace Eigen;
diff --git a/bench/benchFFT.cpp b/bench/benchFFT.cpp
index 0f0c9bb93..c3d5da7a1 100644
--- a/bench/benchFFT.cpp
+++ b/bench/benchFFT.cpp
@@ -22,6 +22,8 @@
 // License and a copy of the GNU General Public License along with
 // Eigen. If not, see <http://www.gnu.org/licenses/>.
 
+#include <iostream>
+
 #include <bench/BenchUtil.h>
 #include <complex>
 #include <vector>
diff --git a/bench/benchVecAdd.cpp b/bench/benchVecAdd.cpp
index 396ab6a63..755c75ed5 100644
--- a/bench/benchVecAdd.cpp
+++ b/bench/benchVecAdd.cpp
@@ -1,4 +1,5 @@
 
+#include <iostream>
 #include <Eigen/Core>
 #include <bench/BenchTimer.h>
 using namespace Eigen;
diff --git a/bench/bench_norm.cpp b/bench/bench_norm.cpp
index 7a3dc2e68..1436ddbf5 100644
--- a/bench/bench_norm.cpp
+++ b/bench/bench_norm.cpp
@@ -1,5 +1,6 @@
 #include <typeinfo>
-#include <Eigen/Array>
+#include <iostream>
+#include <Eigen/Core>
 #include "BenchTimer.h"
 using namespace Eigen;
 using namespace std;
diff --git a/bench/bench_reverse.cpp b/bench/bench_reverse.cpp
index 2cedc0d3d..0e695b2f2 100644
--- a/bench/bench_reverse.cpp
+++ b/bench/bench_reverse.cpp
@@ -1,5 +1,6 @@
 
-#include <Eigen/Array>
+#include <iostream>
+#include <Eigen/Core>
 #include <bench/BenchUtil.h>
 using namespace Eigen;
 
diff --git a/bench/bench_sum.cpp b/bench/bench_sum.cpp
index 0e16a8eea..a3d925e4f 100644
--- a/bench/bench_sum.cpp
+++ b/bench/bench_sum.cpp
@@ -1,3 +1,4 @@
+#include <iostream>
 #include <Eigen/Core>
 using namespace Eigen;
 using namespace std;
diff --git a/bench/benchmark.cpp b/bench/benchmark.cpp
index 971de4961..c721b9081 100644
--- a/bench/benchmark.cpp
+++ b/bench/benchmark.cpp
@@ -1,5 +1,8 @@
 // g++ -O3 -DNDEBUG -DMATSIZE=<x> benchmark.cpp -o benchmark && time ./benchmark
-#include <Eigen/Array>
+
+#include <iostream>
+
+#include <Eigen/Core>
 
 #ifndef MATSIZE
 #define MATSIZE 3
diff --git a/bench/benchmarkSlice.cpp b/bench/benchmarkSlice.cpp
index 8c3d4dd10..3d04b6fd5 100644
--- a/bench/benchmarkSlice.cpp
+++ b/bench/benchmarkSlice.cpp
@@ -1,6 +1,8 @@
 // g++ -O3 -DNDEBUG benchmarkX.cpp -o benchmarkX && time ./benchmarkX
 
-#include <Eigen/Array>
+#include <iostream>
+
+#include <Eigen/Core>
 
 using namespace std;
 using namespace Eigen;
diff --git a/bench/benchmarkX.cpp b/bench/benchmarkX.cpp
index 89452b435..8e4b60c2b 100644
--- a/bench/benchmarkX.cpp
+++ b/bench/benchmarkX.cpp
@@ -1,4 +1,7 @@
 // g++ -fopenmp -I .. -O3 -DNDEBUG -finline-limit=1000 benchmarkX.cpp -o b && time ./b
+
+#include <iostream>
+
 #include <Eigen/Core>
 
 using namespace std;
diff --git a/bench/benchmarkXcwise.cpp b/bench/benchmarkXcwise.cpp
index 6a487b409..62437435e 100644
--- a/bench/benchmarkXcwise.cpp
+++ b/bench/benchmarkXcwise.cpp
@@ -1,5 +1,6 @@
 // g++ -O3 -DNDEBUG benchmarkX.cpp -o benchmarkX && time ./benchmarkX
 
+#include <iostream>
 #include <Eigen/Core>
 
 using namespace std;
diff --git a/bench/quat_slerp.cpp b/bench/quat_slerp.cpp
index 029443704..27a2067ab 100644
--- a/bench/quat_slerp.cpp
+++ b/bench/quat_slerp.cpp
@@ -1,4 +1,5 @@
 
+#include <iostream>
 #include <Eigen/Geometry>
 #include <bench/BenchTimer.h>
 using namespace Eigen;
@@ -242,4 +243,5 @@ int main()
   BENCH(slerp_legacy_nlerp);
   BENCH(slerp_rw);
   BENCH(slerp_gael);
-}
\ No newline at end of file
+}
+
diff --git a/bench/sparse_cholesky.cpp b/bench/sparse_cholesky.cpp
index ec8078e4c..4b8ff34f8 100644
--- a/bench/sparse_cholesky.cpp
+++ b/bench/sparse_cholesky.cpp
@@ -1,5 +1,6 @@
 // #define EIGEN_TAUCS_SUPPORT
 // #define EIGEN_CHOLMOD_SUPPORT
+#include <iostream>
 #include <Eigen/Sparse>
 
 // g++ -DSIZE=10000 -DDENSITY=0.001  sparse_cholesky.cpp -I.. -DDENSEMATRI -O3 -g0 -DNDEBUG   -DNBTRIES=1 -I /home/gael/Coding/LinearAlgebra/taucs_full/src/ -I/home/gael/Coding/LinearAlgebra/taucs_full/build/linux/  -L/home/gael/Coding/LinearAlgebra/taucs_full/lib/linux/ -ltaucs /home/gael/Coding/LinearAlgebra/GotoBLAS/libgoto.a -lpthread -I /home/gael/Coding/LinearAlgebra/SuiteSparse/CHOLMOD/Include/ $CHOLLIB -I /home/gael/Coding/LinearAlgebra/SuiteSparse/UFconfig/ /home/gael/Coding/LinearAlgebra/SuiteSparse/CCOLAMD/Lib/libccolamd.a   /home/gael/Coding/LinearAlgebra/SuiteSparse/CHOLMOD/Lib/libcholmod.a -lmetis /home/gael/Coding/LinearAlgebra/SuiteSparse/AMD/Lib/libamd.a  /home/gael/Coding/LinearAlgebra/SuiteSparse/CAMD/Lib/libcamd.a   /home/gael/Coding/LinearAlgebra/SuiteSparse/CCOLAMD/Lib/libccolamd.a  /home/gael/Coding/LinearAlgebra/SuiteSparse/COLAMD/Lib/libcolamd.a -llapack && ./a.out
diff --git a/bench/vdw_new.cpp b/bench/vdw_new.cpp
index b7f74a68f..d2604049f 100644
--- a/bench/vdw_new.cpp
+++ b/bench/vdw_new.cpp
@@ -1,4 +1,5 @@
-#include <Eigen/Array>
+#include <iostream>
+#include <Eigen/Core>
 
 using namespace Eigen;