* libnd4j added optional alpha and beta support to matmul Signed-off-by: Oleg <oleg.semeniv@gmail.com> * libnd4j typos fixes Signed-off-by: Oleg <oleg.semeniv@gmail.com> * libnd4j add optional alpha and beta to matmul_bp Signed-off-by: Oleg <oleg.semeniv@gmail.com> * libnd4j one more typo fix Signed-off-by: Oleg <oleg.semeniv@gmail.com> * libnd4j added optional alpha and beta to mkl implementation Signed-off-by: Oleg <oleg.semeniv@gmail.com> * MatMul alpha/beta on java side Signed-off-by: raver119 <raver119@gmail.com> * alpha/beta fix in libnd4j Signed-off-by: raver119 <raver119@gmail.com> * alpha/beta fix in matmul_bp Signed-off-by: raver119 <raver119@gmail.com> * restored view validation Signed-off-by: raver119 <raver119@gmail.com> * gemv/gemm now use MatMul op Signed-off-by: raver119 <raver119@gmail.com> * few tests fixed Signed-off-by: raver119 <raver119@gmail.com> * additional INDArray.mmul signature Signed-off-by: raver119 <raver119@gmail.com> * make C order default for INDArray.mmul, unless both A/B have F order Signed-off-by: raver119 <raver119@gmail.com> * Nd4j.gemm validation fix Signed-off-by: raver119 <raver119@gmail.com> * disable mkldnn matmul for xxf with beta != 0 case Signed-off-by: raver119 <raver119@gmail.com> * SimpleRnn workspace fix + timeouts Signed-off-by: Alex Black <blacka101@gmail.com> * two more tests + minor fix in matmul platform check Signed-off-by: raver119 <raver119@gmail.com> * Flaky test fixes Signed-off-by: Alex Black <blacka101@gmail.com> * propagate testresources profile Signed-off-by: raver119 <raver119@gmail.com> * Resources fix + flaky test fix Signed-off-by: Alex Black <blacka101@gmail.com> Co-authored-by: Oleg <oleg.semeniv@gmail.com> Co-authored-by: Alex Black <blacka101@gmail.com>
169 lines
4.8 KiB
C++
169 lines
4.8 KiB
C++
/*******************************************************************************
|
|
* Copyright (c) 2015-2019 Skymind, Inc.
|
|
*
|
|
* This program and the accompanying materials are made available under the
|
|
* terms of the Apache License, Version 2.0 which is available at
|
|
* https://www.apache.org/licenses/LICENSE-2.0.
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
******************************************************************************/
|
|
|
|
|
|
//
|
|
// @author raver119@gmail.com
|
|
//
|
|
|
|
#include "testlayers.h"
|
|
#include <ops/declarable/CustomOperations.h>
|
|
#include <array/NDArray.h>
|
|
#include <ops/ops.h>
|
|
#include <helpers/GradCheck.h>
|
|
#include <array>
|
|
|
|
|
|
using namespace sd;
|
|
|
|
|
|
class DeclarableOpsTests19 : public testing::Test {
|
|
public:
|
|
|
|
DeclarableOpsTests19() {
|
|
printf("\n");
|
|
fflush(stdout);
|
|
}
|
|
};
|
|
|
|
TEST_F(DeclarableOpsTests19, test_matmul_ccc) {
|
|
auto x = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto y = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto e = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto z = NDArrayFactory::create<float>('c', {10, 10});
|
|
|
|
z.assign(100.f);
|
|
e.assign(110.f);
|
|
x.assign(1.0f);
|
|
y.assign(1.0f);
|
|
|
|
sd::ops::matmul op;
|
|
auto status = op.execute({&x, &y}, {&z}, {1.0, 1.0});
|
|
ASSERT_EQ(Status::OK(), status);
|
|
|
|
ASSERT_EQ(e, z);
|
|
}
|
|
|
|
TEST_F(DeclarableOpsTests19, test_matmul_fcf) {
|
|
auto x = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto y = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto e = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto z = NDArrayFactory::create<float>('f', {10, 10});
|
|
|
|
z.assign(100.f);
|
|
e.assign(110.f);
|
|
x.assign(1.0f);
|
|
y.assign(1.0f);
|
|
|
|
sd::ops::matmul op;
|
|
auto status = op.execute({&x, &y}, {&z}, {1.0, 1.0});
|
|
ASSERT_EQ(Status::OK(), status);
|
|
|
|
ASSERT_EQ(e, z);
|
|
}
|
|
|
|
TEST_F(DeclarableOpsTests19, test_matmul_cff) {
|
|
auto x = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto y = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto e = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto z = NDArrayFactory::create<float>('f', {10, 10});
|
|
|
|
z.assign(100.f);
|
|
e.assign(110.f);
|
|
x.assign(1.0f);
|
|
y.assign(1.0f);
|
|
|
|
sd::ops::matmul op;
|
|
auto status = op.execute({&x, &y}, {&z}, {1.0, 1.0});
|
|
ASSERT_EQ(Status::OK(), status);
|
|
|
|
ASSERT_EQ(e, z);
|
|
}
|
|
|
|
|
|
TEST_F(DeclarableOpsTests19, test_matmul_ccf) {
|
|
auto x = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto y = NDArrayFactory::create<float>('c', {10, 10});
|
|
auto e = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto z = NDArrayFactory::create<float>('f', {10, 10});
|
|
|
|
z.assign(100.f);
|
|
e.assign(110.f);
|
|
x.assign(1.0f);
|
|
y.assign(1.0f);
|
|
|
|
sd::ops::matmul op;
|
|
auto status = op.execute({&x, &y}, {&z}, {1.0, 1.0});
|
|
ASSERT_EQ(Status::OK(), status);
|
|
|
|
ASSERT_EQ(e, z);
|
|
}
|
|
|
|
TEST_F(DeclarableOpsTests19, test_matmul_fff) {
|
|
auto x = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto y = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto e = NDArrayFactory::create<float>('f', {10, 10});
|
|
auto z = NDArrayFactory::create<float>('f', {10, 10});
|
|
|
|
z.assign(100.f);
|
|
e.assign(110.f);
|
|
x.assign(1.0f);
|
|
y.assign(1.0f);
|
|
|
|
sd::ops::matmul op;
|
|
auto status = op.execute({&x, &y}, {&z}, {1.0, 1.0});
|
|
ASSERT_EQ(Status::OK(), status);
|
|
|
|
ASSERT_EQ(e, z);
|
|
}
|
|
|
|
TEST_F(DeclarableOpsTests19, test_conv1d_bp_1) {
|
|
/*
|
|
DynamicCustomOp op = DynamicCustomOp.builder("conv1d_bp")
|
|
.addInputs(
|
|
Nd4j.create(DataType.FLOAT, 2,2,12),
|
|
Nd4j.create(DataType.FLOAT, 3,2,3),
|
|
Nd4j.create(DataType.FLOAT, 2,3,6)
|
|
)
|
|
.addOutputs(
|
|
Nd4j.create(DataType.FLOAT, 2,2,12),
|
|
Nd4j.create(DataType.FLOAT, 3,2,3))
|
|
.addIntegerArguments(3,2,0,1,2,0)
|
|
.build();
|
|
|
|
Nd4j.exec(op);
|
|
*/
|
|
|
|
auto t = NDArrayFactory::create<float>('c', {2, 2, 12});
|
|
auto u = NDArrayFactory::create<float>('c', {3, 2, 3});
|
|
auto v = NDArrayFactory::create<float>('c', {2, 3, 6});
|
|
|
|
sd::ops::conv1d_bp op;
|
|
auto result = op.evaluate({&t, &u, &v}, {3, 2, 0, 1, 2,0});
|
|
ASSERT_EQ(Status::OK(), result.status());
|
|
|
|
}
|
|
|
|
TEST_F(DeclarableOpsTests19, test_squeeze_1) {
|
|
auto x = NDArrayFactory::create<double>('c', {3, 4, 1});
|
|
auto e = NDArrayFactory::create<double>('c', {3, 4});
|
|
int axis = 2;
|
|
|
|
sd::ops::squeeze op;
|
|
auto status = op.execute({&x}, {&e}, {axis});
|
|
ASSERT_EQ(Status::OK(), status);
|
|
}
|