Merge branch 'tensorflow-upgrade'

smistad · Dec 3, 2020 · 5b88fcc · 5b88fcc
2 parents 71d3bc1 + 8afbc18
commit 5b88fcc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt b/source/FAST/Algorithms/NeuralNetwork/CMakeLists.txt
@@ -13,8 +13,8 @@ fast_add_sources(
     TensorToSegmentation.hpp
     BoundingBoxNetwork.cpp
     BoundingBoxNetwork.hpp
-    DisplacementNetwork.cpp
-    DisplacementNetwork.hpp
+    FlowNetwork.cpp
+    FlowNetwork.hpp
 )
 fast_add_python_interfaces(InferenceEngine.hpp InferenceEngineManager.hpp)
 fast_add_python_shared_pointers(InferenceEngine)
@@ -23,8 +23,8 @@ fast_add_process_object(ImageClassificationNetwork ImageClassificationNetwork.hp
 fast_add_process_object(ClassificationToText ImageClassificationNetwork.hpp)
 fast_add_process_object(SegmentationNetwork SegmentationNetwork.hpp)
 fast_add_process_object(BoundingBoxNetwork BoundingBoxNetwork.hpp)
-fast_add_process_object(DisplacementNetwork DisplacementNetwork.hpp)
-fast_add_process_object(ImagesToSequence DisplacementNetwork.hpp)
+fast_add_process_object(FlowNetwork FlowNetwork.hpp)
+fast_add_process_object(ImagesToSequence FlowNetwork.hpp)
 fast_add_process_object(TensorToSegmentation TensorToSegmentation.hpp)
 
 if(FAST_MODULE_Visualization)

diff --git a/...hms/NeuralNetwork/DisplacementNetwork.cpp → .../Algorithms/NeuralNetwork/FlowNetwork.cpp b/...hms/NeuralNetwork/DisplacementNetwork.cpp → .../Algorithms/NeuralNetwork/FlowNetwork.cpp
@@ -1,14 +1,14 @@
-#include "DisplacementNetwork.hpp"
+#include "FlowNetwork.hpp"
 #include <FAST/Data/Image.hpp>
 
 namespace fast {
 
-DisplacementNetwork::DisplacementNetwork() {
+FlowNetwork::FlowNetwork() {
     createInputPort<Sequence>(0);
     createOutputPort<Image>(0);
 }
 
-void DisplacementNetwork::execute() {
+void FlowNetwork::execute() {
     // Prepare input node: Should be two images in a sequence
     run();
 

diff --git a/...hms/NeuralNetwork/DisplacementNetwork.hpp → .../Algorithms/NeuralNetwork/FlowNetwork.hpp b/...hms/NeuralNetwork/DisplacementNetwork.hpp → .../Algorithms/NeuralNetwork/FlowNetwork.hpp
@@ -7,11 +7,16 @@ namespace fast {
 
 class Image;
 
+/**
+ * This process object converts a stream of images to a stream of sequences of a given size.
+ * If the sequence size is X, for the first execute, the added item will be copied X times in the sequence.
+ * New images are added to the end/back of the sequence, while the first/oldest image, is removed.
+ */
 class FAST_EXPORT ImagesToSequence : public ProcessObject {
     FAST_OBJECT(ImagesToSequence)
     public:
         void setSequenceSize(int size);
-	void loadAttributes();
+        void loadAttributes() override;
     protected:
         ImagesToSequence();
         void execute() override;
@@ -22,15 +27,15 @@ class FAST_EXPORT ImagesToSequence : public ProcessObject {
 
 /**
  * A neural network which takes a sequence of images as input, and then
- * outputs a displacement vector field. This can be a flow network which
+ * outputs a flow/displacement vector field. This can be a flow network which
  * estimates the motion between two frames.
  */
-class FAST_EXPORT DisplacementNetwork : public NeuralNetwork {
-    FAST_OBJECT(DisplacementNetwork)
+class FAST_EXPORT FlowNetwork : public NeuralNetwork {
+    FAST_OBJECT(FlowNetwork)
     public:
     protected:
         void execute() override;
-        DisplacementNetwork();
+        FlowNetwork();
 };
 
 }