Merge branch 'FluxML:dev' into binaryclassifier

FluxML · Apr 24, 2024 · 774c03d · 774c03d
2 parents a8b336e + 0a6e55d
commit 774c03d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,6 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
+          - '1.9'
           - '1'
         os:
           - ubuntu-latest

diff --git a/.github/workflows/ci_nightly.yml b/.github/workflows/ci_nightly.yml
diff --git a/Project.toml b/Project.toml
@@ -21,9 +21,10 @@ ColorTypes = "0.10.3, 0.11"
 ComputationalResources = "0.3.2"
 Flux = "0.14"
 MLJModelInterface = "1.1.1"
-Metalhead = "0.9"
+Metalhead = "0.9.3"
 ProgressMeter = "1.7.1"
 StatisticalMeasures = "0.1"
+Statistics = "<0.0.1, 1"
 Tables = "1.0"
 julia = "1.9"
 
@@ -35,9 +36,8 @@ MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 StatisticalMeasures = "a19d573c-0a75-4610-95b3-7071388c7541"
-Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["CUDA", "cuDNN", "LinearAlgebra", "MLJBase", "Random", "StableRNGs", "StatisticalMeasures", "Statistics", "StatsBase", "Test"]
+test = ["CUDA", "cuDNN", "LinearAlgebra", "MLJBase", "Random", "StableRNGs", "StatisticalMeasures", "StatsBase", "Test"]
diff --git a/src/metalhead.jl b/src/metalhead.jl
@@ -131,7 +131,7 @@ function VGGHack(
         "depth must be from one in $(sort(collect(keys(Metalhead.VGG_CONFIGS))))"
     )
     model = Metalhead.VGG(imsize;
-                config = Metalhead.VGG_CONV_CONFIGS[Metalhead.VGG_CONFIGS[depth]],
+                config = Metalhead.VGG_CONFIGS[depth],
                 inchannels,
                 batchnorm,
                 nclasses,
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ jobs: @@
           fail-fast: false
           matrix:
             version:
+              - '1.9'
               - '1'
             os:
               - ubuntu-latest
@@ Expand Down @@