Skip to content

Commit b2ec1d6

Browse files
authored
Merge pull request #262 from FluxML/bc/testitems
Switch to (Re)TestItems
2 parents 3bd48ad + 929aca0 commit b2ec1d6

File tree

11 files changed

+582
-486
lines changed

11 files changed

+582
-486
lines changed

.buildkite/pipeline.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,17 @@ steps:
1212
agents:
1313
queue: "juliagpu"
1414
cuda: "*"
15+
commands: |
16+
julia --project=test -e '
17+
if VERSION < v"1.7"
18+
using Pkg
19+
Pkg.rm("ReTestItems") # not compatible with 1.6
20+
end'
1521
env:
16-
GROUP: "CUDA"
22+
GROUP: "All"
23+
TEST_FAST: true
24+
RETESTITEMS_NWORKERS: 2
25+
# JULIA_CUDA_HARD_MEMORY_LIMIT: "50%"
1726
if: build.message !~ /\[skip tests\]/
1827
timeout_in_minutes: 180
1928
matrix:

.github/workflows/CI.yml

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ jobs:
2424
test:
2525
name: ${{ matrix.suite }} - Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
2626
runs-on: ${{ matrix.os }}
27+
env:
28+
GROUP: ${{ matrix.suite }}
29+
TEST_FAST: ${{ matrix.version != '1' || matrix.os != 'ubuntu-latest' }}
2730
strategy:
2831
fail-fast: false
2932
matrix:
3033
version:
31-
- '1' # Replace this with the minimum Julia version that your package supports.
34+
- '1.6' # Replace this with the minimum Julia version that your package supports.
35+
- '1'
3236
- 'nightly'
3337
os:
3438
- ubuntu-latest
@@ -37,18 +41,19 @@ jobs:
3741
arch:
3842
- x64
3943
suite:
40-
- '["AlexNet", "VGG"]'
41-
- '["GoogLeNet", "SqueezeNet", "MobileNets"]'
42-
- '"EfficientNet"'
43-
- 'r"/*/ResNet*"'
44-
- 'r"/*/SEResNet*"'
45-
- '[r"Res2Net", r"Res2NeXt"]'
46-
- '"Inception"'
47-
- '"DenseNet"'
48-
- '"UNet"'
49-
- '["ConvNeXt", "ConvMixer"]'
50-
- 'r"Mixers"'
51-
- 'r"ViTs"'
44+
- 'AlexNet|VGG'
45+
- 'GoogLeNet|SqueezeNet|MobileNet|MNASNet'
46+
- 'EfficientNet'
47+
- '^ResNet|WideResNet'
48+
- '^ResNeXt' # split off from ResNet to reduce overall runtime
49+
- 'SEResNet|SEResNeXt'
50+
- 'Res2Net|Res2NeXt'
51+
- 'Inception'
52+
- 'DenseNet'
53+
- 'UNet'
54+
- 'ConvNeXt|ConvMixer'
55+
- 'MLP-Mixer|ResMLP|gMLP'
56+
- 'ViT'
5257
steps:
5358
- uses: actions/checkout@v3
5459
- uses: julia-actions/setup-julia@v1
@@ -57,28 +62,24 @@ jobs:
5762
arch: ${{ matrix.arch }}
5863
- uses: julia-actions/cache@v1
5964
- uses: julia-actions/julia-buildpkg@v1
60-
- name: "Setup environment"
61-
run: |
62-
julia --project=./test -e 'using Pkg; Pkg.develop(path = ".")'
63-
- name: "Run tests + coverage"
64-
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
65-
run: |
66-
julia --code-coverage=user --color=yes --depwarn=yes --project=./test -e 'include("test/retest.jl"); retest(${{ matrix.suite }})'
67-
shell: bash
68-
- name: "Run tests only"
69-
if: ${{ !(matrix.version == '1' && matrix.os == 'ubuntu-latest') }}
65+
66+
- name: Setup test env for 1.6
67+
if: ${{ matrix.version == '1.6' }}
7068
run: |
71-
julia --color=yes --depwarn=yes --project=./test -e 'include("test/retest.jl"); retest(${{ matrix.suite }})'
72-
continue-on-error: ${{ matrix.version == 'nightly' }}
73-
shell: bash
69+
julia --color=yes --depwarn=yes --project=./test -e 'using Pkg; Pkg.rm("ReTestItems")'
70+
- name: Run tests
71+
uses: julia-actions/julia-runtest@v1
72+
continue-on-error: ${{ !(matrix.version == '1' && matrix.os == 'ubuntu-latest') && matrix.version == 'nightly' }}
73+
with:
74+
coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
7475
- uses: actions/upload-artifact@v3
7576
with:
7677
name: coverage-${{ hashFiles('**/*.cov') }}
7778
path: '**/*.cov'
7879
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
7980

8081
coverage:
81-
name: "Coverage"
82+
name: Coverage
8283
runs-on: ubuntu-latest
8384
needs: test
8485
steps:
@@ -94,7 +95,7 @@ jobs:
9495
cp -r coverage-*/* .
9596
rm -rf coverage-*
9697
- uses: julia-actions/julia-processcoverage@v1
97-
- uses: codecov/codecov-action@v2
98+
- uses: codecov/codecov-action@v3
9899
with:
99100
file: lcov.info
100101

test/Project.toml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,18 @@
22
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
33
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
44
Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
5-
ReTest = "e0db7c4e-2690-44b9-bad6-7687da720f89"
5+
ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
66
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7+
TestImages = "5e47fb64-e119-507b-a336-dd2b206d9990"
8+
TestItemRunner = "f8b46487-2199-4994-9208-9a1283c18c0a"
9+
cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
10+
11+
[compat]
12+
CUDA = "4, 5"
13+
Flux = "0.13.16, 0.14"
14+
Images = "0.26"
15+
ReTestItems = "1"
16+
Test = "1"
17+
TestImages = "1.8"
18+
TestItemRunner = "0.2"
19+
cuDNN = "1"

0 commit comments

Comments
 (0)