Add support for RandomContrast, RandomFlip, RandomHeight, RandomTranslation, RandomWidth, RandomZoom (#295)

* Add support for RandomContrast

* Bump version number to 0.15.10

* Add support for RandomFlip, RandomHeight, RandomTranslation, RandomWidth, RandomZoom

* Remove superfluous print aound model.summary()

Author: Dobiasd

CMakeLists.txt

@@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH "${FDEEP_TOP_DIR}/cmake")
 
 include(cmake/hunter.cmake) # default off
 
-project(frugally-deep VERSION 0.15.9)
+project(frugally-deep VERSION 0.15.10)
 
 message(STATUS "===( ${PROJECT_NAME} ${PROJECT_VERSION} )===")
 

INSTALL.md

@@ -63,7 +63,7 @@ Just add a *conanfile.txt* with frugally-deep as a requirement and chose the gen
 
 ```
 [requires]
-frugally-deep/v0.15.9-p0@dobiasd/stable
+frugally-deep/v0.15.10-p0@dobiasd/stable
 
 [generators]
 cmake

README.md

@@ -47,8 +47,10 @@ Layer types typically used in image recognition/generation are supported, making
 * `Conv1D/2D`, `SeparableConv2D`, `DepthwiseConv2D`
 * `Cropping1D/2D`, `ZeroPadding1D/2D`
 * `BatchNormalization`, `Dense`, `Flatten`
-* `Dropout`, `AlphaDropout`, `GaussianDropout`, `GaussianNoise`, `RandomRotation`
+* `Dropout`, `AlphaDropout`, `GaussianDropout`, `GaussianNoise`
 * `SpatialDropout1D`, `SpatialDropout2D`, `SpatialDropout3D`
+* `RandomContrast`, `RandomFlip`, `RandomHeight`
+* `RandomRotation`, `RandomTranslation`, `RandomWidth`, `RandomZoom`
 * `MaxPooling1D/2D`, `GlobalMaxPooling1D/2D`
 * `ELU`, `LeakyReLU`, `ReLU`, `SeLU`, `PReLU`
 * `Sigmoid`, `Softmax`, `Softplus`, `Tanh`

include/fdeep/import_model.hpp

@@ -1132,7 +1132,13 @@ inline layer_ptr create_layer(const get_param_f& get_param,
             {"SpatialDropout1D", create_identity_layer},
             {"SpatialDropout2D", create_identity_layer},
             {"SpatialDropout3D", create_identity_layer},
+            {"RandomContrast", create_identity_layer},
+            {"RandomFlip", create_identity_layer},
+            {"RandomHeight", create_identity_layer},
             {"RandomRotation", create_identity_layer},
+            {"RandomTranslation", create_identity_layer},
+            {"RandomWidth", create_identity_layer},
+            {"RandomZoom", create_identity_layer},
             {"LeakyReLU", create_leaky_relu_layer_isolated},
             {"Permute", create_permute_layer },
             {"PReLU", create_prelu_layer },

keras_export/generate_test_models.py

@@ -877,7 +877,7 @@ def main():
         # Make sure models can be loaded again,
         # see https://github.com/fchollet/keras/issues/7682
         model = load_model(dest_path)
-        print(model.summary())
+        model.summary()
         # plot_model(model, to_file= str(model_name) + '.png', show_shapes=True, show_layer_names=True)  #### DEBUG stateful
 
 

test/Dockerfile

@@ -29,7 +29,7 @@ WORKDIR /
 RUN git clone -b 'v0.2.15-p0' --single-branch --depth 1 https://github.com/Dobiasd/FunctionalPlus && cd FunctionalPlus && mkdir -p build && cd build && cmake .. && make && make install
 RUN git clone -b '3.3.9' --single-branch --depth 1 https://gitlab.com/libeigen/eigen.git && cd eigen && mkdir -p build && cd build && cmake .. && make && make install && ln -s /usr/local/include/eigen3/Eigen /usr/local/include/Eigen
 RUN git clone -b 'v3.9.1' --single-branch --depth 1 https://github.com/nlohmann/json && cd json && mkdir -p build && cd build && cmake -DBUILD_TESTING=OFF .. && make && make install
-RUN git clone -b 'v0.15.9-p0' --single-branch --depth 1 https://github.com/Dobiasd/frugally-deep && cd frugally-deep && mkdir -p build && cd build && cmake .. && make && make install
+RUN git clone -b 'v0.15.10-p0' --single-branch --depth 1 https://github.com/Dobiasd/frugally-deep && cd frugally-deep && mkdir -p build && cd build && cmake .. && make && make install
 
 # To have downloaded the Keras models already
 RUN pip install numpy --upgrade