diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8fac4e4d33..276b844ec0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Python tests on: push: - branches: [ master ] + branches: [ 0.6.x ] pull_request: - branches: [ master ] + branches: [ 0.6.x ] env: OMP_NUM_THREADS: 2 @@ -15,10 +15,10 @@ jobs: name: Run tests on ${{ matrix.os }} with Python ${{ matrix.python }} strategy: matrix: - os: [ubuntu-latest, macOS-latest] - python: ['3.9'] - torch: ['1.10.0'] - torchvision: ['0.11.1'] + os: [ubuntu-latest] + python: ['3.10'] + torch: ['1.13.1'] + torchvision: ['0.14.1'] runs-on: ${{ matrix.os }} steps: diff --git a/README.md b/README.md index e5094e7300..a0f8926183 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,9 @@ And a big thanks to all GitHub sponsors who helped with some of my costs before ## What's New +### March 23, 2022 +* 0.6.13 release to include Python 3.11 fix. Please try 0.8.x pre-releases (main branch or `pip install --pre timm`) for latest (transitioning to a 0.9 release soon). + ### Oct 10, 2022 * More weights in `maxxvit` series, incl first ConvNeXt block based `coatnext` and `maxxvit` experiments: * `coatnext_nano_rw_224` - 82.0 @ 224 (G) -- (uses ConvNeXt conv block, no BatchNorm) diff --git a/setup.py b/setup.py index 59b4ed4cfe..277636150f 100644 --- a/setup.py +++ b/setup.py @@ -29,11 +29,11 @@ 'Intended Audience :: Education', 'Intended Audience :: Science/Research', 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Artificial Intelligence', 'Topic :: Software Development', @@ -46,6 +46,6 @@ packages=find_packages(exclude=['convert', 'tests', 'results']), include_package_data=True, install_requires=['torch >= 1.7', 'torchvision', 'pyyaml', 'huggingface_hub'], - python_requires='>=3.6', + python_requires='>=3.7', ) diff --git a/timm/models/maxxvit.py b/timm/models/maxxvit.py index bd52924548..4312d3d38b 100644 --- a/timm/models/maxxvit.py +++ b/timm/models/maxxvit.py @@ -39,7 +39,7 @@ import math from collections import OrderedDict -from dataclasses import dataclass, replace +from dataclasses import dataclass, replace, field from functools import partial from typing import Callable, Optional, Union, Tuple, List @@ -229,8 +229,8 @@ class MaxxVitCfg: block_type: Tuple[Union[str, Tuple[str, ...]], ...] = ('C', 'C', 'T', 'T') stem_width: Union[int, Tuple[int, int]] = 64 stem_bias: bool = True - conv_cfg: MaxxVitConvCfg = MaxxVitConvCfg() - transformer_cfg: MaxxVitTransformerCfg = MaxxVitTransformerCfg() + conv_cfg: MaxxVitConvCfg = field(default_factory=MaxxVitConvCfg) + transformer_cfg: MaxxVitTransformerCfg = field(default_factory=MaxxVitTransformerCfg) weight_init: str = 'vit_eff' @@ -1910,4 +1910,5 @@ def maxvit_large_224(pretrained=False, **kwargs): @register_model def maxvit_xlarge_224(pretrained=False, **kwargs): - return _create_maxxvit('maxvit_xlarge_224', pretrained=pretrained, **kwargs) \ No newline at end of file + return _create_maxxvit('maxvit_xlarge_224', pretrained=pretrained, **kwargs) + diff --git a/timm/version.py b/timm/version.py index adfda343f1..70039a4cbb 100644 --- a/timm/version.py +++ b/timm/version.py @@ -1 +1 @@ -__version__ = '0.6.12' +__version__ = '0.6.13'