test arrays. clean include

- clean include path.
  (pragma once issue on icc).
- clean icc debug macros

test/triqs/arrays/array_algebra.cpp

@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 #include <type_traits>
 

test/triqs/arrays/array_cache2.cpp

@@ -21,9 +21,9 @@
 
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #define TRIQS_ARRAYS_CACHE_COPY_VERBOSE
-#include "./src/cache.hpp"
+#include <triqs/arrays/cache.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/array_mpi.cpp

@@ -20,7 +20,7 @@
  ******************************************************************************/
 #include "./common.hpp"
 // order of include in horrible : on mac + clang, array (in fact boost::tuple) must come before boost::mpi
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <boost/mpi.hpp>
 #include <iostream>
 #include <sstream>

test/triqs/arrays/assign_vect_array.cpp

@@ -21,8 +21,8 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/assignment.cpp

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/blas_lapack.cpp

@@ -20,15 +20,15 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 
-#include "./src/blas_lapack/gemm.hpp"
+#include <triqs/arrays/blas_lapack/gemm.hpp>
-#include "./src/blas_lapack/gemv.hpp"
+#include <triqs/arrays/blas_lapack/gemv.hpp>
-#include "./src/blas_lapack/ger.hpp"
+#include <triqs/arrays/blas_lapack/ger.hpp>
-#include "./src/blas_lapack/axpy.hpp"
+#include <triqs/arrays/blas_lapack/axpy.hpp>
 
 #include <iostream>
 using namespace triqs::arrays;

test/triqs/arrays/bound_check.cpp

@@ -21,8 +21,8 @@
 #define TRIQS_ARRAYS_ENFORCE_BOUNDCHECK
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/common.hpp

@@ -21,10 +21,10 @@
  ******************************************************************************/
 #ifndef COMMON_TEST_ARRAY_H
 #define COMMON_TEST_ARRAY_H
-#include <iostream>
 #include <triqs/arrays.hpp>
 #include <triqs/arrays/asserts.hpp>
 #include<sstream>
+#include <iostream>
 
 #define TEST(X) std::cout << BOOST_PP_STRINGIZE((X)) << " ---> "<< (X) <<std::endl;
 

test/triqs/arrays/compound_ops.cpp

@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/const_view.cpp

@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/create.cpp

@@ -20,8 +20,8 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 

test/triqs/arrays/cross_construct.cpp

@@ -19,9 +19,9 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/dot.cpp

@@ -21,11 +21,11 @@
 #include "./common.hpp"
 #include <iostream>
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/blas_lapack/dot.hpp"
+#include <triqs/arrays/blas_lapack/dot.hpp>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 
 using namespace triqs::arrays;
 

test/triqs/arrays/eigenelements.cpp

@@ -19,10 +19,10 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/linalg/eigenelements.hpp"
+#include <triqs/arrays/linalg/eigenelements.hpp>
 
 #include <iostream>
 

test/triqs/arrays/ellipsis.cpp

@@ -20,10 +20,10 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 
 
 using namespace triqs::arrays;

test/triqs/arrays/expr_matrix.cpp

@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <iostream>
 #include <triqs/arrays/asserts.hpp>

test/triqs/arrays/fill_with_lazy.cpp

@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 namespace tqa=triqs::arrays; namespace tql=triqs::clef;
 

test/triqs/arrays/fold_expression.cpp

@@ -20,10 +20,10 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/functional/fold.hpp"
+#include <triqs/arrays/functional/fold.hpp>
-#include "./src/functional/map.hpp"
+#include <triqs/arrays/functional/map.hpp>
-#include "./src/algorithms.hpp"
+#include <triqs/arrays/algorithms.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/h5_stack.cpp

@@ -19,10 +19,10 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/h5/array_stack.hpp"
+#include <triqs/arrays/h5/array_stack.hpp>
-#include "./src/h5/simple_read_write.hpp"
+#include <triqs/arrays/h5/simple_read_write.hpp>
 #include <iostream>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 
 using std::cout; using std::endl;
 using namespace triqs::arrays;

test/triqs/arrays/h5_string_arrays.cpp

@@ -19,10 +19,10 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
-#include "./src/h5/simple_read_write.hpp"
+#include <triqs/arrays/h5/simple_read_write.hpp>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 #include <triqs/h5.hpp>
 
 using std::cout; using std::endl;

test/triqs/arrays/h5_vector_array.cpp

@@ -20,7 +20,7 @@
  ******************************************************************************/
 #include "./common.hpp"
 #include <iostream>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 #include <triqs/h5.hpp>
 
 using std::cout; using std::endl;

test/triqs/arrays/hdf5.cpp

@@ -19,9 +19,9 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
-#include "./src/h5/simple_read_write.hpp"
+#include <triqs/arrays/h5/simple_read_write.hpp>
 
 using std::cout; using std::endl;
 namespace tqa = triqs::arrays;

test/triqs/arrays/init_list.cpp

@@ -21,16 +21,14 @@
 #include "./common.hpp"
 #include <iostream>
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 
 using namespace triqs::arrays;
 
 int main(int argc, char **argv) {
 
-// only for icc 13.x
-#ifndef TRIQS_WORKAROUND_INTEL_COMPILER_BUGS 
  array<double,1> A = {1,2,3,4};
  std::cout  << A<< A.shape()<<std::endl ;
 
@@ -43,9 +41,6 @@ int main(int argc, char **argv) {
  matrix<double> M = {{1,2},{3,4}, {5,6}};
  std::cout  << M<< M.shape()<<std::endl ;
 
-
-#endif
-
 }
 
 

test/triqs/arrays/inverse2.cpp

@@ -20,10 +20,10 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/iterators.cpp

@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/lexico_vector.cpp

@@ -22,10 +22,10 @@
 #include <iostream>
 #include <algorithm>
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
 
 using namespace triqs::arrays;
 

test/triqs/arrays/map_expression.cpp

@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/functional/map.hpp"
+#include <triqs/arrays/functional/map.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 #include <algorithm>
 

test/triqs/arrays/mapped_functions.cpp

@@ -20,9 +20,9 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/mapped_functions.hpp"
+#include <triqs/arrays/mapped_functions.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/mat_vec_mul.cpp

@@ -20,11 +20,11 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/mat_vec_mul2.cpp

@@ -20,12 +20,12 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
-#include "./src/linalg/det_and_inverse.hpp"
+#include <triqs/arrays/linalg/det_and_inverse.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/move.cpp

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/negate.cpp

@@ -19,12 +19,12 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/asserts.hpp"
+#include <triqs/arrays/asserts.hpp>
-#include "./src/algorithms.hpp"
+#include <triqs/arrays/algorithms.hpp>
-#include "./src/mapped_functions.hpp"
+#include <triqs/arrays/mapped_functions.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/non_numeric.cpp

@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/printing.cpp

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 //using std::cout; using std::endl;

test/triqs/arrays/scalar_assign.cpp

@@ -21,9 +21,9 @@
  ******************************************************************************/
 #include "./common.hpp"
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
-#include "./src/matrix.hpp"
+#include <triqs/arrays/matrix.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/serialization.cpp

@@ -22,7 +22,7 @@
 #define TRIQS_ARRAYS_ENFORCE_BOUNDCHECK
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 #include <fstream>
 

test/triqs/arrays/src

@@ -1 +0,0 @@
-../../../triqs/arrays

test/triqs/arrays/swap.cpp

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 namespace tqa=triqs::arrays;

test/triqs/arrays/temp_slice.cpp

@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using namespace triqs::arrays;

test/triqs/arrays/tridiag.cpp

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/linalg/eigenelements.hpp"
+#include <triqs/arrays/linalg/eigenelements.hpp>
-#include "./src/blas_lapack/stev.hpp"
+#include <triqs/arrays/blas_lapack/stev.hpp>
 using namespace triqs::arrays;
 using namespace triqs;
 

test/triqs/arrays/vector_brack.cpp

@@ -19,7 +19,7 @@
  *
  ******************************************************************************/
 #include "./common.hpp"
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 using std::cout; using std::endl;
 using namespace triqs::arrays;

test/triqs/arrays/vector_cmul.cpp

@@ -22,7 +22,7 @@
 
 #include "./common.hpp"
 
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/vector_copy.cpp

@@ -22,7 +22,7 @@
 
 #include "./common.hpp"
 
-#include "./src/vector.hpp"
+#include <triqs/arrays/vector.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/views.cpp

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/views3.cpp

@@ -21,7 +21,7 @@
 #include "./common.hpp"
 #define ARRAY_DEBUG_SLICE
 
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

test/triqs/arrays/withSTL.cpp

@@ -21,7 +21,7 @@
  ******************************************************************************/
 
 #include "./common.hpp"
-#include "./src/array.hpp"
+#include <triqs/arrays/array.hpp>
 #include <iostream>
 
 using std::cout; using std::endl;

triqs/utility/complex_ops.hpp

@@ -2,10 +2,8 @@
 #define TRIQS_UTILITY_COMPLEX_OPS_H
 #include <complex> 
 
-#ifndef TRIQS_WORKAROUND_INTEL_COMPILER_14_BUGS   
 inline  std::complex<double> operator"" _j ( long double x ) { return std::complex<double>(0,x); }
 inline  std::complex<double> operator"" _j ( unsigned long long x ) { return std::complex<double>(0,x); }
-#endif
 
 namespace std { // has to be in the right namespace for ADL !