diff options
Diffstat (limited to 'src/amun')
25 files changed, 35 insertions, 35 deletions
diff --git a/src/amun/CMakeLists.txt b/src/amun/CMakeLists.txt index bf53e6d5..3c3dd24e 100644 --- a/src/amun/CMakeLists.txt +++ b/src/amun/CMakeLists.txt @@ -89,10 +89,10 @@ cuda_add_executable( gpu/dl4mt/gru.cu gpu/dl4mt/model.cu gpu/mblas/handles.cu - gpu/mblas/matrix.cu - gpu/mblas/matrix_functions.cu gpu/mblas/nth_element.cu gpu/mblas/nth_element_kernels.cu + gpu/mblas/tensor.cu + gpu/mblas/tensor_functions.cu gpu/npz_converter.cu gpu/types-gpu.cu @@ -112,10 +112,10 @@ cuda_add_library(python SHARED gpu/decoder/encoder_decoder_loader.cu gpu/decoder/encoder_decoder_state.cu gpu/mblas/handles.cu - gpu/mblas/matrix.cu - gpu/mblas/matrix_functions.cu gpu/mblas/nth_element.cu gpu/mblas/nth_element_kernels.cu + gpu/mblas/tensor.cu + gpu/mblas/tensor_functions.cu gpu/dl4mt/encoder.cu gpu/dl4mt/gru.cu gpu/dl4mt/model.cu diff --git a/src/amun/gpu/decoder/ape_penalty.h b/src/amun/gpu/decoder/ape_penalty.h index 40357d22..3e969987 100644 --- a/src/amun/gpu/decoder/ape_penalty.h +++ b/src/amun/gpu/decoder/ape_penalty.h @@ -8,7 +8,7 @@ #include "common/base_best_hyps.h" #include "common/loader.h" -#include "gpu/mblas/matrix.h" +#include "gpu/mblas/tensor.h" namespace GPU { diff --git a/src/amun/gpu/decoder/best_hyps.h b/src/amun/gpu/decoder/best_hyps.h index 058d709d..5fa05476 100644 --- a/src/amun/gpu/decoder/best_hyps.h +++ b/src/amun/gpu/decoder/best_hyps.h @@ -8,7 +8,7 @@ #include "common/exception.h" #include "common/god.h" #include "common/utils.h" -#include "gpu/mblas/matrix_functions.h" +#include "gpu/mblas/tensor_functions.h" #include "gpu/mblas/nth_element.h" #include "gpu/mblas/vector.h" diff --git a/src/amun/gpu/decoder/encoder_decoder.cu b/src/amun/gpu/decoder/encoder_decoder.cu index c85fd006..e43202b0 100644 --- a/src/amun/gpu/decoder/encoder_decoder.cu +++ b/src/amun/gpu/decoder/encoder_decoder.cu @@ -5,7 +5,7 @@ #include "common/sentences.h" #include "encoder_decoder.h" -#include "gpu/mblas/matrix_functions.h" +#include "gpu/mblas/tensor_functions.h" #include "gpu/dl4mt/dl4mt.h" #include "gpu/decoder/encoder_decoder_state.h" #include "gpu/decoder/best_hyps.h" diff --git a/src/amun/gpu/decoder/encoder_decoder.h b/src/amun/gpu/decoder/encoder_decoder.h index 4aba741a..d145559e 100644 --- a/src/amun/gpu/decoder/encoder_decoder.h +++ b/src/amun/gpu/decoder/encoder_decoder.h @@ -7,7 +7,7 @@ #include "common/base_best_hyps.h" #include "common/threadpool.h" #include "gpu/types-gpu.h" -#include "gpu/mblas/matrix.h" +#include "gpu/mblas/tensor.h" #include "gpu/mblas/handles.h" #include "gpu/mblas/vector.h" diff --git a/src/amun/gpu/decoder/language_model.h b/src/amun/gpu/decoder/language_model.h index 728eb2f2..7fc9f33c 100644 --- a/src/amun/gpu/decoder/language_model.h +++ b/src/amun/gpu/decoder/language_model.h @@ -4,7 +4,7 @@ #include "types.h" #include "scorer.h" -#include "matrix.h" +#include "tensor.h" #include "dl4mt.h" #include "threadpool.h" #include "kenlm.h" diff --git a/src/amun/gpu/dl4mt/cell.h b/src/amun/gpu/dl4mt/cell.h index d7cb6e7a..7b4ac955 100644 --- a/src/amun/gpu/dl4mt/cell.h +++ b/src/amun/gpu/dl4mt/cell.h @@ -1,6 +1,6 @@ #pragma once -#include "gpu/mblas/matrix_functions.h" -#include "gpu/mblas/matrix_wrapper.h" +#include "gpu/mblas/tensor_functions.h" +#include "gpu/mblas/tensor_wrapper.h" #include "gpu/mblas/handles.h" #include "cellstate.h" diff --git a/src/amun/gpu/dl4mt/cellstate.h b/src/amun/gpu/dl4mt/cellstate.h index f9626ea5..3a316a55 100644 --- a/src/amun/gpu/dl4mt/cellstate.h +++ b/src/amun/gpu/dl4mt/cellstate.h @@ -1,6 +1,6 @@ #pragma once -#include "gpu/mblas/matrix_functions.h" -#include "gpu/mblas/matrix_wrapper.h" +#include "gpu/mblas/tensor_functions.h" +#include "gpu/mblas/tensor_wrapper.h" #include "gpu/mblas/handles.h" namespace amunmt { diff --git a/src/amun/gpu/dl4mt/decoder.h b/src/amun/gpu/dl4mt/decoder.h index fac50fb8..9f61aff4 100644 --- a/src/amun/gpu/dl4mt/decoder.h +++ b/src/amun/gpu/dl4mt/decoder.h @@ -3,7 +3,7 @@ #include <yaml-cpp/yaml.h> #include "gpu/mblas/vector.h" -#include "gpu/mblas/matrix_functions.h" +#include "gpu/mblas/tensor_functions.h" #include "model.h" #include "gru.h" #include "lstm.h" diff --git a/src/amun/gpu/dl4mt/encoder.h b/src/amun/gpu/dl4mt/encoder.h index 65c05476..c29b5556 100644 --- a/src/amun/gpu/dl4mt/encoder.h +++ b/src/amun/gpu/dl4mt/encoder.h @@ -2,7 +2,7 @@ #include <yaml-cpp/yaml.h> -#include "gpu/mblas/matrix_functions.h" +#include "gpu/mblas/tensor_functions.h" #include "model.h" #include "gru.h" #include "common/sentence.h" diff --git a/src/amun/gpu/dl4mt/gru.h b/src/amun/gpu/dl4mt/gru.h index 5dcca9fb..8b82d81a 100644 --- a/src/amun/gpu/dl4mt/gru.h +++ b/src/amun/gpu/dl4mt/gru.h @@ -1,7 +1,7 @@ #pragma once #include <boost/timer/timer.hpp> -#include "gpu/mblas/matrix_functions.h" -#include "gpu/mblas/matrix_wrapper.h" +#include "gpu/mblas/tensor_functions.h" +#include "gpu/mblas/tensor_wrapper.h" #include "gpu/mblas/handles.h" #include "gpu/dl4mt/cell.h" #include "cellstate.h" diff --git a/src/amun/gpu/dl4mt/lstm.h b/src/amun/gpu/dl4mt/lstm.h index 7dbfe600..2f343db6 100644 --- a/src/amun/gpu/dl4mt/lstm.h +++ b/src/amun/gpu/dl4mt/lstm.h @@ -1,7 +1,7 @@ #pragma once #include <boost/timer/timer.hpp> -#include "gpu/mblas/matrix_functions.h" -#include "gpu/mblas/matrix_wrapper.h" +#include "gpu/mblas/tensor_functions.h" +#include "gpu/mblas/tensor_wrapper.h" #include "gpu/mblas/handles.h" #include "gpu/dl4mt/cell.h" #include "cellstate.h" diff --git a/src/amun/gpu/dl4mt/model.h b/src/amun/gpu/dl4mt/model.h index 5652b80b..0829d233 100644 --- a/src/amun/gpu/dl4mt/model.h +++ b/src/amun/gpu/dl4mt/model.h @@ -4,7 +4,7 @@ #include <string> #include <yaml-cpp/yaml.h> -#include "gpu/mblas/matrix.h" +#include "gpu/mblas/tensor.h" #include "gpu/npz_converter.h" namespace amunmt { diff --git a/src/amun/gpu/dl4mt/multiplicative.h b/src/amun/gpu/dl4mt/multiplicative.h index 67bdc7d5..644413d9 100644 --- a/src/amun/gpu/dl4mt/multiplicative.h +++ b/src/amun/gpu/dl4mt/multiplicative.h @@ -1,7 +1,7 @@ #pragma once #include <boost/timer/timer.hpp> -#include "gpu/mblas/matrix_functions.h" -#include "gpu/mblas/matrix_wrapper.h" +#include "gpu/mblas/tensor_functions.h" +#include "gpu/mblas/tensor_wrapper.h" #include "gpu/mblas/handles.h" #include "gpu/dl4mt/cell.h" #include "cellstate.h" diff --git a/src/amun/gpu/mblas/nth_element.cu b/src/amun/gpu/mblas/nth_element.cu index f7c221de..2f979169 100644 --- a/src/amun/gpu/mblas/nth_element.cu +++ b/src/amun/gpu/mblas/nth_element.cu @@ -1,9 +1,9 @@ #include <iostream> #include "common/utils.h" -#include "matrix_wrapper.h" +#include "tensor_wrapper.h" #include "vector_wrapper.h" #include "nth_element.h" -#include "matrix_functions.h" +#include "tensor_functions.h" using namespace std; diff --git a/src/amun/gpu/mblas/nth_element.h b/src/amun/gpu/mblas/nth_element.h index e0f7be21..5cc9a9d8 100644 --- a/src/amun/gpu/mblas/nth_element.h +++ b/src/amun/gpu/mblas/nth_element.h @@ -4,7 +4,7 @@ #include <algorithm> #include <cuda.h> -#include "gpu/mblas/matrix.h" +#include "gpu/mblas/tensor.h" #include "gpu/mblas/vector.h" #include "nth_element_kernels.h" diff --git a/src/amun/gpu/mblas/nth_element_kernels.h b/src/amun/gpu/mblas/nth_element_kernels.h index 094f6181..1be357e0 100644 --- a/src/amun/gpu/mblas/nth_element_kernels.h +++ b/src/amun/gpu/mblas/nth_element_kernels.h @@ -1,6 +1,6 @@ #pragma once -#include "matrix_wrapper.h" +#include "tensor_wrapper.h" #include "vector_wrapper.h" namespace amunmt { @@ -47,7 +47,7 @@ struct NthOutBatch __device__ __host__ NthOutBatch(const float& rhs) { - // only to be used to init variable in matrix.h gSum + // only to be used to init variable in tensor.h gSum assert(rhs == 0.0f); ind = rhs; score = rhs; diff --git a/src/amun/gpu/mblas/matrix.cu b/src/amun/gpu/mblas/tensor.cu index 98946daa..303dce1c 100644 --- a/src/amun/gpu/mblas/matrix.cu +++ b/src/amun/gpu/mblas/tensor.cu @@ -1,4 +1,4 @@ -#include "matrix.h" +#include "tensor.h" using namespace std; diff --git a/src/amun/gpu/mblas/matrix.h b/src/amun/gpu/mblas/tensor.h index 90b9a636..90b9a636 100644 --- a/src/amun/gpu/mblas/matrix.h +++ b/src/amun/gpu/mblas/tensor.h diff --git a/src/amun/gpu/mblas/matrix_functions.cu b/src/amun/gpu/mblas/tensor_functions.cu index 82f8dbff..aada422c 100644 --- a/src/amun/gpu/mblas/matrix_functions.cu +++ b/src/amun/gpu/mblas/tensor_functions.cu @@ -1,4 +1,4 @@ -#include "gpu/mblas/matrix_functions.h" +#include "gpu/mblas/tensor_functions.h" #include "gpu/mblas/handles.h" using namespace std; diff --git a/src/amun/gpu/mblas/matrix_functions.h b/src/amun/gpu/mblas/tensor_functions.h index 55e86955..720f811b 100644 --- a/src/amun/gpu/mblas/matrix_functions.h +++ b/src/amun/gpu/mblas/tensor_functions.h @@ -10,8 +10,8 @@ #include <iostream> #include "gpu/mblas/thrust_functions.h" -#include "gpu/mblas/matrix.h" -#include "gpu/mblas/matrix_wrapper.h" +#include "gpu/mblas/tensor.h" +#include "gpu/mblas/tensor_wrapper.h" #include "gpu/mblas/handles.h" #include "gpu/mblas/nth_element_kernels.h" #include "gpu/mblas/vector_wrapper.h" diff --git a/src/amun/gpu/mblas/matrix_wrapper.h b/src/amun/gpu/mblas/tensor_wrapper.h index c2c6917e..4dff4bc7 100644 --- a/src/amun/gpu/mblas/matrix_wrapper.h +++ b/src/amun/gpu/mblas/tensor_wrapper.h @@ -1,5 +1,5 @@ #pragma once -#include "matrix.h" +#include "tensor.h" #include "vector_wrapper.h" namespace amunmt { diff --git a/src/amun/gpu/mblas/vector_wrapper.h b/src/amun/gpu/mblas/vector_wrapper.h index 98ccfb85..15cce201 100644 --- a/src/amun/gpu/mblas/vector_wrapper.h +++ b/src/amun/gpu/mblas/vector_wrapper.h @@ -1,6 +1,6 @@ #pragma once #include <sstream> -#include "matrix.h" +#include "tensor.h" #include "gpu/mblas/vector.h" namespace amunmt { diff --git a/src/amun/gpu/npz_converter.cu b/src/amun/gpu/npz_converter.cu index d5385242..c808ad32 100644 --- a/src/amun/gpu/npz_converter.cu +++ b/src/amun/gpu/npz_converter.cu @@ -1,6 +1,6 @@ #include "npz_converter.h" #include "common/exception.h" -#include "mblas/matrix_functions.h" +#include "mblas/tensor_functions.h" using namespace std; diff --git a/src/amun/gpu/npz_converter.h b/src/amun/gpu/npz_converter.h index 1a27b125..074c66a1 100644 --- a/src/amun/gpu/npz_converter.h +++ b/src/amun/gpu/npz_converter.h @@ -1,7 +1,7 @@ #pragma once #include "cnpy/cnpy.h" -#include "mblas/matrix_functions.h" +#include "mblas/tensor_functions.h" namespace amunmt { namespace GPU { |