From 7bcfa76df457857fd777d39e7947da0aef26cb95 Mon Sep 17 00:00:00 2001 From: brian Date: Wed, 5 Oct 2022 13:46:28 +0200 Subject: [PATCH] Fix compiler warnings Signed-off-by: brian --- .../main/java/org/deeplearning4j/eval/BaseEvaluation.java | 2 +- .../nn/conf/layers/objdetect/Yolo2OutputLayer.java | 2 ++ .../deeplearning4j/nn/conf/layers/recurrent/SimpleRnn.java | 6 ++---- .../deeplearning4j/nn/conf/memory/LayerMemoryReport.java | 6 ++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java index 0a872ef72..e7318364d 100644 --- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java +++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/eval/BaseEvaluation.java @@ -38,7 +38,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; @Deprecated -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public abstract class BaseEvaluation extends org.nd4j.evaluation.BaseEvaluation { @Getter diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/objdetect/Yolo2OutputLayer.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/objdetect/Yolo2OutputLayer.java index ec93eee55..1229e8cfd 100644 --- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/objdetect/Yolo2OutputLayer.java +++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/objdetect/Yolo2OutputLayer.java @@ -21,6 +21,7 @@ package org.deeplearning4j.nn.conf.layers.objdetect; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.deeplearning4j.nn.api.Layer; @@ -49,6 +50,7 @@ import java.util.List; import java.util.Map; @Data +@EqualsAndHashCode(callSuper = false) public class Yolo2OutputLayer extends org.deeplearning4j.nn.conf.layers.Layer { private double lambdaCoord; diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/recurrent/SimpleRnn.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/recurrent/SimpleRnn.java index 438c98ad8..7cbebeaf2 100644 --- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/recurrent/SimpleRnn.java +++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/layers/recurrent/SimpleRnn.java @@ -20,10 +20,7 @@ package org.deeplearning4j.nn.conf.layers.recurrent; -import lombok.Data; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.deeplearning4j.nn.api.Layer; import org.deeplearning4j.nn.api.ParamInitializer; import org.deeplearning4j.nn.conf.NeuralNetConfiguration; @@ -40,6 +37,7 @@ import java.util.Collection; import java.util.Map; @Data +@EqualsAndHashCode(callSuper = false) public class SimpleRnn extends BaseRecurrentLayer { private boolean hasLayerNorm = false; diff --git a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/memory/LayerMemoryReport.java b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/memory/LayerMemoryReport.java index 33c0c3b6d..28725679b 100644 --- a/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/memory/LayerMemoryReport.java +++ b/cavis-dnn/cavis-dnn-nn/src/main/java/org/deeplearning4j/nn/conf/memory/LayerMemoryReport.java @@ -20,10 +20,7 @@ package org.deeplearning4j.nn.conf.memory; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.NonNull; +import lombok.*; import org.deeplearning4j.nn.conf.CacheMode; import org.deeplearning4j.nn.conf.inputs.InputType; import org.nd4j.linalg.api.buffer.DataBuffer; @@ -35,6 +32,7 @@ import java.util.Map; @Data @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper = false) public class LayerMemoryReport extends MemoryReport { private String layerName;