apply for body and curv

models/base.py

@@ -152,7 +152,6 @@ class AEEncoderNew(tf.keras.Model):
     def __init__(self, depths, dims, kernel_size=7, activation='tanh'):
         super(AEEncoderNew, self).__init__()
 
-        # self.encoder = ConvNeXt(depths=depths, dims=dims, include_top=False, kernel_size=kernel_size)
         self.encoder = resnet_18()
         self.act = tf.keras.layers.Activation(activation)
 
@@ -180,10 +179,9 @@ class DecoderNew(tf.keras.Model):
         self.is_label = is_label
 
         if not is_label:
-            # self.decoder = ConvNeXtReverse(depths=depths, dims=dims, kernel_size=kernel_size)
             self.decoder = resnet_18(reversed=True)
         else:
-            self.decoder = ConvNeXtReverseLabels(depths=depths, dims=dims, nr_of_classes=7)
+            self.decoder = resnet_18(reversed=True, labels=6)
             
 
     def call(self, inputs, training):