Skip to content

Commit f61d362

Browse files
committed
Add Inception_ResNetv2
1 parent df5c5d7 commit f61d362

File tree

8 files changed

+471
-363
lines changed

8 files changed

+471
-363
lines changed

src/Metalhead.jl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Metalhead
22

33
using Flux
4-
using Flux: outputsize, Zygote
4+
using Flux: Zygote, outputsize
55
using Functors
66
using BSON
77
using Artifacts, LazyArtifacts
@@ -19,8 +19,7 @@ using .Layers
1919
# CNN models
2020
include("convnets/alexnet.jl")
2121
include("convnets/vgg.jl")
22-
include("convnets/inceptionv3.jl")
23-
include("convnets/inceptionv4.jl")
22+
include("convnets/inception.jl")
2423
include("convnets/googlenet.jl")
2524
include("convnets/resnet.jl")
2625
include("convnets/resnext.jl")
@@ -40,20 +39,20 @@ include("pretrain.jl")
4039

4140
export AlexNet,
4241
VGG, VGG11, VGG13, VGG16, VGG19,
42+
GoogLeNet,
4343
ResNet, ResNet18, ResNet34, ResNet50, ResNet101, ResNet152,
44-
GoogLeNet, Inception3, SqueezeNet,
45-
DenseNet, DenseNet121, DenseNet161, DenseNet169, DenseNet201,
44+
Inception3, Inception4, SqueezeNet,
4645
ResNeXt,
46+
DenseNet, DenseNet121, DenseNet161, DenseNet169, DenseNet201,
4747
MobileNetv1, MobileNetv2, MobileNetv3,
4848
MLPMixer, ResMLP, gMLP,
4949
ViT,
50-
ConvNeXt, ConvMixer
50+
ConvMixer, ConvNeXt
5151

5252
# use Flux._big_show to pretty print large models
53-
for T in (:AlexNet, :VGG, :ResNet, :GoogLeNet, :Inception3, :SqueezeNet, :DenseNet,
54-
:ResNeXt,
55-
:MobileNetv1, :MobileNetv2, :MobileNetv3,
56-
:MLPMixer, :ResMLP, :gMLP, :ViT, :ConvNeXt, :ConvMixer)
53+
for T in (:AlexNet, :VGG, :GoogLeNet, :ResNet, :ResNeXt, :Inception3, :Inception4,
54+
:SqueezeNet, :DenseNet, :MobileNetv1, :MobileNetv2, :MobileNetv3,
55+
:MLPMixer, :ResMLP, :gMLP, :ViT, :ConvMixer, :ConvNeXt)
5756
@eval Base.show(io::IO, ::MIME"text/plain", model::$T) = _maybe_big_show(io, model)
5857
end
5958

src/convnets/densenet.jl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ Create a Densenet bottleneck layer
1111
(and scaling factor for inner feature maps; see ref)
1212
"""
1313
function dense_bottleneck(inplanes, outplanes)
14-
inner_channels = 4 * outplanes
15-
16-
SkipConnection(Chain(conv_bn((1, 1), inplanes, inner_channels; bias = false, rev = true)...,
17-
conv_bn((3, 3), inner_channels, outplanes; pad = 1, bias = false, rev = true)...),
18-
cat_channels)
14+
inner_channels = 4 * outplanes
15+
return SkipConnection(Chain(conv_bn((1, 1), inplanes, inner_channels; bias = false,
16+
rev = true)...,
17+
conv_bn((3, 3), inner_channels, outplanes; pad = 1,
18+
bias = false, rev = true)...),
19+
cat_channels)
1920
end
2021

2122
"""

0 commit comments

Comments
 (0)