* correct logsoftmax looss (#2) * Small SameDiff listener fix (#4) * Various fixes (#6) * #7839 Fix for asXMatrix and tests * #7866 EmbeddingSequenceLayer dtype fix + test * #7856 SameDiff save/load stream methods * #7859 RegressionEvaluation rank 4 fix + tests + axis configuration * EvaluationBinary 3d/4d * More evaluation 3d/4d tests * #7847 Evaluation empty checks * Small test ifx * #7848 Fix median edge case * Improve DL4J samediff layer tests * [WIP] FastText wrapper implemented (#8) * FastText implemented * Some fixes * Fix shapes for wordsNearest * Validation of input vectors * Fixes * Fixed test * Thread tagged * Some tweaks * setContextClassLoader for DeallocatorServiceThread * Numpy format tests (#1) * Various fixes (#11) * #7852 SameDiff gather fix * #7892 SameDiff placeholder to constant conversion * #7890 validate input rank for MLN/CG init methods * Fix broken permute shape calculation * Permute and gather fixes * Tests * #7850 LogSumExp fix + test * Handful of test fixes * Empty arrays with non-scalar shapes (#10) * minor rearrangements for lambdas * empty tensors with non-scalar shapes * numpy empty tensors with non-scalar shapes * few more empty tweaks * Small fixes * conv3d signature update * micro fix in batchnorm mkldnn * Import fixes * Fix * MKL-DNN update * Small fill fix * fill with empty input + test * Fixes * Small error improvement * Fix * one special test * couple of fixes for lstm * Rewrite TFGraphMapper.getNDArrayFromTensor to be maintainable and less error prone * Fixes * FP16 * Unsigned * BFloat16 * Fill op - empty tweaks * - couple of fixes for empty arrays construction - stack updated * strided slice fix * one transform test * provide method for reducing shapeInfo in case of input array is empty * Fixed reduceAlongDimensions to use empty input properly. * couple of broadcast tests * couple of tests broadcast tests + tweak to make them pass * add check of non-empty to methods producing sub-arrays * Fixed reshapeC with zeros in shape. * complete empty check in reduce_... legacy ops * Concat and cumsum/prod * Tweak to empty shape inference on import * add empty check to the rest of reduce legacy ops * one more test * correct typo in evalReduceShapeInfoEmpty * Added tests for reduce_* ops to tests with zero shapes. * few more tests for empty reductions * Fixed strided_slice op with empty case and tests. * one more empty reduction test * Fixed strided_slice test. * add empty check to NDArray::reshapei * infOrMax * empty min/max with infinity tests * made unstack working correctly with empty arrays * few IndexReduce tests + tweaks for empty shapes * add test for empty concat * few tests fixed * Validation fix for reductions on empty shapes * Reverse fix * Reduction shape calc fixes * SameDiff.generateOutputVariable: don't use shape function to determine number of outputs * Range fix * - NDArray constructor updated for scalars/empty arrays - few tests fixed * More fixes * Empty creator fixes * concat fix * concat fix * TF import tests: allow 'both all NaN' and 'both all inf' to pass * Slice, zero fraction, and reshape fixes * transpose, gather * Zero fraction * scalar cast fix * Empty reduction axis support * few more tests fixed * Fixed input checks conforming with TF for concat op and tests. * few tests fixed * matmul scalar shape fix * Fixed checkout for data type and scalarity with concat to allow non-empty scalars with vector concats. * broadcast bool fix * few more tests * few more tests * correct evalReduceShapeInfoEmpty * argmax/argmin + tests * one more empty edge case + one more test * argmax/argmin/realdiv_bp tweaks * empty reshape test + fix * Helper fixes * Small fixes * Gather test fix * Gather test fix * Small fixes * reduce scalar zero values * scalar mean workaround * Remove debug code * along dim mean workaround * one more test * - equalsTo() tweak for empty arrays - one more test * broadcast tweaks
98 lines
3.2 KiB
C++
98 lines
3.2 KiB
C++
/*******************************************************************************
|
|
* 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 <op_boilerplate.h>
|
|
#if NOT_EXCLUDED(OP_fill)
|
|
|
|
#include <ops/declarable/headers/parity_ops.h>
|
|
|
|
namespace nd4j {
|
|
namespace ops {
|
|
|
|
CUSTOM_OP_IMPL(fill, 1, 1, false, -2, 0) {
|
|
auto shapeArray = INPUT_VARIABLE(0);
|
|
auto output = OUTPUT_VARIABLE(0);
|
|
|
|
auto w = block.width();
|
|
auto i = block.numI();
|
|
auto t = block.numT();
|
|
|
|
REQUIRE_TRUE( w > 1 || t > 0 || i > 0, 0, "Fill: either additional variable should exist, or scalar value should be present");
|
|
|
|
if(output->isEmpty()){
|
|
//Empty output array - no-op
|
|
return Status::OK();
|
|
}
|
|
|
|
if (w > 1) {
|
|
output->assign(INPUT_VARIABLE(1));
|
|
} else {
|
|
if (t > 0) {
|
|
output->assign(T_ARG(0));
|
|
} else if (i > 0) {
|
|
output->assign(INT_ARG(0));
|
|
}
|
|
}
|
|
|
|
STORE_RESULT(output);
|
|
|
|
return Status::OK();
|
|
};
|
|
|
|
DECLARE_TYPES(fill) {
|
|
getOpDescriptor()
|
|
->setAllowedInputTypes(0, {ALL_INTS})
|
|
->setAllowedInputTypes(1, {ALL_INTS, ALL_FLOATS})
|
|
->setAllowedOutputTypes({ALL_INTS, ALL_FLOATS});
|
|
}
|
|
|
|
DECLARE_SHAPE_FN(fill) {
|
|
|
|
auto shapeArray = INPUT_VARIABLE(0);
|
|
const int len = (int) shapeArray->lengthOf();
|
|
Nd4jLong *newShape = nullptr;
|
|
ALLOCATE(newShape, block.getWorkspace(), shape::shapeInfoLength(len), Nd4jLong);
|
|
|
|
newShape[0] = len;
|
|
for (int e = 0; e < shapeArray->lengthOf(); e++){
|
|
newShape[e+1] = shapeArray->e<Nd4jLong>(e);
|
|
}
|
|
|
|
nd4j::DataType dataType;
|
|
|
|
if (block.width() > 1) {
|
|
dataType = INPUT_VARIABLE(1)->dataType();
|
|
} else if (block.numT() > 0) {
|
|
dataType = Environment::getInstance()->defaultFloatDataType();
|
|
} else if (block.numI() > 0) {
|
|
dataType = nd4j::DataType::INT32;
|
|
} else if (block.numB() > 0) {
|
|
dataType = nd4j::DataType::BOOL;
|
|
} else
|
|
throw std::runtime_error("Fill: missing value to fill output array with");
|
|
|
|
ShapeUtils::updateStridesAndType(newShape, dataType, 'c');
|
|
|
|
return SHAPELIST(CONSTANT(newShape));
|
|
};
|
|
}
|
|
}
|
|
|
|
#endif |