Fix naming inconsistencies (#114)

* Fix naming inconsistencies * Some small code reformatting * Some more code reformatting * Remove unused import * Revert change in notebook * Some more code reformatting
Kotlin · Jun 16, 2021 · a5f478f · a5f478f
1 parent d183600
commit a5f478f
Show file tree

Hide file tree

Showing 7 changed files with 475 additions and 478 deletions.
diff --git a/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/inference/keras/KerasConstants.kt b/api/src/main/kotlin/org/jetbrains/kotlinx/dl/api/inference/keras/KerasConstants.kt
@@ -6,46 +6,55 @@
 package org.jetbrains.kotlinx.dl.api.inference.keras
 
 // Keras layers
+// Core layers
+internal const val LAYER_DENSE: String = "Dense"
+internal const val LAYER_INPUT: String = "InputLayer"
+internal const val LAYER_ACTIVATION: String = "Activation"
+// Convolution layers
 internal const val LAYER_CONV1D: String = "Conv1D"
 internal const val LAYER_CONV2D: String = "Conv2D"
 internal const val LAYER_CONV3D: String = "Conv3D"
 internal const val LAYER_DEPTHWISE_CONV2D: String = "DepthwiseConv2D"
 internal const val LAYER_SEPARABLE_CONV2D: String = "SeparableConv2D"
-internal const val LAYER_DENSE: String = "Dense"
-internal const val LAYER_INPUT: String = "InputLayer"
+// Pooling layers
 internal const val LAYER_MAX_POOL_1D: String = "MaxPooling1D"
-internal const val LAYER_MAX_POOLING_2D: String = "MaxPooling2D"
-internal const val LAYER_MAX_POOLING_3D: String = "MaxPooling3D"
+internal const val LAYER_MAX_POOL_2D: String = "MaxPooling2D"
+internal const val LAYER_MAX_POOL_3D: String = "MaxPooling3D"
 internal const val LAYER_AVG_POOL_1D: String = "AveragePooling1D"
-internal const val LAYER_AVG_POOLING_2D: String = "AvgPooling2D"
-internal const val LAYER_AVERAGE_POOLING_2D: String = "AveragePooling2D"
+internal const val LAYER_AVG_POOL_2D: String = "AveragePooling2D"
 internal const val LAYER_AVG_POOL_3D: String = "AveragePooling3D"
-internal const val LAYER_RESCALING: String = "Rescaling"
+internal const val LAYER_GLOBAL_MAX_POOL_1D: String = "GlobalMaxPooling1D"
+internal const val LAYER_GLOBAL_AVG_POOL_1D: String = "GlobalAveragePooling1D"
+internal const val LAYER_GLOBAL_AVG_POOL_2D: String = "GlobalAveragePooling2D"
+internal const val LAYER_GLOBAL_AVG_POOL_3D: String = "GlobalAveragePooling3D"
+// Recurrent layers
+internal const val LAYER_LSTM: String = "LSTM"
+// Normalization layers
 internal const val LAYER_NORMALIZATION: String = "Normalization"
+internal const val LAYER_BATCH_NORM: String = "BatchNormalization"
+// Regularization layers
+internal const val LAYER_DROPOUT: String = "Dropout"
+// Attention layers
+// Reshaping layers
 internal const val LAYER_FLATTEN: String = "Flatten"
 internal const val LAYER_RESHAPE: String = "Reshape"
 internal const val LAYER_ZERO_PADDING_2D = "ZeroPadding2D"
 internal const val LAYER_CROPPING_2D = "Cropping2D"
-internal const val LAYER_BATCH_NORM: String = "BatchNormalization"
-internal const val LAYER_ACTIVATION: String = "Activation"
-internal const val LAYER_RELU: String = "ReLU"
-internal const val LAYER_ELU: String = "ELU"
-internal const val LAYER_PRELU: String = "PReLU"
-internal const val LAYER_LEAKY_RELU: String = "LeakyReLU"
-internal const val LAYER_THRESHOLDED_RELU = "ThresholdedReLU"
-internal const val LAYER_LSTM: String = "LSTM"
-internal const val LAYER_DROPOUT: String = "Dropout"
+// Merging layers
 internal const val LAYER_ADD: String = "Add"
 internal const val LAYER_MULTIPLY: String = "Multiply"
 internal const val LAYER_SUBTRACT: String = "Subtract"
 internal const val LAYER_AVERAGE: String = "Average"
 internal const val LAYER_MAXIMUM: String = "Maximum"
 internal const val LAYER_MINIMUM: String = "Minimum"
 internal const val LAYER_CONCATENATE: String = "Concatenate"
-internal const val LAYER_GLOBAL_AVG_POOLING_2D: String = "GlobalAveragePooling2D"
-internal const val LAYER_GLOBAL_AVG_POOLING_1D: String = "GlobalAveragePooling1D"
-internal const val LAYER_GLOBAL_MAX_POOL_1D: String = "GlobalMaxPooling1D"
-internal const val LAYER_GLOBAL_AVG_POOLING_3D: String = "GlobalAveragePooling3D"
+// Locally-connected layers
+// Activation layers
+internal const val LAYER_RELU: String = "ReLU"
+internal const val LAYER_ELU: String = "ELU"
+internal const val LAYER_PRELU: String = "PReLU"
+internal const val LAYER_LEAKY_RELU: String = "LeakyReLU"
+internal const val LAYER_THRESHOLDED_RELU = "ThresholdedReLU"
 internal const val LAYER_SOFTMAX: String = "Softmax"
 
 // Keras data types