ProductModel application is now specialized whenever possible

Author: simonmandlik

docs/Manifest.toml

@@ -1,5 +1,6 @@
 [deps]
 Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
+ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 Compose = "a81c6b42-2e10-5240-aca2-a61377ecd94b"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"

docs/Project.toml

@@ -23,36 +23,36 @@ makedocs(
          modules = [Mill],
          pages = [
                   "Home" => "index.md",
-                  "Motivation" => "motivation.md",
-                  "Manual" => [
-                               "Nodes" => "manual/nodes.md",
-                               "More on nodes" => "manual/more_on_nodes.md",
-                               "Model reflection" => "manual/reflectin.md",
-                               "Bag aggregation" => "manual/aggregation.md",
-                               "Data in leaves" => "manual/leaf_data.md",
-                               "Missing data" => "manual/missing.md",
-                               "Custom nodes" => "manual/custom.md"
-                              ],
-                  "Examples" => [
-                                 "Musk" => "examples/musk/musk.md",
-                                 "GNNs in 16 lines" => "examples/graphs.md",
-                                 "DAGs" => "examples/dag.md",
-                                 "Processing JSONs" => "examples/jsons.md"
-                                ],
-                  "External tools" => [
-                                       "HierarchicalUtils.jl" => "tools/hierarchical.md"
-                                      ],
-                  "Public API" => [
-                            "Aggregation" => "api/aggregation.md",
-                            "Bags" => "api/bags.md",
-                            "Data nodes" => "api/data_nodes.md",
-                            "Model nodes" => "api/model_nodes.md",
-                            "Special Arrays" => "api/special_arrays.md",
-                            "Switches" => "api/switches.md",
-                            "Utilities" => "api/utilities.md"
-                           ],
-                  "References" => "references.md",
-                  "Citation" => "citation.md"
+                  # "Motivation" => "motivation.md",
+                  # "Manual" => [
+                  #              "Nodes" => "manual/nodes.md",
+                  #              "More on nodes" => "manual/more_on_nodes.md",
+                  #              "Model reflection" => "manual/reflectin.md",
+                  #              "Bag aggregation" => "manual/aggregation.md",
+                  #              "Data in leaves" => "manual/leaf_data.md",
+                  #              "Missing data" => "manual/missing.md",
+                  #              "Custom nodes" => "manual/custom.md"
+                  #             ],
+                  # "Examples" => [
+                  #                "Musk" => "examples/musk/musk.md",
+                  #                "GNNs in 16 lines" => "examples/graphs.md",
+                  #                "DAGs" => "examples/dag.md",
+                  #                "Processing JSONs" => "examples/jsons.md"
+                  #               ],
+                  # "External tools" => [
+                  #                      "HierarchicalUtils.jl" => "tools/hierarchical.md"
+                  #                     ],
+                  # "Public API" => [
+                  #           "Aggregation" => "api/aggregation.md",
+                  #           "Bags" => "api/bags.md",
+                  #           "Data nodes" => "api/data_nodes.md",
+                  #           "Model nodes" => "api/model_nodes.md",
+                  #           "Special Arrays" => "api/special_arrays.md",
+                  #           "Switches" => "api/switches.md",
+                  #           "Utilities" => "api/utilities.md"
+                  #          ],
+                  # "References" => "references.md",
+                  # "Citation" => "citation.md"
                  ],
 
         )

docs/make.jl

@@ -87,7 +87,7 @@ @article{Zaheer2018
     bibsource = {dblp computer science bibliography, https://dblp.org}
 }
 
-@masterthesis{Mandlik2020,
+@mastersthesis{Mandlik2020,
     author = {Šimon Mandlík and Tomáš Pevný},
     school = "Czech Technical University",
     title = "Mapping the Internet: Modelling Entity Interactions in Complex Heterogeneous Networks",

docs/references.bib

@@ -7,21 +7,17 @@ Pages = ["aggregation.md"]
 
 ## API
 ```@docs
-AggregationOperator
-Aggregation
+AbstractAggregation
+AggregationStack
 
 SegmentedSum
 SegmentedMax
 SegmentedMean
 SegmentedPNorm
 SegmentedLSE
 
-sum_aggregation
-max_aggregation
-mean_aggregation
-pnorm_aggregation
-lse_aggregation
+SegmentedMeanMax
+SegmentedPNormLSE
 
-meanmax_aggregation
-pnormlse_aggregation
+BagCount
 ```

docs/src/api/aggregation.md

@@ -14,7 +14,7 @@ identity_model
 IdentityModel
 
 BagModel
-BagModel(::AbstractMillModel, ::Aggregation, ::ArrayModel)
+BagModel(::AbstractMillModel, ::Union{AbstractAggregation, BagCount}, ::ArrayModel)
 
 ProductModel
 ProductModel(::Tuple{AbstractMillModel}, ::ArrayModel)

docs/src/api/model_nodes.md

@@ -11,6 +11,7 @@ MaybeHotVector
 maybehot
 MaybeHotMatrix
 maybehotbatch
+maybecold
 
 NGramIterator
 NGramIterator(::AbstractString, ::Any, ::Any, ::Any)

docs/src/api/special_arrays.md

@@ -10,9 +10,6 @@ Pages = ["general.md"]
 Mill.emptyismissing
 Mill.emptyismissing!
 
-Mill.bagcount
-Mill.bagcount!
-
 Mill.string_start_code
 Mill.string_start_code!
 

docs/src/api/switches.md

@@ -58,7 +58,7 @@ Y = mp(BagNode(U, b))
 and it is differentiable, which can be verified by executing:
 
 ```@repl gnn
-gradient(() -> sum(sin.(mp(BagNode(U, b)) |> Mill.data)), params(mp))
+gradient(() -> sum(sin.(mp(BagNode(U, b)) |> Mill.data)), Flux.params(mp))
 ```
 
 If we put everything together, the GNN implementation is implemented in the following 16 lines:
@@ -101,7 +101,7 @@ nothing # hide
 
 ```@repl gnn
 gnn(g, X, 5)
-gradient(() -> gnn(g, X, 5) |> sum, params(gnn))
+gradient(() -> gnn(g, X, 5) |> sum, Flux.params(gnn))
 ```
 
 The above implementation is surprisingly general, as it supports an arbitrarily rich description of vertices. For simplicity, we used only vectors in `X`, however, any [`Mill.jl`](https://github.com/CTUAvastLab/Mill.jl) hierarchy is applicable.