2019-06-06 14:21:15 +02:00
|
|
|
/*******************************************************************************
|
|
|
|
* Copyright (c) 2015-2018 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 <helpers/ShapeBuilders.h>
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
namespace sd {
|
2019-06-06 14:21:15 +02:00
|
|
|
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::createScalarShapeInfo(const sd::DataType dataType, sd::memory::Workspace* workspace) {
|
2019-06-06 14:21:15 +02:00
|
|
|
Nd4jLong *newShape;
|
|
|
|
ALLOCATE(newShape, workspace, shape::shapeInfoLength(0), Nd4jLong);
|
|
|
|
newShape[0] = 0;
|
|
|
|
newShape[1] = 0;
|
|
|
|
newShape[2] = 1;
|
|
|
|
newShape[3] = 99;
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
sd::ArrayOptions::setDataType(newShape, dataType);
|
2019-06-06 14:21:15 +02:00
|
|
|
|
|
|
|
return newShape;
|
|
|
|
}
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::createVectorShapeInfo(const sd::DataType dataType, const Nd4jLong length, sd::memory::Workspace* workspace) {
|
2019-06-06 14:21:15 +02:00
|
|
|
Nd4jLong *newShape;
|
|
|
|
ALLOCATE(newShape, workspace, shape::shapeInfoLength(1), Nd4jLong);
|
|
|
|
|
|
|
|
newShape[0] = 1;
|
|
|
|
newShape[1] = length;
|
|
|
|
newShape[2] = 1;
|
|
|
|
newShape[3] = 0;
|
|
|
|
newShape[4] = 1;
|
|
|
|
newShape[5] = 99;
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
sd::ArrayOptions::setDataType(newShape, dataType);
|
2019-06-06 14:21:15 +02:00
|
|
|
|
|
|
|
return newShape;
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::createShapeInfo(const sd::DataType dataType, const char order, int rank, const Nd4jLong* shapeOnly, memory::Workspace* workspace) {
|
2019-06-06 14:21:15 +02:00
|
|
|
Nd4jLong* shapeInfo = nullptr;
|
|
|
|
|
|
|
|
if(rank == 0) { // scalar case
|
|
|
|
shapeInfo = ShapeBuilders::createScalarShapeInfo(dataType, workspace);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ALLOCATE(shapeInfo, workspace, shape::shapeInfoLength(rank), Nd4jLong);
|
|
|
|
shapeInfo[0] = rank;
|
2019-06-15 13:34:34 +02:00
|
|
|
bool isEmpty = false;
|
|
|
|
for(int i = 0; i < rank; ++i) {
|
2019-06-06 14:21:15 +02:00
|
|
|
shapeInfo[i + 1] = shapeOnly[i];
|
|
|
|
|
2019-06-15 13:34:34 +02:00
|
|
|
if (shapeOnly[i] == 0)
|
|
|
|
isEmpty = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!isEmpty) {
|
|
|
|
shape::updateStrides(shapeInfo, order);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
shapeInfo[shape::shapeInfoLength(rank) - 1] = order;
|
|
|
|
memset(shape::stride(shapeInfo), 0, rank * sizeof(Nd4jLong));
|
|
|
|
ArrayOptions::setPropertyBit(shapeInfo, ARRAY_EMPTY);
|
|
|
|
}
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
sd::ArrayOptions::setDataType(shapeInfo, dataType);
|
2019-06-06 14:21:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return shapeInfo;
|
|
|
|
}
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::emptyShapeInfo(const sd::DataType dataType, memory::Workspace* workspace) {
|
2019-06-15 13:34:34 +02:00
|
|
|
auto shapeInfo = createScalarShapeInfo(dataType, workspace);
|
|
|
|
ArrayOptions::setPropertyBit(shapeInfo, ARRAY_EMPTY);
|
|
|
|
return shapeInfo;
|
|
|
|
}
|
|
|
|
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::emptyShapeInfo(const sd::DataType dataType, const char order, const std::vector<Nd4jLong> &shape, memory::Workspace* workspace) {
|
2019-06-15 13:34:34 +02:00
|
|
|
auto shapeInfo = createShapeInfo(dataType, order, shape, workspace);
|
|
|
|
memset(shape::stride(shapeInfo), 0, shape.size() * sizeof(Nd4jLong));
|
|
|
|
ArrayOptions::setPropertyBit(shapeInfo, ARRAY_EMPTY);
|
|
|
|
return shapeInfo;
|
2019-06-06 14:21:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::createShapeInfo(const sd::DataType dataType, const char order, const std::vector<Nd4jLong>& shapeOnly, memory::Workspace* workspace) {
|
2019-06-06 14:21:15 +02:00
|
|
|
|
|
|
|
return ShapeBuilders::createShapeInfo(dataType, order, shapeOnly.size(), shapeOnly.data(), workspace);
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
2020-03-02 10:49:41 +01:00
|
|
|
Nd4jLong* ShapeBuilders::createShapeInfo(const sd::DataType dataType, const char order, const std::initializer_list<Nd4jLong>& shapeOnly, memory::Workspace* workspace) {
|
2019-06-06 14:21:15 +02:00
|
|
|
|
|
|
|
return ShapeBuilders::createShapeInfo(dataType, order, std::vector<Nd4jLong>(shapeOnly), workspace);
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
Nd4jLong* ShapeBuilders::copyShapeInfo(const Nd4jLong* inShapeInfo, const bool copyStrides, memory::Workspace* workspace) {
|
|
|
|
|
|
|
|
Nd4jLong *outShapeInfo = nullptr;
|
|
|
|
ALLOCATE(outShapeInfo, workspace, shape::shapeInfoLength(inShapeInfo), Nd4jLong);
|
|
|
|
|
|
|
|
memcpy(outShapeInfo, inShapeInfo, shape::shapeInfoByteLength(inShapeInfo));
|
|
|
|
|
|
|
|
if(!copyStrides)
|
|
|
|
shape::updateStrides(outShapeInfo, shape::order(outShapeInfo));
|
|
|
|
|
|
|
|
return outShapeInfo;
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
Nd4jLong* ShapeBuilders::copyShapeInfoAndType(const Nd4jLong* inShapeInfo, const DataType dtype, const bool copyStrides, memory::Workspace* workspace) {
|
|
|
|
|
|
|
|
Nd4jLong* outShapeInfo = ShapeBuilders::copyShapeInfo(inShapeInfo, copyStrides, workspace);
|
|
|
|
ArrayOptions::setDataType(outShapeInfo, dtype);
|
|
|
|
|
|
|
|
return outShapeInfo;
|
|
|
|
}
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
Nd4jLong* ShapeBuilders::copyShapeInfoAndType(const Nd4jLong* inShapeInfo, const Nd4jLong* shapeInfoToGetTypeFrom, const bool copyStrides, memory::Workspace* workspace) {
|
|
|
|
|
|
|
|
return ShapeBuilders::copyShapeInfoAndType(inShapeInfo, ArrayOptions::dataType(shapeInfoToGetTypeFrom), copyStrides, workspace);
|
|
|
|
}
|
|
|
|
|
Oleh tenzor mmul (#231)
* Libnd4j: TensorMMul backprop op #8174, raw implementation
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 merge master and some corrections
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 algorithm update, need testing, sync with master
* Libnd4j: TensorMMul backprop op #8174 fixed incorrect B axes calculation
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 optimize axes identification and fix bug of indeces overlapping, added first test. need testing with different shapes
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 some fixes and improvements need more testing
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 fixed order of matrix multiply
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 fixed issue of incorrect axes definition, add tests based on TF, need additional testing for case dLdC not equal 1
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 fixed scalar case add test
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 fixed bp algorithm, axes definition, need some mode testing with different orders combination f,c; c,f f,f and add some checks for inputs
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 some checks and corrections added tests, exists the problem with different input orders support A-f B-c and A-f B-f
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* Libnd4j: TensorMMul backprop op #8174 sync master
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* - correct bug in MmulHelper::tensorDot(a, b, c, axes_a, axes_b,permutForC)
Signed-off-by: Yurii <iuriish@yahoo.com>
* Libnd4j: TensorMMul backprop op #8174 code clean up and refactoring
Signed-off-by: Oleg <oleg.semeniv@gmail.com>
* - add check for linspase ordered permutations in ShapeUtils::evalShapeForTensorDot
Signed-off-by: Yurii <iuriish@yahoo.com>
* - provide additional code in shape::reshape stuff in order to reduce amount of allocation/copy operations during reshaping procedure
Signed-off-by: Yurii <iuriish@yahoo.com>
* - further work on problem of wrong shape evaluation during permute/reshape procedures
Signed-off-by: Yurii <iuriish@yahoo.com>
* - still looking for bug reason in reshape/permute stuff
Signed-off-by: Yurii <iuriish@yahoo.com>
* - correct bug in transform cuda native ops
Signed-off-by: Yurii <iuriish@yahoo.com>
* - correct bug in NDArray::assign
Signed-off-by: Yurii <iuriish@yahoo.com>
* - remove old shape::reshape stuff
Signed-off-by: Yurii <iuriish@yahoo.com>
* - add possibility to disable copy of old buffer to new buffer during reshape operation in NDArray class
Signed-off-by: Yurii <iuriish@yahoo.com>
* - correct bug in tensorDot which had to do with wrong pointers assigments
Signed-off-by: Yurii <iuriish@yahoo.com>
Co-authored-by: Oleh <oleg.semeniv@gmail.com>
2020-02-13 18:33:54 +01:00
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
Nd4jLong* ShapeBuilders::copyShapeInfoWithoutUnites(const Nd4jLong* inShapeInfo, const int dimsSize, const int* dimsToExclude, memory::Workspace* workspace) {
|
|
|
|
|
|
|
|
Nd4jLong *outShapeInfo = nullptr;
|
|
|
|
ALLOCATE(outShapeInfo, workspace, shape::shapeInfoLength(inShapeInfo[0] - dimsSize), Nd4jLong);
|
|
|
|
|
|
|
|
shape::excludeUnitiesFromShapeInfo(inShapeInfo, dimsSize, dimsToExclude, outShapeInfo);
|
|
|
|
|
|
|
|
return outShapeInfo;
|
|
|
|
}
|
2019-06-06 14:21:15 +02:00
|
|
|
|
|
|
|
}
|