Asadchev/feature/einsum ta dot

src/TiledArray/einsum/eigen.h

@@ -47,10 +47,10 @@ void einsum(std::string expr,
 
   using Index = TiledArray::Einsum::Index<char>;
   using IndexDims = TiledArray::Einsum::IndexMap<char, size_t>;
-  using TiledArray::Einsum::string::split2;
+  using ::Einsum::string::split2;
 
   auto permutation = [](auto src, auto dst) {
-    return TiledArray::Einsum::index::permutation(dst, src);
+    return TiledArray::Einsum::permutation(dst, src);
   };
 
   Index a, b, c;

src/TiledArray/einsum/index.cpp

@@ -3,7 +3,7 @@
 #include "TiledArray/einsum/string.h"
 #include "TiledArray/util/annotation.h"
 
-namespace TiledArray::Einsum::index {
+namespace Einsum::index {
 
 std::vector<std::string> validate(const std::vector<std::string> &v) {
   return v;
@@ -13,7 +13,7 @@ small_vector<std::string> tokenize(const std::string &s) {
   // std::vector<std::string> r;
   // boost::split(r, s, boost::is_any_of(", \t"));
   // return r;
-  auto r = detail::tokenize_index(s, ',');
+  auto r = TiledArray::detail::tokenize_index(s, ',');
   if (r == std::vector<std::string>{""}) return {};
   return small_vector<std::string> (r.begin(), r.end()); // correct?
 }

src/TiledArray/einsum/index.h

@@ -11,7 +11,7 @@
 #include <iosfwd>
 #include <string>
 
-namespace TiledArray::Einsum::index {
+namespace Einsum::index {
 
 template <typename T>
 using small_vector = TiledArray::container::svector<T>;
@@ -65,7 +65,7 @@ class Index {
 
   template <typename U = void>
   operator std::string() const {
-    return string::join(data_, ",");
+    return Einsum::string::join(data_, ",");
   }
 
   explicit operator bool() const { return !data_.empty(); }
@@ -186,6 +186,8 @@ Index<T> sorted(const Index<T> &a) {
   return Index<T>(r);
 }
 
+using Permutation = TiledArray::Permutation;
+
 /// @param[in] from original (preimage) indices
 /// @param[in] to target (image) indices
 /// @return Permutation mapping @p from to @p to
@@ -207,8 +209,11 @@ auto permute(const Permutation &p, const Index<T> &s,
   if (!p) return s;
   using R = typename Index<T>::container_type;
   R r(p.size());
-  detail::permute_n(p.size(), p.begin(), s.begin(), r.begin(),
-                    std::bool_constant<Inverse>{});
+  TiledArray::detail::permute_n(
+    p.size(),
+    p.begin(), s.begin(), r.begin(),
+    std::bool_constant<Inverse>{}
+  );
   return Index<T>{r};
 }
 
@@ -298,35 +303,11 @@ IndexMap<K, V> operator|(const IndexMap<K, V> &a, const IndexMap<K, V> &b) {
   return IndexMap(d);
 }
 
-}  // namespace TiledArray::Einsum::index
-
-namespace TiledArray::Einsum {
-
-using TiledArray::Einsum::index::Index;
-using TiledArray::Einsum::index::IndexMap;
-
-/// converts the annotation of an expression to an Index
-template <typename Array>
-auto idx(const std::string &s) {
-  using Index = Einsum::Index<std::string>;
-  if constexpr (detail::is_tensor_of_tensor_v<typename Array::value_type>) {
-    auto semi = std::find(s.begin(), s.end(), ';');
-    TA_ASSERT(semi != s.end());
-    auto [first,second] = string::split2(s, ";");
-    TA_ASSERT(!first.empty());
-    TA_ASSERT(!second.empty());
-    return std::tuple<Index, Index>{first, second};
-  } else {
-    return std::tuple<Index>{s};
-  }
-}
-
-/// converts the annotation of an expression to an Index
-template <typename A, bool Alias>
-auto idx(const TiledArray::expressions::TsrExpr<A, Alias> &e) {
-  return idx<A>(e.annotation());
-}
+}  // namespace Einsum::index
 
+namespace Einsum {
+  using index::Index;
+  using index::IndexMap;
 }  // namespace TiledArray::Einsum
 
 #endif /* TILEDARRAY_EINSUM_INDEX_H__INCLUDED */

src/TiledArray/einsum/range.h

@@ -6,10 +6,10 @@
 #include <vector>
 #include <boost/iterator/counting_iterator.hpp>
 
-namespace TiledArray::Einsum::range {
+namespace Einsum::range {
 
 template<typename T>
-using small_vector = container::svector<T>;
+using small_vector = TiledArray::container::svector<T>;
 
 struct Range {
   using value_type = int64_t;
@@ -130,9 +130,9 @@ void cartesian_foreach(const std::vector<R>& rs, F f) {
   }
 }
 
-}  // namespace TiledArray::Einsum::range
+}  // namespace Einsum::range
 
-namespace TiledArray::Einsum {
+namespace Einsum {
   using range::Range;
   using range::RangeProduct;
 }

src/TiledArray/einsum/string.h

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-namespace TiledArray::Einsum::string {
+namespace Einsum::string {
 namespace {
 
   // Split delimiter must match completely