diff --git a/libnd4j/include/ops/declarable/generic/parity_ops/image_resize.cpp b/libnd4j/include/ops/declarable/generic/parity_ops/image_resize.cpp new file mode 100644 index 000000000..cf26b69b3 --- /dev/null +++ b/libnd4j/include/ops/declarable/generic/parity_ops/image_resize.cpp @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (c) 2019 Konduit K.K. + * + * 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 sgazeos@gmail.com +// + +#include +#if NOT_EXCLUDED(OP_image_resize) + +#include +#include + +namespace nd4j { + namespace ops { + CUSTOM_OP_IMPL(image_resize, 2, 1, false, 0, 0) { + + auto image = INPUT_VARIABLE(0); + auto size = INPUT_VARIABLE(1); + + auto output = OUTPUT_VARIABLE(0); + int width; + int height; + bool preserveAspectRatio = false; // - default value + bool antialias = false; + REQUIRE_TRUE(size->lengthOf() == 2, 0, "resize_bilinear: Resize params is a pair of values, not %lld.", size->lengthOf()); + width = size->e(0); + height = size->e(1); + if (block.getBArguments()->size()) { + preserveAspectRatio = B_ARG(0); + if (block.getBArguments()->size() > 1) + antialias = B_ARG(1); + } + + auto method = helpers::ImageResizeMethods::kResizeBilinear; + if (block.numI() == 1) { + method = (helpers::ImageResizeMethods)INT_ARG(0); + } + + return helpers::resizeFunctor(block.launchContext(), image, width, height, method, preserveAspectRatio, antialias, output); + } + + DECLARE_SHAPE_FN(image_resize) { + auto shapeList = SHAPELIST(); + auto in = inputShape->at(0); + + Nd4jLong* outputShape; + + int width; + int height; + auto newImageSize = INPUT_VARIABLE(1); + REQUIRE_TRUE(newImageSize->lengthOf() == 2, 0, "resize_bilinear: Resize params is a pair of values, not %i.", newImageSize->lengthOf()); + REQUIRE_TRUE(block.numI() <= 1, 0, "resize_bilinear: Resize params already given by the second param. Int params are expensive."); + width = newImageSize->e(0); + height = newImageSize->e(1); + + ALLOCATE(outputShape, block.getWorkspace(), shape::shapeInfoLength(4), Nd4jLong); + outputShape[0] = 4; + outputShape[1] = in[1]; + outputShape[2] = width; + outputShape[3] = height; + outputShape[4] = in[4]; + ShapeUtils::updateStridesAndType(outputShape, in, shape::order(in)); + + shapeList->push_back(CONSTANT(outputShape)); + return shapeList; + } + DECLARE_TYPES(image_resize) { + getOpDescriptor() + ->setAllowedInputTypes(0, {ALL_FLOATS}) + ->setAllowedInputTypes(1, {ALL_INTS}) + ->setAllowedOutputTypes({ALL_FLOATS}); + } + + } +} + +#endif \ No newline at end of file diff --git a/libnd4j/include/ops/declarable/generic/parity_ops/resize_bicubic.cpp b/libnd4j/include/ops/declarable/generic/parity_ops/resize_bicubic.cpp new file mode 100644 index 000000000..7a64ce879 --- /dev/null +++ b/libnd4j/include/ops/declarable/generic/parity_ops/resize_bicubic.cpp @@ -0,0 +1,93 @@ +/******************************************************************************* + * Copyright (c) 2019 Konduit K.K. + * + * 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 sgazeos@gmail.com +// + +#include +#if NOT_EXCLUDED(OP_resize_bicubic) + +#include +#include + +namespace nd4j { + namespace ops { + CUSTOM_OP_IMPL(resize_bicubic, 2, 1, false, 0, 0) { + + auto image = INPUT_VARIABLE(0); + auto size = INPUT_VARIABLE(1); + + auto output = OUTPUT_VARIABLE(0); + int width; + int height; + bool center = false; // - default value + + REQUIRE_TRUE(size->lengthOf() == 2, 0, "resize_bilinear: Resize params is a pair of values, not %i.", size->lengthOf()); + REQUIRE_TRUE(block.numI() <= 1, 0, "resize_bilinear: Resize params already given by the second param. Int params are expensive."); + width = size->e(0); + height = size->e(1); + auto method = 1; //kResizeBilinear; + if (block.numI() == 1) { + method = INT_ARG(0); + } + auto preserveAspectRatio = false; + auto antialias = false; + if (block.numB() > 0) { + preserveAspectRatio = block.getBArguments()->at(0); + if (block.numB()> 1) + antialias = block.getBArguments()->at(1); + } + + return helpers::resizeBicubicFunctor(block.launchContext(), image, width, height, preserveAspectRatio, antialias, output); + } + + DECLARE_SHAPE_FN(resize_bicubic) { + auto shapeList = SHAPELIST(); + auto in = inputShape->at(0); + + Nd4jLong* outputShape; + + int width; + int height; + auto newImageSize = INPUT_VARIABLE(1); + REQUIRE_TRUE(newImageSize->lengthOf() == 2, 0, "resize_bilinear: Resize params is a pair of values, not %i.", newImageSize->lengthOf()); + REQUIRE_TRUE(block.numI() <= 1, 0, "resize_bilinear: Resize params already given by the second param. Int params are expensive."); + width = newImageSize->e(0); + height = newImageSize->e(1); + + ALLOCATE(outputShape, block.getWorkspace(), shape::shapeInfoLength(4), Nd4jLong); + outputShape[0] = 4; + outputShape[1] = in[1]; + outputShape[2] = width; + outputShape[3] = height; + outputShape[4] = in[4]; + ShapeUtils::updateStridesAndType(outputShape, in, shape::order(in)); + + shapeList->push_back(CONSTANT(outputShape)); + return shapeList; + } + DECLARE_TYPES(resize_bicubic) { + getOpDescriptor() + ->setAllowedInputTypes(0, {ALL_FLOATS}) + ->setAllowedInputTypes(1, {ALL_INTS}) + ->setAllowedOutputTypes({ALL_FLOATS}); + } + + } +} + +#endif \ No newline at end of file diff --git a/libnd4j/include/ops/declarable/headers/parity_ops.h b/libnd4j/include/ops/declarable/headers/parity_ops.h index 590d99308..f6ed43f47 100644 --- a/libnd4j/include/ops/declarable/headers/parity_ops.h +++ b/libnd4j/include/ops/declarable/headers/parity_ops.h @@ -1,5 +1,6 @@ /******************************************************************************* * Copyright (c) 2015-2018 Skymind, Inc. + * Copyright (c) 2019 Konduit K.K. * * This program and the accompanying materials are made available under the * terms of the Apache License, Version 2.0 which is available at @@ -1594,7 +1595,7 @@ namespace nd4j { DECLARE_CUSTOM_OP(reduce_logsumexp, 1, 1, false, 0, 0); #endif - /** + /** * This op make bilinear or nearest neighbor interpolated resize for given tensor * * input array: @@ -1616,7 +1617,7 @@ namespace nd4j { DECLARE_CUSTOM_OP(crop_and_resize, 4, 1, false, -1, -1); #endif - /** + /** * This op make bilinear interpolated resize for given tensor * * input array: @@ -1637,7 +1638,7 @@ namespace nd4j { DECLARE_CUSTOM_OP(resize_bilinear, 1, 1, false, 0, -2); #endif - /** + /** * This op make nearest neighbor interpolated resize for given tensor * * input array: @@ -1649,7 +1650,7 @@ namespace nd4j { * 1 - new height * * output array: - * the 4D-Tensor with calculated backproped dots + * the 4D-Tensor with resized image (shape is {batch, newWidth, newHeight, channels}) * * CAUTION: either size tensor or a pair of int params should be provided. */ @@ -1658,21 +1659,57 @@ namespace nd4j { DECLARE_CUSTOM_OP(resize_nearest_neighbor, 1, 1, false, 0, -2); #endif - /** - * This op calculates backprop dot for two tensors along given dimensions + /** + * This op make bicubic interpolated resize for given tensor * * input array: - * x: tensor to calculate dot for - * y: tensor to calculate dot for - * z: tensor with gradient output of the FF dot for x and y - * - * int arguments: - * list of integers - dimensions to calculate dot along, - * default corresponds to empty list in which case calculation - * is performed for all dimensions and scalar is returned. + * 0 - 4D-Tensor with shape (batch, sizeX, sizeY, channels) + * 1 - 1D-Tensor with 2 values (newWidth, newHeight) * * output array: - * the tensor with calculated backproped dots + * the 4D-Tensor with resized image (shape is {batch, newWidth, newHeight, channels}) + * + */ + #if NOT_EXCLUDED(OP_resize_bicubic) + DECLARE_CUSTOM_OP(resize_bicubic, 1, 1, false, 0, -2); + #endif + + /** + * This op make interpolated resize for given tensor with given algorithm. + * Supported algorithms are bilinear, bicubic, nearest_neighbor. + * Need to implement to full compatibility with TF: lanczos5, gaussian, area and mitchellcubic + * + * input array: + * 0 - 4D-Tensor with shape (batch, sizeX, sizeY, channels) + * 1 - 1D-Tensor with 2 values (newWidth, newHeight) + * + * optional int args: + * 0 - algorithm - bilinear by default + * optional bool args: + * 0 - preserve_aspect_ratio - default False + * 1 - antialias - default False + * + * output array: + * the 4D-Tensor with resized by given algorithm image (shape is {batch, newWidth, newHeight, channels}) + * + */ + + #if NOT_EXCLUDED(OP_image_resize) + DECLARE_CUSTOM_OP(image_resize, 2, 1, false, 0, 0); + #endif + + /** + * Copy a tensor setting everything outside a central band in each innermost matrix + * + * input array: + * x: given tensor with shape {..., M, N} - as vector (matrix) of matricies MxN + * + * int arguments: + * lower band + * upper band + * + * output array: + * matrix with given bands between lower and upper diagonals * */ @@ -1684,7 +1721,8 @@ namespace nd4j { #if NOT_EXCLUDED(OP_Assert) DECLARE_OP(Assert, 1, 1, false); #endif - /* + + /** * image.non_max_suppression op. * input: * 0 - boxes - 2D-tensor with shape (num_boxes, 4) by float type diff --git a/libnd4j/include/ops/declarable/helpers/cpu/image_resize.cpp b/libnd4j/include/ops/declarable/helpers/cpu/image_resize.cpp index 11bc1ecaa..573eb371a 100644 --- a/libnd4j/include/ops/declarable/helpers/cpu/image_resize.cpp +++ b/libnd4j/include/ops/declarable/helpers/cpu/image_resize.cpp @@ -1,5 +1,6 @@ /******************************************************************************* * Copyright (c) 2015-2018 Skymind, Inc. + * Copyright (c) 2019 Konduit K.K. * * This program and the accompanying materials are made available under the * terms of the Apache License, Version 2.0 which is available at @@ -334,6 +335,25 @@ namespace helpers { } } + int resizeBicubicFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, + bool preserveAspectRatio, bool antialias, NDArray* output) { + return ND4J_STATUS_OK; + } + + int resizeFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, + ImageResizeMethods method, bool preserveAspectRatio, bool antialias, NDArray* output) { + switch (method) { + case kResizeBilinear: return resizeBilinearFunctor(context, image, width, height, false, output); break; + case kResizeNearest: return resizeNeighborFunctor(context, image, width, height, false, output); break; + case kResizeBicubic: return resizeBicubicFunctor(context, image, width, height, preserveAspectRatio, antialias, output); break; + case kResizeLanczos5: + case kResizeGaussian: + case kResizeArea: + case kResizeMitchelcubic: + throw std::runtime_error("helper::resizeFunctor: Non implemented yet."); + } + return ND4J_STATUS_OK; + } void cropAndResizeFunctor(nd4j::LaunchContext * context, NDArray const *images, NDArray const *boxes, NDArray const *indices, NDArray const *cropSize, diff --git a/libnd4j/include/ops/declarable/helpers/cuda/image_resize.cu b/libnd4j/include/ops/declarable/helpers/cuda/image_resize.cu index 5e57a9a90..41aded0c8 100644 --- a/libnd4j/include/ops/declarable/helpers/cuda/image_resize.cu +++ b/libnd4j/include/ops/declarable/helpers/cuda/image_resize.cu @@ -293,7 +293,27 @@ namespace helpers { BUILD_SINGLE_TEMPLATE(template int resizeNeighborFunctor_, (nd4j::LaunchContext* context, NDArray const* images, int width, int height, bool center, NDArray* output), LIBND4J_TYPES); -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + int resizeBicubicFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, + bool preserveAspectRatio, bool antialias, NDArray* output) { + return ND4J_STATUS_OK; + } + + int resizeFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, + ImageResizeMethods method, bool preserveAspectRatio, bool antialias, NDArray* output) { + switch (method) { + case kResizeBilinear: return resizeBilinearFunctor(context, image, width, height, false, output); break; + case kResizeNearest: return resizeNeighborFunctor(context, image, width, height, true, output); break; + case kResizeBicubic: return resizeBicubicFunctor(context, image, width, height, preserveAspectRatio, antialias, output); break; + case kResizeLanczos5: + case kResizeGaussian: + case kResizeArea: + case kResizeMitchelcubic: + throw std::runtime_error("helper::resizeFunctor: Non implemented yet."); + } + return ND4J_STATUS_OK; + } + + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // --------------------------------------------------------------------------------------------------------------- // // Crop and Resize helper implementation // --------------------------------------------------------------------------------------------------------------- // diff --git a/libnd4j/include/ops/declarable/helpers/image_resize.h b/libnd4j/include/ops/declarable/helpers/image_resize.h index aa1b75986..c3fe009c8 100644 --- a/libnd4j/include/ops/declarable/helpers/image_resize.h +++ b/libnd4j/include/ops/declarable/helpers/image_resize.h @@ -1,5 +1,6 @@ /******************************************************************************* * Copyright (c) 2015-2018 Skymind, Inc. + * Copyright (c) 2019 Konduit K.K. * * This program and the accompanying materials are made available under the * terms of the Apache License, Version 2.0 which is available at @@ -26,9 +27,27 @@ namespace nd4j { namespace ops { namespace helpers { - int resizeBilinearFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, bool center, NDArray* output); - int resizeNeighborFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, bool center, NDArray* output); - void cropAndResizeFunctor(nd4j::LaunchContext * context, NDArray const* images, NDArray const* boxes, NDArray const* indices, NDArray const* cropSize, int method, double extrapolationVal, NDArray* crops); + enum ImageResizeMethods { + kResizeBilinear = 1, + kResizeBicubic, + kResizeNearest, + kResizeGaussian, + kResizeLanczos5, + kResizeMitchelcubic, + kResizeArea + }; + + int resizeBilinearFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, bool center, + NDArray* output); + int resizeNeighborFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, bool center, + NDArray* output); + int resizeBicubicFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, + bool preserveAspectRatio, bool antialias, NDArray* output); + int resizeFunctor(nd4j::LaunchContext * context, NDArray const* image, int width, int height, + ImageResizeMethods method, bool preserveAspectRatio, bool antialias, NDArray* output); + + void cropAndResizeFunctor(nd4j::LaunchContext * context, NDArray const* images, NDArray const* boxes, + NDArray const* indices, NDArray const* cropSize, int method, double extrapolationVal, NDArray* crops); } } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java index 8c80e3bb4..655e4159f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/functions/DifferentialFunction.java @@ -255,6 +255,11 @@ public abstract class DifferentialFunction { } else { try { + //Edge case: we store float fields as doubles, rather than introduce an extra property + if(target.getType() == float.class && value instanceof Double){ + value = ((Double) value).floatValue(); + } + target.set(this,value); } catch (IllegalAccessException e) { throw new RuntimeException("Error setting property for function " + getClass().getName(), e); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java index e89047ee4..5b4cb497b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/autodiff/samediff/serde/FlatBuffersMapper.java @@ -479,6 +479,8 @@ public class FlatBuffersMapper { } else if (v instanceof Number) { if (v instanceof Double) { d = new double[]{(Double) v}; + } else if (v instanceof Float){ + d = new double[]{(Float) v}; } else if (v instanceof Integer) { i = new int[]{(Integer) v}; } else if (v instanceof Long) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/converters/ImportClassMapping.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/converters/ImportClassMapping.java index bcc2b3c8b..186bd96f0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/converters/ImportClassMapping.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/converters/ImportClassMapping.java @@ -46,6 +46,7 @@ public class ImportClassMapping { org.nd4j.linalg.api.ops.custom.BarnesEdgeForces.class, org.nd4j.linalg.api.ops.custom.BarnesHutGains.class, org.nd4j.linalg.api.ops.custom.BarnesHutSymmetrize.class, + org.nd4j.linalg.api.ops.custom.DrawBoundingBoxes.class, org.nd4j.linalg.api.ops.custom.KnnMinDistance.class, org.nd4j.linalg.api.ops.custom.SpTreeCell.class, org.nd4j.linalg.api.ops.custom.Flatten.class, @@ -584,7 +585,6 @@ public class ImportClassMapping { org.nd4j.linalg.api.ops.custom.BitCast.class, org.nd4j.linalg.api.ops.custom.CompareAndBitpack.class, org.nd4j.linalg.api.ops.custom.DivideNoNan.class, - org.nd4j.linalg.api.ops.custom.DrawBoundingBoxes.class, org.nd4j.linalg.api.ops.custom.FakeQuantWithMinMaxVarsPerChannel.class ); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java index 233609b19..8605467cc 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/imports/graphmapper/tf/TFGraphMapper.java @@ -267,7 +267,7 @@ public class TFGraphMapper { https://github.com/eclipse/deeplearning4j/issues/8285 */ DifferentialFunction dfInstance = DifferentialFunctionClassHolder.getInstance().getOpWithTensorflowName(opName); - Preconditions.checkState(dfInstance != null, "Could not find class for TF Ops: {}", opName); + Preconditions.checkState(dfInstance != null, "Could not find class for TF Ops: %s", opName); DifferentialFunction df; try { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java index 65bdb5c1e..30f3d0bf5 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/BaseOp.java @@ -25,6 +25,7 @@ import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataBuffer; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; @@ -386,4 +387,15 @@ public abstract class BaseOp extends DifferentialFunction implements Op { y = null; z = null; } + + @Override + public String onnxName() { + throw new NoOpNameFoundException("No onnx op opName found for " + opName()); + } + + @Override + public String tensorflowName() { + throw new NoOpNameFoundException("No tensorflow op opName found for " + opName()); + } + } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrast.java index 80f29e577..2d0ac235f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrast.java @@ -3,9 +3,13 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; +import java.util.Collections; +import java.util.List; + public class AdjustContrast extends BaseAdjustContrast { public AdjustContrast() {super();} diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrastV2.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrastV2.java index 5adfcbafd..9ebb3ea6f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrastV2.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/AdjustContrastV2.java @@ -3,9 +3,13 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; +import java.util.Collections; +import java.util.List; + public class AdjustContrastV2 extends BaseAdjustContrast { public AdjustContrastV2() {super();} @@ -25,6 +29,6 @@ public class AdjustContrastV2 extends BaseAdjustContrast { @Override public String tensorflowName() { - return "AdjustContrastV2"; + return "AdjustContrastv2"; } } \ No newline at end of file diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java index cadef80e6..25cddd741 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BaseAdjustContrast.java @@ -3,9 +3,13 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; +import java.util.Collections; +import java.util.List; + public abstract class BaseAdjustContrast extends DynamicCustomOp { public BaseAdjustContrast() { } @@ -22,4 +26,11 @@ public abstract class BaseAdjustContrast extends DynamicCustomOp { public BaseAdjustContrast(SameDiff sameDiff, SDVariable[] vars) { super("", sameDiff, vars); } + + @Override + public List calculateOutputDataTypes(List inputDataTypes){ + int n = args().length; + Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == n, "Expected %s input data types for %s, got %s", n, getClass(), inputDataTypes); + return Collections.singletonList(inputDataTypes.get(0)); + } } \ No newline at end of file diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java index 43bff11e6..ebae33fce 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/BitCast.java @@ -3,16 +3,18 @@ package org.nd4j.linalg.api.ops.custom; import lombok.val; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.base.Preconditions; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.shape.options.ArrayOptionsHelper; -import org.nd4j.linalg.factory.Nd4j; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; +import java.util.Collections; +import java.util.List; import java.util.Map; public class BitCast extends DynamicCustomOp { @@ -58,4 +60,11 @@ public class BitCast extends DynamicCustomOp { public String tensorflowName() { return "Bitcast"; } + + @Override + public List calculateOutputDataTypes(List inputDataTypes){ + int n = args().length; + Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == n, "Expected %s input data types for %s, got %s", n, getClass(), inputDataTypes); + return Collections.singletonList(inputDataTypes.get(0)); + } } \ No newline at end of file diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java index 400830ec3..801384bfd 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DivideNoNan.java @@ -3,8 +3,14 @@ package org.nd4j.linalg.api.ops.custom; import org.apache.commons.math3.analysis.function.Divide; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; +import org.nd4j.linalg.api.shape.Shape; + +import java.util.Collections; +import java.util.List; public class DivideNoNan extends DynamicCustomOp { public DivideNoNan() { @@ -29,4 +35,12 @@ public class DivideNoNan extends DynamicCustomOp { public String tensorflowName() { return "DivNoNan"; } + + @Override + public List calculateOutputDataTypes(List dataTypes){ + Preconditions.checkState(dataTypes != null && dataTypes.size() == 2, "Expected exactly 2 input datatypes for %s, got input %s", getClass(), dataTypes); + + DataType z = Shape.pickPairwiseDataType(dataTypes.get(0), dataTypes.get(1)); + return Collections.singletonList(z); + } } \ No newline at end of file diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java index 4c672a66c..57551c84c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/DrawBoundingBoxes.java @@ -2,9 +2,14 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; +import java.util.Collections; +import java.util.List; + public class DrawBoundingBoxes extends DynamicCustomOp { public DrawBoundingBoxes() {} @@ -26,7 +31,14 @@ public class DrawBoundingBoxes extends DynamicCustomOp { } @Override - public String tensorflowName() { - return "DrawBoundingBoxes"; + public String[] tensorflowNames() { + return new String[]{"DrawBoundingBoxes", "DrawBoundingBoxesV2"}; + } + + @Override + public List calculateOutputDataTypes(List inputDataTypes){ + int n = args().length; + Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == n, "Expected %s input data types for %s, got %s", n, getClass(), inputDataTypes); + return Collections.singletonList(inputDataTypes.get(0)); } } \ No newline at end of file diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java index 303ac8458..ef150843d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/custom/FakeQuantWithMinMaxVarsPerChannel.java @@ -3,9 +3,13 @@ package org.nd4j.linalg.api.ops.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; +import java.util.Collections; +import java.util.List; + public class FakeQuantWithMinMaxVarsPerChannel extends DynamicCustomOp { public FakeQuantWithMinMaxVarsPerChannel() {} @@ -33,4 +37,10 @@ public class FakeQuantWithMinMaxVarsPerChannel extends DynamicCustomOp { public String tensorflowName() { return "FakeQuantWithMinMaxVarsPerChannel"; } + + @Override + public List calculateOutputDataTypes(List inputDataTypes){ + Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == 3, "Expected exactly 3 inputs, got %s", inputDataTypes); + return Collections.singletonList(inputDataTypes.get(0)); + } } \ No newline at end of file diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java index d3007427d..5454d8953 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BiasAddGrad.java @@ -21,6 +21,7 @@ import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseBroadcastOp; @@ -65,11 +66,6 @@ public class BiasAddGrad extends DynamicCustomOp { return "BiasAddGrad"; } - @Override - public String tensorflowName() { - return "BiasAddGrad"; - } - @Override public List calculateOutputDataTypes(List inputDataTypes){ Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == 3, "Expected 3 input data types for %s, got %s", getClass(), inputDataTypes); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastAddOp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastAddOp.java index c833d1786..805de3197 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastAddOp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastAddOp.java @@ -61,14 +61,4 @@ public class BroadcastAddOp extends BaseBroadcastOp { public List doDiff(List f1) { return null; } - - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "BroadcastAdd"; - } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastGradientArgs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastGradientArgs.java index c90c7e1d3..b3aa5f244 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastGradientArgs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/broadcast/BroadcastGradientArgs.java @@ -61,14 +61,4 @@ public class BroadcastGradientArgs extends BaseBroadcastOp { public List doDiff(List f1) { return null; } - - @Override - public String onnxName() { - throw new NoOpNameFoundException("No op name found for " + opName()); - } - - @Override - public String tensorflowName() { - return "BroadcastGradientArgs"; - } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java index 0fee6c238..9af5ede2e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/CropAndResize.java @@ -51,7 +51,8 @@ public class CropAndResize extends DynamicCustomOp { } public CropAndResize(@NonNull INDArray image, @NonNull INDArray cropBoxes, @NonNull INDArray boxIndices, - @NonNull INDArray cropOutSize, @NonNull Method method, double extrapolationValue){ + @NonNull INDArray cropOutSize, @NonNull Method method, double extrapolationValue, + INDArray output){ super(new INDArray[]{image, cropBoxes, boxIndices, cropOutSize}, null); Preconditions.checkArgument(image.rank() == 4, "Input image must be rank 4 with shape [batch, height, width, channels], got %ndShape", image); Preconditions.checkArgument(cropBoxes.rank() == 2 && cropBoxes.size(1) == 4, "Crop boxes must be rank 4 with shape [num_boxes, 5], got %ndShape", cropBoxes); @@ -60,6 +61,7 @@ public class CropAndResize extends DynamicCustomOp { this.method = method; this.extrapolationValue = extrapolationValue; addArgs(); + outputArguments.add(output); } @Override @@ -89,8 +91,6 @@ public class CropAndResize extends DynamicCustomOp { } protected void addArgs() { - iArguments.clear(); - tArguments.clear(); addIArgument(method == Method.BILINEAR ? 0 : 1); addTArgument(extrapolationValue); } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/NonMaxSuppression.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/NonMaxSuppression.java index d7161cf5f..25463030c 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/NonMaxSuppression.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/image/NonMaxSuppression.java @@ -53,7 +53,7 @@ public class NonMaxSuppression extends DynamicCustomOp { @Override public String[] tensorflowNames() { - return new String[]{"NonMaxSuppression", "NonMaxSuppressionV2"}; + return new String[]{"NonMaxSuppression", "NonMaxSuppressionV2", "NonMaxSuppressionV3"}; } @Override diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java index ab2984969..c127b76bc 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/layers/convolution/Pooling2D.java @@ -30,6 +30,7 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; @@ -231,11 +232,6 @@ public class Pooling2D extends DynamicCustomOp { return "Pooling"; } - @Override - public String tensorflowName() { - return "Pooling2D"; - } - @Override public List calculateOutputDataTypes(List inputDataTypes){ Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == 1, "Expected 1 input data type for %s, got %s", getClass(), inputDataTypes); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SigmoidCrossEntropyLoss.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SigmoidCrossEntropyLoss.java index 468224939..b2823e712 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SigmoidCrossEntropyLoss.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/loss/SigmoidCrossEntropyLoss.java @@ -64,11 +64,6 @@ public class SigmoidCrossEntropyLoss extends BaseLoss { return "sigm_cross_entropy_loss"; } - @Override - public String tensorflowName() { - return "sigmoid_cross_entropy"; - } - @Override public List doDiff(List grad){ //No external gradient diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java index 7afdf5166..c7aef3c62 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/Moments.java @@ -73,16 +73,6 @@ public class Moments extends DynamicCustomOp { return "moments"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "moments"; - } - @Override public List doDiff(List grad){ SDVariable dLdMean = grad.get(0); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java index 36b4600c9..945cd505d 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/NormalizeMoments.java @@ -69,16 +69,6 @@ public class NormalizeMoments extends DynamicCustomOp { return "normalize_moments"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "normalize_moments"; - } - @Override public List calculateOutputDataTypes(List inputDataTypes){ Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == 3, "Expected 3 input datatypes for %s, got %s", getClass(), inputDataTypes); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsInf.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsInf.java index 6ce3c1eef..c74acf734 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsInf.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsInf.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.bool; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseReduceBoolOp; @@ -64,12 +65,6 @@ public class IsInf extends BaseReduceBoolOp { return "HasInf"; } - @Override - public String tensorflowName() { - return "HasInf"; - } - - @Override public List doDiff(List i_v) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsNaN.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsNaN.java index 2d25391a9..611219d3e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsNaN.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/bool/IsNaN.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.bool; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseReduceBoolOp; @@ -64,12 +65,6 @@ public class IsNaN extends BaseReduceBoolOp { return "hasNaNs"; } - @Override - public String tensorflowName() { - return "hasNans"; - } - - @Override public List doDiff(List i_v) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java index 5ccca2dd2..9ecafd4c1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/custom/LogSumExp.java @@ -19,6 +19,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.custom; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; @@ -89,9 +90,4 @@ public class LogSumExp extends DynamicCustomOp { public String onnxName() { return "ReduceLogSumExp"; } - - @Override - public String tensorflowName() { - return "reduce_logsumexp"; - } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Entropy.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Entropy.java index c324ae68c..bb0dd4997 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Entropy.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Entropy.java @@ -57,16 +57,6 @@ public class Entropy extends BaseReduceFloatOp { return "entropy"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "entropy"; - } - @Override public Type getOpType() { return Type.REDUCE_FLOAT; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Norm2.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Norm2.java index 00bd2dbd1..f61c0dc43 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Norm2.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/floating/Norm2.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.reduce.floating; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseReduceFloatOp; import org.nd4j.linalg.ops.transforms.Transforms; @@ -80,8 +81,4 @@ public class Norm2 extends BaseReduceFloatOp { return "Norm"; } - @Override - public String tensorflowName() { - return "norm"; - } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/longer/CountNonZero.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/longer/CountNonZero.java index f90b871e8..d27215a80 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/longer/CountNonZero.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce/longer/CountNonZero.java @@ -54,17 +54,6 @@ public class CountNonZero extends BaseReduceLongOp { return "countNonZero"; } - - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx name found for shape " + opName()); - } - - @Override - public String tensorflowName() { - return "count_nonzero"; - } - @Override public List doDiff(List f1) { return Collections.singletonList(f().zerosLike(arg())); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/CosineDistance.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/CosineDistance.java index 29c7eb878..cddf4bdea 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/CosineDistance.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/reduce3/CosineDistance.java @@ -92,9 +92,4 @@ public class CosineDistance extends BaseReduce3Op { List diff = CosineSimilarity.doDiff(sameDiff, f(), larg(), rarg(), i_v1.get(0), keepDims, dimensions); return Arrays.asList(f().neg(diff.get(0)), f().neg(diff.get(1))); } - - @Override - public String tensorflowName() { - return "cosine_distance"; - } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarAdd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarAdd.java index 01afd45b3..3aa31771a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarAdd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarAdd.java @@ -72,16 +72,6 @@ public class ScalarAdd extends BaseScalarOp { return "add_scalar"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "RealAdd"; - } - @Override public List doDiff(List i_v1) { SDVariable g = i_v1.get(0); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMax.java index 86dc551fb..3544d3d64 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMax.java @@ -58,16 +58,6 @@ public class ScalarMax extends BaseScalarOp { return "max_scalar"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "RealMax"; - } - @Override public List doDiff(List i_v1) { SDVariable mask = arg().gt(scalarValue.getDouble(0)).castTo(arg().dataType()); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMin.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMin.java index 11a5701a6..29399eb5f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMin.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMin.java @@ -52,16 +52,6 @@ public class ScalarMin extends BaseScalarOp { return 13; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "RealMin"; - } - @Override public String opName() { return "scalar_min"; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMultiplication.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMultiplication.java index 955152f1a..5a94eae0b 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMultiplication.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarMultiplication.java @@ -66,15 +66,7 @@ public class ScalarMultiplication extends BaseScalarOp { public String opName() { return "mul_scalar"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - @Override - public String tensorflowName() { - return "RealMul"; - } @Override public List doDiff(List i_v1) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarSubtraction.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarSubtraction.java index bde8a061a..53645c0ed 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarSubtraction.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/ScalarSubtraction.java @@ -66,19 +66,6 @@ public class ScalarSubtraction extends BaseScalarOp { return "sub_scalar"; } - - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "RealSub"; - } - - - @Override public List doDiff(List i_v1) { SDVariable g = i_v1.get(0); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarAnd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarAnd.java index 12b1f8378..ce9cf9446 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarAnd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarAnd.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scalar.comparison; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseScalarBoolOp; @@ -61,12 +62,6 @@ public class ScalarAnd extends BaseScalarBoolOp { return "AndScalar"; } - @Override - public String tensorflowName() { - return "AndScalar"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEps.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEps.java index 21d57fc6c..662535648 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEps.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEps.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scalar.comparison; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseScalarBoolOp; import org.nd4j.linalg.api.ops.BaseScalarOp; @@ -87,11 +88,4 @@ public class ScalarEps extends BaseScalarBoolOp { public String onnxName() { return "ScalarEps"; } - - @Override - public String tensorflowName() { - return "ScalarEps"; - } - - } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEquals.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEquals.java index 5fb8046c3..ad2aa9b50 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEquals.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarEquals.java @@ -83,15 +83,4 @@ public class ScalarEquals extends BaseScalarBoolOp { return Arrays.asList(sameDiff.zerosLike(arg())); } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "equal"; - } - - } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThan.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThan.java index 34caac083..eafbcbc1a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThan.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThan.java @@ -77,16 +77,4 @@ public class ScalarGreaterThan extends BaseScalarBoolOp { return Arrays.asList(sameDiff.zerosLike(arg())); } - - - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "greater"; - } - } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThanOrEqual.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThanOrEqual.java index 656cc851c..0948c01ab 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThanOrEqual.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarGreaterThanOrEqual.java @@ -70,18 +70,6 @@ public class ScalarGreaterThanOrEqual extends BaseScalarBoolOp { return "greaterthanorequal_scalar"; } - - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "greater_equal"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThan.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThan.java index 09a317985..412b024f1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThan.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThan.java @@ -63,12 +63,6 @@ public class ScalarLessThan extends BaseScalarBoolOp { return "Less"; } - @Override - public String tensorflowName() { - return "less"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThanOrEqual.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThanOrEqual.java index 38b5947e5..4dede1775 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThanOrEqual.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarLessThanOrEqual.java @@ -63,17 +63,6 @@ public class ScalarLessThanOrEqual extends BaseScalarBoolOp { return "lessthanorequal_scalar"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "less_equal"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNot.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNot.java index e35aba47a..6e2e1c885 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNot.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNot.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scalar.comparison; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseScalarBoolOp; @@ -66,12 +67,6 @@ public class ScalarNot extends BaseScalarBoolOp { return "NotScalar"; } - @Override - public String tensorflowName() { - return "Not_Scalar"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNotEquals.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNotEquals.java index 8e3065fc8..f050b686e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNotEquals.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarNotEquals.java @@ -63,17 +63,6 @@ public class ScalarNotEquals extends BaseScalarBoolOp { return "notequals_scalar"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No ONNX op name found for: " + getClass().getName()); - } - - @Override - public String tensorflowName() { - return "logical_not"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarOr.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarOr.java index 08161e80e..5fa7ccc8a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarOr.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarOr.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scalar.comparison; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseScalarBoolOp; @@ -66,11 +67,6 @@ public class ScalarOr extends BaseScalarBoolOp { return "OrScalar"; } - @Override - public String tensorflowName() { - return "Or_Scalar"; - } - @Override public List doDiff(List f1) { diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarXor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarXor.java index 325d47347..8319d3b6a 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarXor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/scalar/comparison/ScalarXor.java @@ -18,6 +18,7 @@ package org.nd4j.linalg.api.ops.impl.scalar.comparison; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseScalarBoolOp; @@ -66,12 +67,6 @@ public class ScalarXor extends BaseScalarBoolOp { return "Xor_scalar"; } - @Override - public String tensorflowName() { - return "Xor_scalar"; - } - - @Override public List doDiff(List f1) { //Not continuously differentiable, but 0 gradient in most places diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ApplyGradientDescent.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ApplyGradientDescent.java index 134869104..7442c390e 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ApplyGradientDescent.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ApplyGradientDescent.java @@ -19,6 +19,7 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.extern.slf4j.Slf4j; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; @@ -52,12 +53,6 @@ public class ApplyGradientDescent extends DynamicCustomOp { return "ApplyGradientDescent"; } - @Override - public String tensorflowName() { - return "ApplyGradientDescent"; - } - - @Override public void initFromTensorFlow(NodeDef nodeDef, SameDiff initWith, Map attributesForNode, GraphDef graph) { /* diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Eye.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Eye.java index c4747a371..3472be2de 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Eye.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Eye.java @@ -18,14 +18,10 @@ package org.nd4j.linalg.api.ops.impl.shape; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; -import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.shape.LongShapeDescriptor; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -112,17 +108,6 @@ public class Eye extends DynamicCustomOp { addTArgument((double) dataType.toInt()); } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "Eye"; - } - - @Override public String opName() { return "eye"; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java index ec86c6553..448ae1d16 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeAvg.java @@ -21,10 +21,8 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; -import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.factory.Nd4j; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; @@ -69,16 +67,6 @@ public class MergeAvg extends DynamicCustomOp { super.initFromOnnx(node, initWith, attributesForNode, graph); } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "MergeAvg"; - } - @Override public List doDiff(List i_v) { int nArgs = args().length; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java index 046f06c3c..11578b902 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/MergeMax.java @@ -22,11 +22,8 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; -import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.shape.LongShapeDescriptor; -import org.nd4j.linalg.exception.ND4JIllegalStateException; import org.tensorflow.framework.AttrValue; import org.tensorflow.framework.GraphDef; import org.tensorflow.framework.NodeDef; @@ -68,16 +65,6 @@ public class MergeMax extends DynamicCustomOp { super.initFromOnnx(node, initWith, attributesForNode, graph); } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "MergeMax"; - } - @Override public List doDiff(List i_v) { SDVariable gradient = sameDiff.setupFunction(i_v.get(0)); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java index 3a1605d8b..c9eddf633 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/ParallelStack.java @@ -21,7 +21,6 @@ import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; -import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; @@ -46,17 +45,6 @@ public class ParallelStack extends DynamicCustomOp { super(null, sameDiff, values, false); } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "parallel_stack"; - } - - @Override public String opName() { return "parallel_stack"; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Repeat.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Repeat.java index 4bf920da9..310e90352 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Repeat.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/Repeat.java @@ -21,7 +21,6 @@ import lombok.val; import onnx.Onnx; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.base.Preconditions; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; @@ -115,12 +114,6 @@ public class Repeat extends DynamicCustomOp { return "Repeat"; } - @Override - public String tensorflowName() { - return "Repeat"; - } - - @Override public List doDiff(List i_v) { SDVariable ret = outputVariables()[0]; diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java index 67454e231..60da43dc0 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/shape/SequenceMask.java @@ -18,11 +18,9 @@ package org.nd4j.linalg.api.ops.impl.shape; import lombok.NoArgsConstructor; import lombok.val; -import onnx.OnnxMl; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; -import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.imports.descriptors.properties.PropertyMapping; import org.nd4j.imports.graphmapper.tf.TFGraphMapper; import org.nd4j.linalg.api.buffer.DataType; @@ -97,17 +95,6 @@ public class SequenceMask extends DynamicCustomOp { return "sequence_mask"; } - @Override - public String onnxName() { - throw new NoOpNameFoundException("No onnx opName found for " + opName()); - } - - - @Override - public String tensorflowName() { - return "SequenceMask"; - } - @Override public List doDiff(List grad){ //Input is integer indices diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Angle.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Angle.java index abc55d8ec..66eeb9b99 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Angle.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/Angle.java @@ -18,9 +18,6 @@ package org.nd4j.linalg.api.ops.impl.transforms; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; -import org.nd4j.imports.NoOpNameFoundException; -import org.nd4j.linalg.api.ndarray.INDArray; -import org.nd4j.linalg.api.ops.BaseTransformOp; import org.nd4j.linalg.api.ops.DynamicCustomOp; import java.util.Collections; @@ -45,16 +42,6 @@ public class Angle extends DynamicCustomOp { return "zeros_like"; } - @Override - public String onnxName() { throw new NoOpNameFoundException("No onnx op opName found for " + opName()); - } - - @Override - public String tensorflowName() { - return "Angle"; - } - - @Override public List doDiff(List i_v) { return Collections.singletonList(f().zerosLike(arg())); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/MaxOut.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/MaxOut.java index 939ed854b..9c8607b98 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/MaxOut.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/MaxOut.java @@ -80,7 +80,8 @@ public class MaxOut extends BaseTransformOp { @Override public String tensorflowName() { - return "Maxout"; + throw new NoOpNameFoundException("Tensorflow name not found for " + opName()); + //return "Maxout"; } @Override diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java index 676a016df..4dd948b4f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/bool/BooleanNot.java @@ -20,6 +20,7 @@ import lombok.NonNull; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; import org.nd4j.base.Preconditions; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseTransformBoolOp; @@ -59,12 +60,12 @@ public class BooleanNot extends BaseTransformBoolOp { @Override public String onnxName() { - return "not_applicable"; + throw new NoOpNameFoundException("Onnx name not found for " + opName()); } @Override public String tensorflowName() { - return "not_applicable"; + throw new NoOpNameFoundException("Tensorflow name not found for " + opName()); } @Override diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java index 5483ce17d..1f4ee0107 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/BitwiseAnd.java @@ -61,7 +61,7 @@ public class BitwiseAnd extends BaseDynamicTransformOp { @Override public String tensorflowName() { - return "bitwise_and"; + return "BitwiseAnd"; } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java index 3d05d883c..367e27497 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsNumericTensor.java @@ -22,7 +22,6 @@ import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.ops.impl.transforms.BaseDynamicTransformOp; import java.util.Arrays; import java.util.Collections; @@ -49,12 +48,6 @@ public class IsNumericTensor extends DynamicCustomOp { return "is_numeric_tensor"; } - - @Override - public String tensorflowName() { - return "IsNumericTensor"; - } - @Override public List doDiff(List f1) { throw new UnsupportedOperationException(""); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java index cd525a578..02a527cb8 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/IsStrictlyIncreasing.java @@ -22,9 +22,7 @@ import org.nd4j.base.Preconditions; import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.DynamicCustomOp; -import org.nd4j.linalg.api.ops.impl.transforms.BaseDynamicTransformOp; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -50,12 +48,6 @@ public class IsStrictlyIncreasing extends DynamicCustomOp { return "is_strictly_increasing"; } - - @Override - public String tensorflowName() { - return "IsStrictlyIncreasing"; - } - @Override public List doDiff(List f1) { return Collections.singletonList(sameDiff.zerosLike(arg())); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java index 02e2bb436..c3c515b25 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/custom/LogicalXor.java @@ -39,12 +39,6 @@ public class LogicalXor extends DynamicCustomOp { return "boolean_xor"; } - @Override - public String tensorflowName() { - return "LogicalXor"; - } - - @Override public List doDiff(List f1) { return Arrays.asList( sameDiff.zerosLike(larg()), sameDiff.zerosLike(rarg())); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SigmoidDerivative.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SigmoidDerivative.java index dbb2eb484..9c4d478c7 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SigmoidDerivative.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/gradient/SigmoidDerivative.java @@ -62,11 +62,6 @@ public class SigmoidDerivative extends DynamicCustomOp { throw new NoOpNameFoundException("No onnx op opName found for " + opName()); } - @Override - public String tensorflowName() { - return "SigmoidGrad"; - } - @Override public List doDiff(List i_v) { throw new UnsupportedOperationException(); diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/bool/Not.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/bool/Not.java index d21b8a1d6..b49a89200 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/bool/Not.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/pairwise/bool/Not.java @@ -20,6 +20,7 @@ import lombok.NonNull; import org.nd4j.autodiff.functions.DifferentialFunction; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.imports.NoOpNameFoundException; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseTransformBoolOp; import org.nd4j.linalg.api.ops.BaseTransformOp; @@ -68,7 +69,8 @@ public class Not extends BaseTransformBoolOp { @Override public String tensorflowName() { - return "Not"; + throw new NoOpNameFoundException("Tensorflow name not found for " + opName()); + //return "Not"; } @Override diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java index f1b6be464..1ac8829e2 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/same/Abs.java @@ -18,11 +18,14 @@ package org.nd4j.linalg.api.ops.impl.transforms.same; import org.nd4j.autodiff.samediff.SDVariable; import org.nd4j.autodiff.samediff.SameDiff; +import org.nd4j.base.Preconditions; +import org.nd4j.linalg.api.buffer.DataType; import org.nd4j.linalg.api.ndarray.INDArray; import org.nd4j.linalg.api.ops.BaseTransformOp; import org.nd4j.linalg.api.ops.BaseTransformSameOp; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -73,4 +76,11 @@ public class Abs extends BaseTransformSameOp { SDVariable ret = f().sign(arg()).mul(i_v.get(0)); return Arrays.asList(ret); } + + @Override + public List calculateOutputDataTypes(List inputDataTypes){ + int n = args().length; + Preconditions.checkState(inputDataTypes != null && inputDataTypes.size() == n, "Expected %s input data types for %s, got %s", n, getClass(), inputDataTypes); + return Collections.singletonList(inputDataTypes.get(0)); + } } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/GELU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/GELU.java index 643e940be..ec91a98e6 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/GELU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/GELU.java @@ -65,8 +65,10 @@ public class GELU extends BaseTransformStrictOp { } @Override - public String tensorflowName() { - return "GELU"; + public String tensorflowName() + { + throw new NoOpNameFoundException("No tensorflow op opName found for " + opName()); + //return "GELU"; } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/PreciseGELU.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/PreciseGELU.java index 76ad98f23..ab565b30f 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/PreciseGELU.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/impl/transforms/strict/PreciseGELU.java @@ -65,7 +65,8 @@ public class PreciseGELU extends BaseTransformStrictOp { @Override public String tensorflowName() { - return "PreciseGELU"; + throw new NoOpNameFoundException("Tensorflow name not found for " + opName()); + //return "PreciseGELU"; } diff --git a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/DropOut.java b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/DropOut.java index e690413d2..32a823ac1 100644 --- a/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/DropOut.java +++ b/nd4j/nd4j-backends/nd4j-api-parent/nd4j-api/src/main/java/org/nd4j/linalg/api/ops/random/impl/DropOut.java @@ -73,7 +73,8 @@ public class DropOut extends BaseRandomOp { @Override public String tensorflowName() { - return opName(); + throw new NoOpNameFoundException("No tensorflow op name found for: " + getClass().getName()); + //return opName(); } @Override diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java index 92022d258..ed3b5a7cb 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/autodiff/samediff/SameDiffTests.java @@ -1641,6 +1641,19 @@ public class SameDiffTests extends BaseNd4jTest { } } + @Ignore(/*AS - 20191114 https://github.com/eclipse/deeplearning4j/issues/8393*/) + @Test + public void testIsStrictlyIncShape() { + int nOut = 0; + int minibatch = 0; + + INDArray ia = Nd4j.randn(minibatch, nOut); + INDArray expOut = Nd4j.create(DataType.BOOL, ia.shape()); + + Nd4j.exec(new IsStrictlyIncreasing(new INDArray[]{ia}, new INDArray[]{expOut})); + System.out.println(expOut); + } + @Test public void testExpandDims2d() { val origShape = new long[]{3, 4}; diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java index c57f8c5d9..091e5cad1 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllHelper.java @@ -635,7 +635,7 @@ public class TFGraphTestAllHelper { for (int i = 0; i < resources.size(); i++) { URI u = resources.get(i).getFirst().getURI(); String varName = u.toString(); - int idx = varName.lastIndexOf(modelName); + int idx = varName.indexOf(modelName); varName = varName.substring(idx + modelName.length()+1); //+1 for "/" varName = varName.replaceAll("____","/"); varName = varName.replaceAll(".placeholder.shape",""); @@ -752,7 +752,8 @@ public class TFGraphTestAllHelper { return (t, s) -> Nd4j.sort(t, true).equals(Nd4j.sort(s, true)); } - if(modelName.startsWith("alpha_dropout") || modelName.startsWith("layers_dropout")) + if(modelName.startsWith("alpha_dropout") || modelName.startsWith("layers_dropout") || modelName.equals("dropout")) + //We can't compare dropout using simple equality due to randomness return (t, s) -> { double[] tfNums = t.ravel().toDoubleVector(); double[] sdNums = s.ravel().toDoubleVector(); diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java index 0d25f63d4..db339b46e 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/imports/TFGraphs/TFGraphTestAllSameDiff.java @@ -70,8 +70,15 @@ public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here a //Still failing 2019/09/11 "slogdet/.*", + // Failing 2019/11/14 - |https://github.com/eclipse/deeplearning4j/issues/8374 + "adjust_contrast/*", + "adjust_contrast/.*", //Failing 2019/09/11 - https://github.com/eclipse/deeplearning4j/issues/7965 "bincount/.*", + // Failing 2019/11/15 https://github.com/eclipse/deeplearning4j/issues/8400 + "bitcast/.*", + // Failing 2019/11/14 https://github.com/eclipse/deeplearning4j/issues/8393 + "is_strictly_increasing/emptyArrayTest/.*", //TODO floormod and truncatemod behave differently - i.e., "c" vs. "python" semantics. Need to check implementations too "truncatemod/.*", @@ -100,7 +107,25 @@ public class TFGraphTestAllSameDiff { //Note: Can't extend BaseNd4jTest here a "multinomial/.*", //2019/11/04 AB - disabled, pending libnd4j deconv3d_tf implementation - "conv3d_transpose.*" + "conv3d_transpose.*", + + //2019/11/15 - mapping is not present yet https://github.com/eclipse/deeplearning4j/issues/8397 + "ragged/reduce_mean/.*", + + // 2019/11/15 - missing dtype argument in nd4j, tests are useless https://github.com/eclipse/deeplearning4j/issues/8398 + "zeros_like/rank2_float32_dtype_int.*", + + // 2019/11/15 - failure https://github.com/eclipse/deeplearning4j/issues/8399 + "crop_and_resize.*", + + // 2019/11/15 - failure https://github.com/eclipse/deeplearning4j/issues/8401 + "draw_bounding_boxes.*", + + // 2019/11/15 - failure https://github.com/eclipse/deeplearning4j/issues/8402 + "fake_quant/min_max_args_per_channel.*", + + // 2019/11/15 - failure https://github.com/eclipse/deeplearning4j/issues/8403 + "resize_bilinear/int32.*" }; @BeforeClass diff --git a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java index 556405c14..b2e6268d3 100644 --- a/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java +++ b/nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/custom/CustomOpsTests.java @@ -16,6 +16,7 @@ package org.nd4j.linalg.custom; +import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.junit.Ignore; @@ -29,12 +30,15 @@ import org.nd4j.linalg.api.ops.DynamicCustomOp; import org.nd4j.linalg.api.ops.custom.*; import org.nd4j.linalg.api.ops.executioner.OpExecutioner; import org.nd4j.linalg.api.ops.executioner.OpStatus; -import org.nd4j.linalg.api.ops.impl.reduce.Mmul; +import org.nd4j.linalg.api.ops.impl.controlflow.Where; +import org.nd4j.linalg.api.ops.impl.image.CropAndResize; +import org.nd4j.linalg.api.ops.impl.image.ResizeBilinear; import org.nd4j.linalg.api.ops.impl.reduce.MmulBp; import org.nd4j.linalg.api.ops.impl.transforms.any.IsMax; import org.nd4j.linalg.api.ops.impl.transforms.pairwise.arithmetic.AddOp; import org.nd4j.linalg.api.ops.impl.transforms.pairwise.arithmetic.ModOp; import org.nd4j.linalg.api.ops.random.compat.RandomStandardNormal; +import org.nd4j.linalg.api.ops.random.impl.DropOut; import org.nd4j.linalg.api.shape.LongShapeDescriptor; import org.nd4j.linalg.api.shape.Shape; import org.nd4j.linalg.exception.ND4JIllegalStateException; @@ -823,6 +827,17 @@ public class CustomOpsTests extends BaseNd4jTest { assertEquals(expected, out); } + @Ignore("AS 11/13/2019 https://github.com/eclipse/deeplearning4j/issues/8374") + @Test + public void testAdjustContrastShape(){ + DynamicCustomOp op = DynamicCustomOp.builder("adjust_contrast_v2") + .addInputs(Nd4j.create(DataType.FLOAT, 256, 256,3), Nd4j.scalar(0.5f)) + .build(); + List lsd = op.calculateOutputShape(); + assertEquals(1, lsd.size()); + assertArrayEquals(new long[]{256, 256, 3}, lsd.get(0).getShape()); + } + @Test public void testAdjustContrastV2() { INDArray in = Nd4j.linspace(DataType.DOUBLE,1.0,1.0, 4*4*3).reshape(4,4,3); @@ -840,6 +855,16 @@ public class CustomOpsTests extends BaseNd4jTest { assertEquals(expected, out); } + @Ignore("AS 11/13/2019 https://github.com/eclipse/deeplearning4j/issues/8374") + @Test + public void testBitCastShape(){ + INDArray out = Nd4j.createUninitialized(1,10); + BitCast op = new BitCast(Nd4j.zeros(1,10), DataType.FLOAT.toInt(), out); + List lsd = op.calculateOutputShape(); + assertEquals(1, lsd.size()); + assertArrayEquals(new long[]{1,10}, lsd.get(0).getShape()); + } + @Test public void testBitCast() { INDArray in = Nd4j.linspace(DataType.FLOAT, 1.0f, 1.0f, 8).reshape(2,2,2); @@ -852,6 +877,79 @@ public class CustomOpsTests extends BaseNd4jTest { assertEquals(expected, out); } + @Ignore("AS 11/13/2019 https://github.com/eclipse/deeplearning4j/issues/8374") + @Test + public void testDrawBoundingBoxesShape() { + INDArray images = Nd4j.createFromArray(new float[]{0.7788f, 0.8012f, 0.7244f, 0.2309f, 0.7271f, + 0.1804f,0.5056f,0.8925f,0.5461f,0.9234f,0.0856f,0.7938f,0.6591f,0.5555f,0.1596f, + 0.3087f,0.1548f,0.4695f,0.9939f,0.6113f,0.6765f,0.1800f,0.6750f,0.2246f,0.0509f, + 0.4601f,0.8284f,0.2354f,0.9752f,0.8361f,0.2585f,0.4189f,0.7028f,0.7679f,0.5373f, + 0.7234f,0.2690f,0.0062f,0.0327f,0.0644f,0.8428f,0.7494f,0.0755f,0.6245f,0.3491f, + 0.5793f,0.5730f,0.1822f,0.6420f,0.9143f}).reshape(2,5,5,1); + INDArray boxes = Nd4j.createFromArray(new float[]{0.7717f, 0.9281f, 0.9846f, 0.4838f, + 0.6433f, 0.6041f, 0.6501f, 0.7612f, + 0.7605f, 0.3948f, 0.9493f, 0.8600f, + 0.7876f, 0.8945f, 0.4638f, 0.7157f}).reshape(2,2,4); + INDArray colors = Nd4j.createFromArray(new float[]{0.9441f, 0.5957f}).reshape(1,2); + INDArray output = Nd4j.create(DataType.FLOAT, images.shape()); + val op = new DrawBoundingBoxes(images, boxes, colors, output); + Nd4j.exec(op); + INDArray expected = Nd4j.createFromArray(new float[]{0.7788f, 0.8012f, 0.7244f, 0.2309f, 0.7271f, + 0.1804f, 0.5056f, 0.8925f, 0.5461f, 0.9234f, 0.0856f, 0.7938f, 0.9441f, + 0.9441f, 0.1596f, 0.3087f, 0.1548f, 0.4695f, 0.9939f, 0.6113f, 0.6765f, + 0.1800f, 0.6750f, 0.2246f, 0.0509f, 0.4601f, 0.8284f, 0.2354f, 0.9752f, 0.8361f, + 0.2585f, 0.4189f,0.7028f,0.7679f,0.5373f,0.7234f,0.2690f,0.0062f,0.0327f,0.0644f, + 0.8428f, 0.9441f,0.9441f,0.9441f,0.3491f,0.5793f,0.5730f,0.1822f,0.6420f,0.9143f}); + assertEquals(expected, output); + } + + @Ignore(" 2019/11/15 - failure https://github.com/eclipse/deeplearning4j/issues/8402") + @Test + public void testFakeQuantAgainstTF_1() { + INDArray x = Nd4j.createFromArray(new float[]{ 0.7788f, 0.8012f, 0.7244f, 0.2309f, 0.7271f, + 0.1804f, 0.5056f, 0.8925f, 0.5461f, 0.9234f, + 0.0856f, 0.7938f, 0.6591f, 0.5555f, 0.1596f}).reshape(3,5); + INDArray min = Nd4j.createFromArray(new float[]{ -0.2283f, -0.0719f, -0.0154f, -0.5162f, -0.3567f}); + INDArray max = Nd4j.createFromArray(new float[]{ 0.9441f, 0.5957f, 0.8669f, 0.3502f, 0.5100f}); + + INDArray expected = Nd4j.createFromArray(new float[]{0.7801f, 0.5966f, 0.7260f, 0.2320f, 0.5084f, + 0.1800f, 0.5046f, 0.8684f, 0.3513f, 0.5084f, + 0.0877f, 0.5966f, 0.6600f, 0.3513f, 0.1604f}).reshape(3,5); + + INDArray out = Nd4j.createUninitialized(x.shape()); + val op = new FakeQuantWithMinMaxVarsPerChannel(x,min,max,out); + Nd4j.exec(op); + assertEquals(expected, out); + + /*TF: [[ 0.7801, 0.5966, 0.7260, 0.2320, 0.5084], + [ 0.1800, 0.5046, 0.8684, 0.3513, 0.5084], + [ 0.0877, 0.5966, 0.6600, 0.3513, 0.1604]] + SD: [[ 0.7770, 0.5969, 0.7232, 0.2310, 0.5098], + [ 0.1793, 0.5053, 0.8685, 0.3500, 0.5098], + [ 0.0874, 0.5969, 0.6574, 0.3500, 0.1597]]*/ + } + + @Test + public void testWhereFail() { + INDArray in = Nd4j.createFromArray(new float[]{0f, 1.0000f, 1.0000f, 1.0000f, 1.0000f}); + INDArray out = Nd4j.createUninitialized(4,1); + INDArray expected = Nd4j.createFromArray(4,1); + val op = new Where(new INDArray[]{in}, new INDArray[]{out}); + Nd4j.exec(op); + assertArrayEquals(new long[]{4,1} , out.shape()); + } + + @Ignore("2019/11/15 - failure https://github.com/eclipse/deeplearning4j/issues/8403") + @Test + public void testResizeBilinear1() { + + INDArray x = Nd4j.rand(1, 2,3,4); + INDArray z = Nd4j.createUninitialized(x.shape()); + boolean align = false; + val op = new ResizeBilinear(x, z, 10, 10, align); + Nd4j.exec(op); + } + @Test public void testCompareAndBitpack() { INDArray in = Nd4j.createFromArray(new double[]{-12.f, -11.f, -10.f, -9.f, -8.f, -7.f, -6.f, -5.f, -4.f, -3.f, @@ -932,6 +1030,30 @@ public class CustomOpsTests extends BaseNd4jTest { System.out.println(distance); } + @Ignore("2019/11/15 AS - https://github.com/eclipse/deeplearning4j/issues/8399") + @Test + public void testCropAndResize() { + INDArray image = Nd4j.createUninitialized(DataType.FLOAT, 1, 2, 2, 1); + INDArray boxes = Nd4j.createFromArray(new float[]{1,2,3,4}).reshape(1,4); + INDArray box_indices = Nd4j.createFromArray(new int[]{1}); + INDArray crop_size = Nd4j.createFromArray(new int[]{1,2}).reshape(1,2); + + //Output shape mismatch - TF [2, 2, 1, 1] vs SD: [1, 2, 1, 1] + INDArray output = Nd4j.create(DataType.FLOAT, 2,2,1,1); + + + Nd4j.exec(new CropAndResize(image, boxes, box_indices, crop_size, CropAndResize.Method.BILINEAR, 0.5, + output)); + } + + @Test + public void testLayersDropoutFail() { + INDArray input = Nd4j.rand(4, 5); + INDArray output = Nd4j.createUninitialized(4, 5); + DropOut op = new DropOut(input, output, 0.1); + Nd4j.exec(op); + System.out.println(output); + } @Test public void testRange(){