From bf865d32c267346fd03b198c54eee2de74167190 Mon Sep 17 00:00:00 2001 From: Vyacheslav Shults Date: Mon, 4 May 2020 19:52:20 +0300 Subject: [PATCH] Resolve merge conflicts --- timm/models/efficientnet.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/timm/models/efficientnet.py b/timm/models/efficientnet.py index 69bfad26..0625dd34 100644 --- a/timm/models/efficientnet.py +++ b/timm/models/efficientnet.py @@ -24,14 +24,12 @@ An implementation of EfficienNet that covers variety of related models with effi Hacked together by Ross Wightman """ +from timm.data import IMAGENET_DEFAULT_MEAN, IMAGENET_DEFAULT_STD, IMAGENET_INCEPTION_MEAN, IMAGENET_INCEPTION_STD from .efficientnet_builder import * from .feature_hooks import FeatureHooks -from .registry import register_model from .helpers import load_pretrained, adapt_model_from_file from .layers import SelectAdaptivePool2d -from timm.models.layers import create_conv2d -from timm.data import IMAGENET_DEFAULT_MEAN, IMAGENET_DEFAULT_STD, IMAGENET_INCEPTION_MEAN, IMAGENET_INCEPTION_STD - +from .registry import register_model __all__ = ['EfficientNet'] @@ -1207,8 +1205,6 @@ def efficientnet_b3_pruned(pretrained=False, **kwargs): return model - - @register_model def tf_efficientnet_b0(pretrained=False, **kwargs): """ EfficientNet-B0. Tensorflow compatible variant """