Merge pull request #182 from darsnack/retest-gha

Author: darsnack

.github/workflows/CI.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   test:
-    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    name: ${{ matrix.suite }} - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -21,10 +21,22 @@ jobs:
           - 'nightly'
         os:
           - ubuntu-latest
-          - macOS-latest
+          # - macOS-latest
           # - windows-latest
         arch:
           - x64
+        suite:
+          - '["AlexNet", "VGG"]'
+          - '["GoogLeNet", "SqueezeNet"]'
+          - '["EfficientNet", "MobileNet"]'
+          - '[r"/*/ResNet*", "ResNeXt"]'
+          - 'r"/*/Inception/Inceptionv*"'
+          - '["InceptionResNetv2", "Xception"]'
+          - '"DenseNet"'
+          - '"ConvNeXt"'
+          - '"ConvMixer"'
+          - '"ViT"'
+          - '"Other"'
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
@@ -42,12 +54,42 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
+      - name: "Setup environment"
+        run: |
+          julia --project=./test -e 'using Pkg; Pkg.develop(path = ".")'
+      - name: "Run tests + coverage"
+        if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
+        run: |
+          julia --code-coverage=user --color=yes --depwarn=yes --project=./test -e 'include("test/retest.jl"); retest(${{ matrix.suite }})'
+        shell: bash
+      - name: "Run tests only"
+        if: ${{ !(matrix.version == '1' && matrix.os == 'ubuntu-latest') }}
+        run: |
+          julia --color=yes --depwarn=yes --project=./test -e 'include("test/retest.jl"); retest(${{ matrix.suite }})'
+        continue-on-error: ${{ matrix.version == 'nightly' }}
+        shell: bash
+      - uses: actions/upload-artifact@v3
         with:
-          coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
-      - uses: julia-actions/julia-processcoverage@v1
+          name: coverage-${{ hashFiles('**/*.cov') }}
+          path: '**/*.cov'
         if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
+
+  coverage:
+    name: "Coverage"
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: '1'
+          arch: x64
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: actions/download-artifact@v3
+      - run: |
+          cp -r coverage-*/* .
+          rm -rf coverage-*
+      - uses: julia-actions/julia-processcoverage@v1
       - uses: codecov/codecov-action@v2
-        if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
         with:
           file: lcov.info

Project.toml

@@ -21,14 +21,7 @@ MLUtils = "0.2.6"
 NNlib = "0.7.34, 0.8"
 julia = "1.6"
 
-[extras]
-Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
-
 [publish]
 ignore = ["^(gh-pages|juliamnt|julia.dmg)$"]
 theme = "_flux-theme"
 title = "Metalhead.jl"
-
-[targets]
-test = ["Images", "Test"]

test/Project.toml

@@ -0,0 +1,5 @@
+[deps]
+Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
+Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
+ReTest = "e0db7c4e-2690-44b9-bad6-7687da720f89"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/convnets.jl

@@ -125,7 +125,7 @@ GC.gc()
         if Inceptionv4 in PRETRAINED_MODELS
             @test acctest(Inceptionv4(pretrain = true))
         else
-            @test_throws ArgumentError InceptionResNetv2(pretrain = true)
+            @test_throws ArgumentError Inceptionv4(pretrain = true)
         end
         @test gradtest(m, x_299)
     end
@@ -236,7 +236,7 @@ GC.safepoint()
 GC.gc()
 
 @testset "ConvNeXt" verbose = true begin
-    @testset for mode in [:small, :base] #, :large # :tiny, #, :xlarge]
+    @testset for mode in [:small, :base, :large, :tiny, :xlarge]
         @testset for drop_path_rate in [0.0, 0.5]
             m = ConvNeXt(mode; drop_path_rate)
             @test size(m(x_224)) == (1000, 1)
@@ -251,7 +251,7 @@ GC.safepoint()
 GC.gc()
 
 @testset "ConvMixer" verbose = true begin
-    @testset for mode in [:small, :base] #, :large]
+    @testset for mode in [:small, :base, :large]
         m = ConvMixer(mode)
 
         @test size(m(x_224)) == (1000, 1)

test/retest.jl

@@ -0,0 +1,6 @@
+# To run this file locally,
+# use TestEnv.jl to activate the testing environment
+# Then include this file
+
+using ReTest, Metalhead
+ReTest.hijack(Metalhead; include = :static)