Skip to content

Commit

Permalink
Resolve conflict in icemix.py
Browse files Browse the repository at this point in the history
  • Loading branch information
mobra7 committed Nov 5, 2024
1 parent c37110b commit 6f6fe07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/graphnet/models/gnn/icemix.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"""
import torch
import torch.nn as nn
from typing import Set, Dict, Any
from typing import Set, Dict, Any, Optional

from graphnet.models.components.layers import (
Block_rel,
Expand Down Expand Up @@ -42,7 +42,7 @@ def __init__(
n_rel: int = 1,
scaled_emb: bool = False,
include_dynedge: bool = False,
dynedge_args: Dict[str, Any] = None,
dynedge_args: Optional[Dict[str, Any]] = None,
fourier_mapping: list = [0, 1, 2, 3, 4, 5]
):
"""Construct `DeepIce`.
Expand Down

0 comments on commit 6f6fe07

Please sign in to comment.