From 88534ba623421c956d8ffcda2d27f41d704d15ef Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 3 Jul 2018 07:37:12 +0200
Subject: update eigen

---
 eigen/bench/btl/actions/basic_actions.hh         |  2 +-
 eigen/bench/btl/libs/BLAS/blas_interface_impl.hh |  6 +++---
 eigen/bench/btl/libs/BLAS/main.cpp               |  2 +-
 eigen/bench/btl/libs/STL/STL_interface.hh        | 24 ++++++++++++------------
 eigen/bench/btl/libs/blaze/blaze_interface.hh    | 17 ++++++++---------
 eigen/bench/btl/libs/blaze/main.cpp              |  6 +++---
 eigen/bench/btl/libs/eigen3/eigen3_interface.hh  |  8 +++-----
 eigen/bench/btl/libs/eigen3/main_matmat.cpp      |  2 +-
 8 files changed, 32 insertions(+), 35 deletions(-)

(limited to 'eigen/bench/btl')

diff --git a/eigen/bench/btl/actions/basic_actions.hh b/eigen/bench/btl/actions/basic_actions.hh
index 62442f0..a3333ea 100644
--- a/eigen/bench/btl/actions/basic_actions.hh
+++ b/eigen/bench/btl/actions/basic_actions.hh
@@ -6,7 +6,7 @@
 #include "action_atv_product.hh"
 
 #include "action_matrix_matrix_product.hh"
-#include "action_ata_product.hh"
+// #include "action_ata_product.hh"
 #include "action_aat_product.hh"
 
 #include "action_trisolve.hh"
diff --git a/eigen/bench/btl/libs/BLAS/blas_interface_impl.hh b/eigen/bench/btl/libs/BLAS/blas_interface_impl.hh
index 9e0a649..fc4ba2a 100644
--- a/eigen/bench/btl/libs/BLAS/blas_interface_impl.hh
+++ b/eigen/bench/btl/libs/BLAS/blas_interface_impl.hh
@@ -46,9 +46,9 @@ public :
     BLAS_FUNC(gemm)(&notrans,&notrans,&N,&N,&N,&fone,A,&N,B,&N,&fzero,X,&N);
   }
 
-  static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){
-    BLAS_FUNC(syrk)(&lower,&trans,&N,&N,&fone,A,&N,&fzero,X,&N);
-  }
+//   static inline void ata_product(gene_matrix & A, gene_matrix & X, int N){
+//     ssyrk_(&lower,&trans,&N,&N,&fone,A,&N,&fzero,X,&N);
+//   }
 
   static inline void aat_product(gene_matrix & A, gene_matrix & X, int N){
     BLAS_FUNC(syrk)(&lower,&notrans,&N,&N,&fone,A,&N,&fzero,X,&N);
diff --git a/eigen/bench/btl/libs/BLAS/main.cpp b/eigen/bench/btl/libs/BLAS/main.cpp
index fd99149..564d55e 100644
--- a/eigen/bench/btl/libs/BLAS/main.cpp
+++ b/eigen/bench/btl/libs/BLAS/main.cpp
@@ -48,7 +48,7 @@ int main()
   bench<Action_rot<blas_interface<REAL_TYPE> > >(MIN_AXPY,MAX_AXPY,NB_POINT);
 
   bench<Action_matrix_matrix_product<blas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-  bench<Action_ata_product<blas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+//   bench<Action_ata_product<blas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_aat_product<blas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
   bench<Action_trisolve<blas_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
diff --git a/eigen/bench/btl/libs/STL/STL_interface.hh b/eigen/bench/btl/libs/STL/STL_interface.hh
index 16658c4..ef4cc92 100644
--- a/eigen/bench/btl/libs/STL/STL_interface.hh
+++ b/eigen/bench/btl/libs/STL/STL_interface.hh
@@ -78,18 +78,18 @@ public :
         cible[i][j]=source[i][j];
   }
 
-  static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N)
-  {
-    real somme;
-    for (int j=0;j<N;j++){
-      for (int i=0;i<N;i++){
-        somme=0.0;
-        for (int k=0;k<N;k++)
-          somme += A[i][k]*A[j][k];
-        X[j][i]=somme;
-      }
-    }
-  }
+//   static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N)
+//   {
+//     real somme;
+//     for (int j=0;j<N;j++){
+//       for (int i=0;i<N;i++){
+//         somme=0.0;
+//         for (int k=0;k<N;k++)
+//           somme += A[i][k]*A[j][k];
+//         X[j][i]=somme;
+//       }
+//     }
+//   }
 
   static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N)
   {
diff --git a/eigen/bench/btl/libs/blaze/blaze_interface.hh b/eigen/bench/btl/libs/blaze/blaze_interface.hh
index 7b418f6..ee15239 100644
--- a/eigen/bench/btl/libs/blaze/blaze_interface.hh
+++ b/eigen/bench/btl/libs/blaze/blaze_interface.hh
@@ -20,7 +20,6 @@
 
 #include <blaze/Math.h>
 #include <blaze/Blaze.h>
-#include <Eigen/Core>
 // using namespace blaze;
 
 #include <vector>
@@ -81,35 +80,35 @@ public :
     }
   }
 
-  static EIGEN_DONT_INLINE void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
+  static inline void matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
     X = (A*B);
   }
 
-  static EIGEN_DONT_INLINE void transposed_matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
+  static inline void transposed_matrix_matrix_product(const gene_matrix & A, const gene_matrix & B, gene_matrix & X, int N){
     X = (trans(A)*trans(B));
   }
 
-  static EIGEN_DONT_INLINE void ata_product(const gene_matrix & A, gene_matrix & X, int N){
+  static inline void ata_product(const gene_matrix & A, gene_matrix & X, int N){
     X = (trans(A)*A);
   }
 
-  static EIGEN_DONT_INLINE void aat_product(const gene_matrix & A, gene_matrix & X, int N){
+  static inline void aat_product(const gene_matrix & A, gene_matrix & X, int N){
     X = (A*trans(A));
   }
 
-  static EIGEN_DONT_INLINE void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
+  static inline void matrix_vector_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
     X = (A*B);
   }
 
-  static EIGEN_DONT_INLINE void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
+  static inline void atv_product(gene_matrix & A, gene_vector & B, gene_vector & X, int N){
     X = (trans(A)*B);
   }
 
-  static EIGEN_DONT_INLINE void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
+  static inline void axpy(const real coef, const gene_vector & X, gene_vector & Y, int N){
     Y += coef * X;
   }
 
-  static EIGEN_DONT_INLINE void axpby(real a, const gene_vector & X, real b, gene_vector & Y, int N){
+  static inline void axpby(real a, const gene_vector & X, real b, gene_vector & Y, int N){
     Y = a*X + b*Y;
   }
 
diff --git a/eigen/bench/btl/libs/blaze/main.cpp b/eigen/bench/btl/libs/blaze/main.cpp
index ccae0cb..80e8f4e 100644
--- a/eigen/bench/btl/libs/blaze/main.cpp
+++ b/eigen/bench/btl/libs/blaze/main.cpp
@@ -30,9 +30,9 @@ int main()
 
   bench<Action_matrix_vector_product<blaze_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
   bench<Action_atv_product<blaze_interface<REAL_TYPE> > >(MIN_MV,MAX_MV,NB_POINT);
-  bench<Action_matrix_matrix_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-  bench<Action_ata_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-  bench<Action_aat_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+//   bench<Action_matrix_matrix_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+//   bench<Action_ata_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+//   bench<Action_aat_product<blaze_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
   return 0;
 }
diff --git a/eigen/bench/btl/libs/eigen3/eigen3_interface.hh b/eigen/bench/btl/libs/eigen3/eigen3_interface.hh
index 2e302d0..b821fd7 100644
--- a/eigen/bench/btl/libs/eigen3/eigen3_interface.hh
+++ b/eigen/bench/btl/libs/eigen3/eigen3_interface.hh
@@ -92,11 +92,9 @@ public :
     X.noalias() = A.transpose()*B.transpose();
   }
 
-  static inline void ata_product(const gene_matrix & A, gene_matrix & X, int  /*N*/){
-    //X.noalias() = A.transpose()*A;
-    X.template triangularView<Lower>().setZero();
-    X.template selfadjointView<Lower>().rankUpdate(A.transpose());
-  }
+//   static inline void ata_product(const gene_matrix & A, gene_matrix & X, int  /*N*/){
+//     X.noalias() = A.transpose()*A;
+//   }
 
   static inline void aat_product(const gene_matrix & A, gene_matrix & X, int  /*N*/){
     X.template triangularView<Lower>().setZero();
diff --git a/eigen/bench/btl/libs/eigen3/main_matmat.cpp b/eigen/bench/btl/libs/eigen3/main_matmat.cpp
index 052810a..926fa2b 100644
--- a/eigen/bench/btl/libs/eigen3/main_matmat.cpp
+++ b/eigen/bench/btl/libs/eigen3/main_matmat.cpp
@@ -25,7 +25,7 @@ BTL_MAIN;
 int main()
 {
   bench<Action_matrix_matrix_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
-  bench<Action_ata_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
+//   bench<Action_ata_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_aat_product<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
   bench<Action_trmm<eigen3_interface<REAL_TYPE> > >(MIN_MM,MAX_MM,NB_POINT);
 
-- 
cgit v1.2.3