Merge pull request #350 from johannes-menzel/jmenzel/fix-AVXFloat-type

Added vector_traits<simd::VectorAVXFloat> to correctly represent the properties of VectorAVXFloat

Author: evaleev

include/libint2/util/vector_x86.h

@@ -927,6 +927,40 @@ inline VectorAVXDouble erfc(VectorAVXDouble a) {
   return result;
 }
 
+};  // namespace simd
+};  // namespace libint2
+
+//@{ standard stream operations
+inline std::ostream& operator<<(std::ostream& os,
+                                libint2::simd::VectorAVXDouble a) {
+  double ad[4];
+  a.convert(ad);
+  os << "{" << ad[0] << "," << ad[1] << "," << ad[2] << "," << ad[3] << "}";
+  return os;
+}
+
+namespace libint2 {
+
+//@{ vector traits of VectorAVXDouble
+
+template <>
+struct is_vector<simd::VectorAVXDouble> {
+  static const bool value = true;
+};
+
+template <>
+struct vector_traits<simd::VectorAVXDouble> {
+  typedef double scalar_type;
+  static const size_t extent = 4;
+};
+
+//@}
+
+}  // namespace libint2
+
+namespace libint2 {
+namespace simd {
+
 /**
  * SIMD vector of 8 single-precision floating-point real numbers, operations on
  * which use AVX instructions available on recent x86 hardware from Intel
@@ -1149,15 +1183,6 @@ inline VectorAVXFloat erfc(VectorAVXFloat a) {
 };  // namespace simd
 };  // namespace libint2
 
-//@{ standard stream operations
-inline std::ostream& operator<<(std::ostream& os,
-                                libint2::simd::VectorAVXDouble a) {
-  double ad[4];
-  a.convert(ad);
-  os << "{" << ad[0] << "," << ad[1] << "," << ad[2] << "," << ad[3] << "}";
-  return os;
-}
-
 //@{ standard stream operations
 inline std::ostream& operator<<(std::ostream& os,
                                 libint2::simd::VectorAVXFloat a) {
@@ -1171,17 +1196,17 @@ inline std::ostream& operator<<(std::ostream& os,
 
 namespace libint2 {
 
-//@{ vector traits of VectorAVXDouble
+//@{ vector traits of VectorAVXFloat
 
 template <>
-struct is_vector<simd::VectorAVXDouble> {
+struct is_vector<simd::VectorAVXFloat> {
   static const bool value = true;
 };
 
 template <>
-struct vector_traits<simd::VectorAVXDouble> {
-  typedef double scalar_type;
-  static const size_t extent = 4;
+struct vector_traits<simd::VectorAVXFloat> {
+  typedef float scalar_type;
+  static const size_t extent = 8;
 };
 
 //@}