From 3dab20d2f1571fd31e3f71760b7f1644ac302307 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:19:44 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v5.0.0) - https://github.com/charliermarsh/ruff-pre-commit → https://github.com/astral-sh/ruff-pre-commit - [github.com/astral-sh/ruff-pre-commit: v0.0.261 → v0.6.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.261...v0.6.9) - [github.com/psf/black: 23.3.0 → 24.8.0](https://github.com/psf/black/compare/23.3.0...24.8.0) - [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.6 → v4.0.0-alpha.8](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.6...v4.0.0-alpha.8) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 79266f9..f3acaf8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: # list of supported hooks: https://pre-commit.com/hooks.html - id: trailing-whitespace @@ -12,20 +12,20 @@ repos: - id: detect-private-key # python code formatting/linting - - repo: https://github.com/charliermarsh/ruff-pre-commit + - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: "v0.0.261" + rev: "v0.6.9" hooks: - id: ruff args: [--fix] - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 24.8.0 hooks: - id: black args: [--line-length, "100"] # yaml formatting - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.6 + rev: v4.0.0-alpha.8 hooks: - id: prettier types: [yaml] From 32188ae0c36440df680016151b159d7a58e89845 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:20:59 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- metnet/layers/ConditionWithTimeMetNet2.py | 1 + metnet/layers/ConvLSTM.py | 1 + metnet/layers/DilatedCondConv.py | 1 + metnet/layers/MBConv.py | 1 + metnet/layers/MaxViT.py | 1 + metnet/layers/MultiheadSelfAttention2D.py | 1 + metnet/layers/PartitionAttention.py | 1 + metnet/layers/RelativePositionBias.py | 1 + metnet/layers/SqueezeExcitation.py | 1 + metnet/layers/StochasticDepth.py | 1 + metnet/models/metnet2.py | 1 + metnet/utils.py | 1 + 12 files changed, 12 insertions(+) diff --git a/metnet/layers/ConditionWithTimeMetNet2.py b/metnet/layers/ConditionWithTimeMetNet2.py index 365e866..9cb1468 100755 --- a/metnet/layers/ConditionWithTimeMetNet2.py +++ b/metnet/layers/ConditionWithTimeMetNet2.py @@ -1,4 +1,5 @@ """Condition with time how MetNet-22 does it, with FiLM layers""" + import einops import torch from torch import nn as nn diff --git a/metnet/layers/ConvLSTM.py b/metnet/layers/ConvLSTM.py index fb0f40c..e7406a8 100755 --- a/metnet/layers/ConvLSTM.py +++ b/metnet/layers/ConvLSTM.py @@ -1,4 +1,5 @@ """Originally adapted from https://github.com/aserdega/convlstmgru, MIT License Andriy Serdega""" + from typing import Any, List, Optional import torch diff --git a/metnet/layers/DilatedCondConv.py b/metnet/layers/DilatedCondConv.py index 704bb0d..84f43b8 100755 --- a/metnet/layers/DilatedCondConv.py +++ b/metnet/layers/DilatedCondConv.py @@ -1,4 +1,5 @@ """Dilated Time Conditioned Residual Convolution Block for MetNet-2""" + import torch import torch.nn as nn import torch.nn.functional as F diff --git a/metnet/layers/MBConv.py b/metnet/layers/MBConv.py index 97a801e..6f8973c 100644 --- a/metnet/layers/MBConv.py +++ b/metnet/layers/MBConv.py @@ -1,6 +1,7 @@ """ MBConv Implementation """ + from typing import Type import torch diff --git a/metnet/layers/MaxViT.py b/metnet/layers/MaxViT.py index ab9cb7b..faa2147 100644 --- a/metnet/layers/MaxViT.py +++ b/metnet/layers/MaxViT.py @@ -1,6 +1,7 @@ """ Implementation of MaxViT module """ + from dataclasses import dataclass from typing import List, Tuple, Type, Union diff --git a/metnet/layers/MultiheadSelfAttention2D.py b/metnet/layers/MultiheadSelfAttention2D.py index eeb9d5e..b516c57 100644 --- a/metnet/layers/MultiheadSelfAttention2D.py +++ b/metnet/layers/MultiheadSelfAttention2D.py @@ -1,6 +1,7 @@ """ MultiHeaded 2D Self Attention Implementation """ + from typing import Type import torch diff --git a/metnet/layers/PartitionAttention.py b/metnet/layers/PartitionAttention.py index 511613f..d3ba587 100644 --- a/metnet/layers/PartitionAttention.py +++ b/metnet/layers/PartitionAttention.py @@ -1,6 +1,7 @@ """ Implementation of Partition (Grid and Block) Attention """ + from typing import Tuple, Type import torch diff --git a/metnet/layers/RelativePositionBias.py b/metnet/layers/RelativePositionBias.py index 2ad537b..ec78c16 100644 --- a/metnet/layers/RelativePositionBias.py +++ b/metnet/layers/RelativePositionBias.py @@ -1,6 +1,7 @@ """ Implementation of Relative Position Bias """ + from typing import Tuple import torch diff --git a/metnet/layers/SqueezeExcitation.py b/metnet/layers/SqueezeExcitation.py index f6b2b27..341b098 100644 --- a/metnet/layers/SqueezeExcitation.py +++ b/metnet/layers/SqueezeExcitation.py @@ -1,6 +1,7 @@ """ Squeeze-and-Excitation net implementation """ + from typing import Type import torch diff --git a/metnet/layers/StochasticDepth.py b/metnet/layers/StochasticDepth.py index 30c2f98..b24ebcb 100644 --- a/metnet/layers/StochasticDepth.py +++ b/metnet/layers/StochasticDepth.py @@ -1,6 +1,7 @@ """ Implementation of Stochastic Depth """ + import torch from torch import nn diff --git a/metnet/models/metnet2.py b/metnet/models/metnet2.py index 570cc6b..461152c 100755 --- a/metnet/models/metnet2.py +++ b/metnet/models/metnet2.py @@ -1,4 +1,5 @@ """MetNet-2 model for weather forecasting""" + from typing import List import torch diff --git a/metnet/utils.py b/metnet/utils.py index bc73fe3..c71eb6e 100644 --- a/metnet/utils.py +++ b/metnet/utils.py @@ -1,4 +1,5 @@ """Utilities""" + import numpy as np