diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-11-24 09:55:30 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-11-24 09:55:30 +0000 |
commit | fa3c453250d5edaa15f37cf64cd3b770d31118cc (patch) | |
tree | dc984158f54cda7984b4ae643ca85646aa60f981 /eval | |
parent | 40db608f734b3d56e4806e1bf44e608e824de5f2 (diff) |
cblas may need initialized memory
Diffstat (limited to 'eval')
4 files changed, 7 insertions, 7 deletions
diff --git a/eval/src/vespa/eval/instruction/dense_matmul_function.cpp b/eval/src/vespa/eval/instruction/dense_matmul_function.cpp index a70f7ef3518..5d4ebb88931 100644 --- a/eval/src/vespa/eval/instruction/dense_matmul_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_matmul_function.cpp @@ -51,7 +51,7 @@ void my_cblas_double_matmul_op(InterpretedFunction::State &state, uint64_t param const DenseMatMulFunction::Self &self = unwrap_param<DenseMatMulFunction::Self>(param); auto lhs_cells = state.peek(1).cells().typify<double>(); auto rhs_cells = state.peek(0).cells().typify<double>(); - auto dst_cells = state.stash.create_uninitialized_array<double>(self.lhs_size * self.rhs_size); + auto dst_cells = state.stash.create_array<double>(self.lhs_size * self.rhs_size); cblas_dgemm(CblasRowMajor, lhs_common_inner ? CblasNoTrans : CblasTrans, rhs_common_inner ? CblasTrans : CblasNoTrans, self.lhs_size, self.rhs_size, self.common_size, 1.0, lhs_cells.cbegin(), lhs_common_inner ? self.common_size : self.lhs_size, @@ -65,7 +65,7 @@ void my_cblas_float_matmul_op(InterpretedFunction::State &state, uint64_t param) const DenseMatMulFunction::Self &self = unwrap_param<DenseMatMulFunction::Self>(param); auto lhs_cells = state.peek(1).cells().typify<float>(); auto rhs_cells = state.peek(0).cells().typify<float>(); - auto dst_cells = state.stash.create_uninitialized_array<float>(self.lhs_size * self.rhs_size); + auto dst_cells = state.stash.create_array<float>(self.lhs_size * self.rhs_size); cblas_sgemm(CblasRowMajor, lhs_common_inner ? CblasNoTrans : CblasTrans, rhs_common_inner ? CblasTrans : CblasNoTrans, self.lhs_size, self.rhs_size, self.common_size, 1.0, lhs_cells.cbegin(), lhs_common_inner ? self.common_size : self.lhs_size, diff --git a/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp b/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp index 04da12af19a..42e7deb9523 100644 --- a/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_multi_matmul_function.cpp @@ -27,7 +27,7 @@ void my_cblas_double_multi_matmul_op(InterpretedFunction::State &state, uint64_t size_t num_blocks = self.matmul_cnt(); const CT *lhs = state.peek(1).cells().typify<CT>().cbegin(); const CT *rhs = state.peek(0).cells().typify<CT>().cbegin(); - auto dst_cells = state.stash.create_uninitialized_array<CT>(dst_block_size * num_blocks); + auto dst_cells = state.stash.create_array<CT>(dst_block_size * num_blocks); CT *dst = dst_cells.begin(); for (size_t i = 0; i < num_blocks; ++i, lhs += lhs_block_size, rhs += rhs_block_size, dst += dst_block_size) { cblas_dgemm(CblasRowMajor, self.lhs_common_inner() ? CblasNoTrans : CblasTrans, self.rhs_common_inner() ? CblasTrans : CblasNoTrans, @@ -48,7 +48,7 @@ void my_cblas_float_multi_matmul_op(InterpretedFunction::State &state, uint64_t size_t num_blocks = self.matmul_cnt(); const CT *lhs = state.peek(1).cells().typify<CT>().cbegin(); const CT *rhs = state.peek(0).cells().typify<CT>().cbegin(); - auto dst_cells = state.stash.create_uninitialized_array<CT>(dst_block_size * num_blocks); + auto dst_cells = state.stash.create_array<CT>(dst_block_size * num_blocks); CT *dst = dst_cells.begin(); for (size_t i = 0; i < num_blocks; ++i, lhs += lhs_block_size, rhs += rhs_block_size, dst += dst_block_size) { cblas_sgemm(CblasRowMajor, self.lhs_common_inner() ? CblasNoTrans : CblasTrans, self.rhs_common_inner() ? CblasTrans : CblasNoTrans, diff --git a/eval/src/vespa/eval/instruction/dense_simple_expand_function.cpp b/eval/src/vespa/eval/instruction/dense_simple_expand_function.cpp index c3bc1fe62d6..d0318d371f5 100644 --- a/eval/src/vespa/eval/instruction/dense_simple_expand_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_simple_expand_function.cpp @@ -43,7 +43,7 @@ void my_simple_expand_op(State &state, uint64_t param) { OP my_op(params.function); auto inner_cells = state.peek(rhs_inner ? 0 : 1).cells().typify<ICT>(); auto outer_cells = state.peek(rhs_inner ? 1 : 0).cells().typify<OCT>(); - auto dst_cells = state.stash.create_uninitialized_array<DCT>(params.result_size); + auto dst_cells = state.stash.create_array<DCT>(params.result_size); DCT *dst = dst_cells.begin(); for (OCT outer_cell: outer_cells) { apply_op2_vec_num(dst, inner_cells.begin(), outer_cell, inner_cells.size(), my_op); diff --git a/eval/src/vespa/eval/instruction/dense_xw_product_function.cpp b/eval/src/vespa/eval/instruction/dense_xw_product_function.cpp index d5c512ad477..44332bbacee 100644 --- a/eval/src/vespa/eval/instruction/dense_xw_product_function.cpp +++ b/eval/src/vespa/eval/instruction/dense_xw_product_function.cpp @@ -48,7 +48,7 @@ void my_cblas_double_xw_product_op(InterpretedFunction::State &state, uint64_t p const DenseXWProductFunction::Self &self = unwrap_param<DenseXWProductFunction::Self>(param); auto vector_cells = state.peek(1).cells().typify<double>(); auto matrix_cells = state.peek(0).cells().typify<double>(); - auto dst_cells = state.stash.create_uninitialized_array<double>(self.result_size); + auto dst_cells = state.stash.create_array<double>(self.result_size); cblas_dgemv(CblasRowMajor, common_inner ? CblasNoTrans : CblasTrans, common_inner ? self.result_size : self.vector_size, common_inner ? self.vector_size : self.result_size, @@ -62,7 +62,7 @@ void my_cblas_float_xw_product_op(InterpretedFunction::State &state, uint64_t pa const DenseXWProductFunction::Self &self = unwrap_param<DenseXWProductFunction::Self>(param); auto vector_cells = state.peek(1).cells().typify<float>(); auto matrix_cells = state.peek(0).cells().typify<float>(); - auto dst_cells = state.stash.create_uninitialized_array<float>(self.result_size); + auto dst_cells = state.stash.create_array<float>(self.result_size); cblas_sgemv(CblasRowMajor, common_inner ? CblasNoTrans : CblasTrans, common_inner ? self.result_size : self.vector_size, common_inner ? self.vector_size : self.result_size, |