broccoli-ml 0.3.0__tar.gz → 0.4.1__tar.gz

{broccoli_ml-0.3.0 → broccoli_ml-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: broccoli-ml
-Version: 0.3.0
+Version: 0.4.1
 Summary: Some useful Pytorch models, circa 2025
 License: MIT
 Author: Nicholas Bailey

{broccoli_ml-0.3.0 → broccoli_ml-0.4.1}/broccoli/vit.py

@@ -49,7 +49,7 @@ class SequencePool(nn.Module):
         return self.norm(projection)
 
 
-class CCTEncoder(nn.Module):
+class DCTEncoder(nn.Module):
     """
     Based on the Compact Convolutional Transformer (CCT) of [Hasani et al. (2021)
         *''Escaping the Big Data Paradigm with Compact Transformers''*](
@@ -66,23 +66,23 @@ class CCTEncoder(nn.Module):
         minimum_cnn_out_channels=16,
         cnn_kernel_size=3,
         cnn_kernel_stride=1,
-        cnn_kernel_padding="same",
+        cnn_padding="same",
         cnn_kernel_dilation=1,
         cnn_kernel_groups=1,
-        cnn_activation: nn.Module = nn.ReLU,
+        cnn_activation: nn.Module = ReLU,
         cnn_activation_kwargs: Optional[dict] = None,
         cnn_dropout=0.0,
-        pooling_type="maxpool",
+        pooling_type="concat",  # maxpool or concat
         pooling_kernel_size=3,
         pooling_kernel_stride=2,
-        pooling_kernel_padding=1,
-        transformer_position_embedding="absolute",  # absolute or relative
+        pooling_padding=1,
+        transformer_position_embedding="relative",  # absolute or relative
         transformer_embedding_size=256,
         transformer_layers=7,
         transformer_heads=4,
         transformer_mlp_ratio=2,
         transformer_bos_tokens=4,
-        transformer_activation: nn.Module = nn.GELU,
+        transformer_activation: nn.Module = SquaredReLU,
         transformer_activation_kwargs: Optional[dict] = None,
         mlp_dropout=0.0,
         msa_dropout=0.1,
@@ -131,7 +131,7 @@ class CCTEncoder(nn.Module):
             input_size,
             kernel_size=cnn_kernel_size,
             stride=cnn_kernel_stride,
-            padding=cnn_kernel_padding,
+            padding=cnn_padding,
             dilation=cnn_kernel_dilation,
         )
 
@@ -142,7 +142,7 @@ class CCTEncoder(nn.Module):
                 cnn_output_size,
                 kernel_size=pooling_kernel_size,
                 stride=pooling_kernel_stride,
-                padding=pooling_kernel_padding,
+                padding=pooling_padding,
                 dilation=1,
             )
         )
@@ -174,7 +174,7 @@ class CCTEncoder(nn.Module):
             cnn_out_channels,
             cnn_kernel_size,
             stride=cnn_kernel_stride,
-            padding=cnn_kernel_padding,
+            padding=cnn_padding,
             dilation=cnn_kernel_dilation,
             groups=cnn_kernel_groups,
             bias=True,
@@ -212,7 +212,7 @@ class CCTEncoder(nn.Module):
                     maxpoolxd(
                         pooling_kernel_size,
                         stride=pooling_kernel_stride,
-                        padding=pooling_kernel_padding,
+                        padding=pooling_padding,
                     ),
                     Rearrange(
                         f"N C {spatial_dim_names} -> N ({spatial_dim_names}) C"
@@ -238,7 +238,7 @@ class CCTEncoder(nn.Module):
                     SpaceToDepth(
                         pooling_kernel_size,
                         stride=pooling_kernel_stride,
-                        padding=pooling_kernel_padding,
+                        padding=pooling_padding,
                         spatial_dimensions=self.spatial_dimensions,
                     ),
                     Rearrange(  # for transformer
@@ -291,8 +291,9 @@ class CCTEncoder(nn.Module):
         return self.encoder(x)
 
 
-class CCT(nn.Module):
+class DCT(nn.Module):
     """
+    Denoising convolutional transformer
     Based on the Compact Convolutional Transformer (CCT) of [Hasani et al. (2021)
         *''Escaping the Big Data Paradigm with Compact Transformers''*](
         https://arxiv.org/abs/2104.05704). It's a convolutional neural network
@@ -306,23 +307,23 @@ class CCT(nn.Module):
         minimum_cnn_out_channels=16,
         cnn_kernel_size=3,
         cnn_kernel_stride=1,
-        cnn_kernel_padding="same",
+        cnn_padding="same",
         cnn_kernel_dilation=1,
         cnn_kernel_groups=1,
-        cnn_activation: nn.Module = nn.ReLU,
+        cnn_activation: nn.Module = ReLU,
         cnn_activation_kwargs: Optional[dict] = None,
         cnn_dropout=0.0,
-        pooling_type="maxpool",
+        pooling_type="concat",  # maxpool or concat
         pooling_kernel_size=3,
         pooling_kernel_stride=2,
-        pooling_kernel_padding=1,
-        transformer_position_embedding="absolute",  # absolute or relative
+        pooling_padding=1,
+        transformer_position_embedding="relative",  # absolute or relative
         transformer_embedding_size=256,
         transformer_layers=7,
         transformer_heads=4,
         transformer_mlp_ratio=2,
         transformer_bos_tokens=4,
-        transformer_activation: nn.Module = nn.GELU,
+        transformer_activation: nn.Module = SquaredReLU,
         transformer_activation_kwargs: Optional[dict] = None,
         mlp_dropout=0.0,
         msa_dropout=0.1,
@@ -350,13 +351,13 @@ class CCT(nn.Module):
                 "SwiGLU": SwiGLU,
             }[transformer_activation]
 
-        self.encoder = CCTEncoder(
+        self.encoder = DCTEncoder(
             input_size=input_size,
             cnn_in_channels=cnn_in_channels,
             minimum_cnn_out_channels=minimum_cnn_out_channels,
             cnn_kernel_size=cnn_kernel_size,
             cnn_kernel_stride=cnn_kernel_stride,
-            cnn_kernel_padding=cnn_kernel_padding,
+            cnn_padding=cnn_padding,
             cnn_kernel_dilation=cnn_kernel_dilation,
             cnn_kernel_groups=cnn_kernel_groups,
             cnn_activation=cnn_activation,
@@ -365,7 +366,7 @@ class CCT(nn.Module):
             pooling_type=pooling_type,
             pooling_kernel_size=pooling_kernel_size,
             pooling_kernel_stride=pooling_kernel_stride,
-            pooling_kernel_padding=pooling_kernel_padding,
+            pooling_padding=pooling_padding,
             transformer_position_embedding=transformer_position_embedding,
             transformer_embedding_size=transformer_embedding_size,
             transformer_layers=transformer_layers,

{broccoli_ml-0.3.0 → broccoli_ml-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "broccoli-ml"
-version = "0.3.0"
+version = "0.4.1"
 description = "Some useful Pytorch models, circa 2025"
 authors = [
     {name = "Nicholas Bailey"}