18 files changed, 18 insertions, 18 deletions
diff --git a/src/amun/cpu/decoder/best_hyps.h b/src/amun/cpu/decoder/best_hyps.h
index 171567a5..1621b681 100644
--- a/src/amun/cpu/decoder/best_hyps.h
+++ b/src/amun/cpu/decoder/best_hyps.h
@@ -6,7 +6,7 @@
 #include "common/scorer.h"
 #include "common/god.h"
 #include "common/exception.h"
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include "cpu/decoder/encoder_decoder.h"
 
 namespace amunmt {
diff --git a/src/amun/cpu/decoder/encoder_decoder.h b/src/amun/cpu/decoder/encoder_decoder.h
index 54fee817..f26ae952 100644
--- a/src/amun/cpu/decoder/encoder_decoder.h
+++ b/src/amun/cpu/decoder/encoder_decoder.h
@@ -3,7 +3,7 @@
 #include <yaml-cpp/yaml.h>
 
 #include "common/scorer.h"
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include "cpu/decoder/encoder_decoder_state.h"
 
 namespace amunmt {
diff --git a/src/amun/cpu/decoder/encoder_decoder_state.h b/src/amun/cpu/decoder/encoder_decoder_state.h
index 12390e5a..be3cd028 100644
--- a/src/amun/cpu/decoder/encoder_decoder_state.h
+++ b/src/amun/cpu/decoder/encoder_decoder_state.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include "common/scorer.h"
 
 namespace amunmt {
diff --git a/src/amun/cpu/dl4mt/decoder.h b/src/amun/cpu/dl4mt/decoder.h
index db24d10f..d9bbf3c3 100644
--- a/src/amun/cpu/dl4mt/decoder.h
+++ b/src/amun/cpu/dl4mt/decoder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../mblas/matrix.h"
+#include "../mblas/tensor.h"
 #include "model.h"
 #include "gru.h"
 #include "common/god.h"
diff --git a/src/amun/cpu/dl4mt/encoder.h b/src/amun/cpu/dl4mt/encoder.h
index 388edecf..40ebd1f0 100644
--- a/src/amun/cpu/dl4mt/encoder.h
+++ b/src/amun/cpu/dl4mt/encoder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../mblas/matrix.h"
+#include "../mblas/tensor.h"
 #include "../dl4mt/model.h"
 #include "../dl4mt/gru.h"
 
diff --git a/src/amun/cpu/dl4mt/encoder_decoder.h b/src/amun/cpu/dl4mt/encoder_decoder.h
index c9ec3e63..69846373 100644
--- a/src/amun/cpu/dl4mt/encoder_decoder.h
+++ b/src/amun/cpu/dl4mt/encoder_decoder.h
@@ -4,7 +4,7 @@
 #include <yaml-cpp/yaml.h>
 
 #include "cpu/decoder/encoder_decoder.h"
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include "cpu/dl4mt/model.h"
 #include "cpu/dl4mt/encoder.h"
 #include "cpu/dl4mt/decoder.h"
diff --git a/src/amun/cpu/dl4mt/gru.h b/src/amun/cpu/dl4mt/gru.h
index 3c8ff957..7089396e 100644
--- a/src/amun/cpu/dl4mt/gru.h
+++ b/src/amun/cpu/dl4mt/gru.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 
 namespace amunmt {
 namespace CPU {
diff --git a/src/amun/cpu/dl4mt/model.h b/src/amun/cpu/dl4mt/model.h
index b9aa91af..cfe6ae25 100644
--- a/src/amun/cpu/dl4mt/model.h
+++ b/src/amun/cpu/dl4mt/model.h
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "cpu/npz_converter.h"
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 
 namespace amunmt {
 namespace CPU {
diff --git a/src/amun/cpu/mblas/matrix.cpp b/src/amun/cpu/mblas/tensor.cpp
index 2ee0bbb7..6c385be0 100644
--- a/src/amun/cpu/mblas/matrix.cpp
+++ b/src/amun/cpu/mblas/tensor.cpp
@@ -1,5 +1,5 @@
 #include <boost/iterator/permutation_iterator.hpp>
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include "cpu/mblas/simd_math_prims.h"
 #include "common/god.h"
 #include "common/hypothesis.h"
diff --git a/src/amun/cpu/mblas/matrix.h b/src/amun/cpu/mblas/tensor.h
index 206fe6c1..7104085a 100644
--- a/src/amun/cpu/mblas/matrix.h
+++ b/src/amun/cpu/mblas/tensor.h
@@ -7,7 +7,7 @@
 
 #include <blaze/Math.h>
 #include "phoenix_functions.h"
-#include "common/base_matrix.h"
+#include "common/base_tensor.h"
 #include "common/exception.h"
 
 namespace amunmt {
diff --git a/src/amun/cpu/nematus/decoder.h b/src/amun/cpu/nematus/decoder.h
index 9761d424..ab979ae7 100644
--- a/src/amun/cpu/nematus/decoder.h
+++ b/src/amun/cpu/nematus/decoder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../mblas/matrix.h"
+#include "../mblas/tensor.h"
 #include "model.h"
 #include "gru.h"
 #include "transition.h"
diff --git a/src/amun/cpu/nematus/encoder.h b/src/amun/cpu/nematus/encoder.h
index bc7e9d73..b55246b4 100644
--- a/src/amun/cpu/nematus/encoder.h
+++ b/src/amun/cpu/nematus/encoder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../mblas/matrix.h"
+#include "../mblas/tensor.h"
 #include "model.h"
 #include "gru.h"
 #include "transition.h"
diff --git a/src/amun/cpu/nematus/encoder_decoder.cpp b/src/amun/cpu/nematus/encoder_decoder.cpp
index b5a7cac9..d3d3697a 100644
--- a/src/amun/cpu/nematus/encoder_decoder.cpp
+++ b/src/amun/cpu/nematus/encoder_decoder.cpp
@@ -7,7 +7,7 @@
 #include "common/sentences.h"
 
 #include "cpu/decoder/encoder_decoder_loader.h"
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 
 using namespace std;
 
diff --git a/src/amun/cpu/nematus/encoder_decoder.h b/src/amun/cpu/nematus/encoder_decoder.h
index 4c1c0ac6..2fd43abb 100644
--- a/src/amun/cpu/nematus/encoder_decoder.h
+++ b/src/amun/cpu/nematus/encoder_decoder.h
@@ -8,7 +8,7 @@
 #include "cpu/nematus/decoder.h"
 #include "cpu/nematus/model.h"
 
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 
 namespace amunmt {
 
diff --git a/src/amun/cpu/nematus/gru.h b/src/amun/cpu/nematus/gru.h
index 048b6215..3166ca6e 100644
--- a/src/amun/cpu/nematus/gru.h
+++ b/src/amun/cpu/nematus/gru.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include <iomanip>
 
 namespace amunmt {
diff --git a/src/amun/cpu/nematus/model.h b/src/amun/cpu/nematus/model.h
index a3ff6e61..b378b434 100644
--- a/src/amun/cpu/nematus/model.h
+++ b/src/amun/cpu/nematus/model.h
@@ -6,7 +6,7 @@
 
 #include "cpu/npz_converter.h"
 
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 
 namespace amunmt {
 namespace CPU {
diff --git a/src/amun/cpu/nematus/transition.h b/src/amun/cpu/nematus/transition.h
index 818af923..651ea9ca 100644
--- a/src/amun/cpu/nematus/transition.h
+++ b/src/amun/cpu/nematus/transition.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cpu/mblas/matrix.h"
+#include "cpu/mblas/tensor.h"
 #include "model.h"
 
 namespace amunmt {
diff --git a/src/amun/cpu/npz_converter.h b/src/amun/cpu/npz_converter.h
index fb7b0197..15414c2b 100644
--- a/src/amun/cpu/npz_converter.h
+++ b/src/amun/cpu/npz_converter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "cnpy/cnpy.h"
-#include "mblas/matrix.h"
+#include "mblas/tensor.h"
 
 namespace amunmt {
 namespace CPU {