Skip to content

Commit d1ef163

Browse files
committed
Merge master
2 parents ea76af4 + e1d951d commit d1ef163

File tree

3 files changed

+16
-27
lines changed

3 files changed

+16
-27
lines changed

.github/workflows/ci-julia-nightly.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ jobs:
3838
- part3
3939
- part4
4040
- part5
41-
- part6
42-
- part7
43-
- part8
4441
steps:
4542
- uses: actions/checkout@v2
4643
- uses: julia-actions/setup-julia@v1

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ jobs:
3939
- part3
4040
- part4
4141
- part5
42-
- part6
43-
- part7
44-
- part8
4542
steps:
4643
- uses: actions/checkout@v2
4744
- uses: julia-actions/setup-julia@v1

test/grouptests.jl

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@ const START_TIME = time()
4949
@time include("simplemisc.jl")
5050

5151
@time include("convolutions.jl")
52+
53+
@time include("ifelsemasks.jl")
54+
55+
@time include("gemv.jl")
56+
57+
@time include("dot.jl")
58+
59+
@time include("special.jl")
60+
61+
@time include("mapreduce.jl")
5262
end
5363

5464
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part3"
@@ -57,7 +67,11 @@ const START_TIME = time()
5767
@time include("miscellaneous.jl")
5868

5969
@time include("copy.jl")
60-
end
70+
71+
@time include("tensors.jl")
72+
73+
@time include("staticsize.jl")
74+
end
6175

6276
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part4"
6377
@time include("threading.jl")
@@ -73,33 +87,14 @@ const START_TIME = time()
7387
if VERSION v"1.6"
7488
@time include("quantum.jl")
7589
end
76-
end
7790

78-
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part5"
7991
@time include("offsetarrays.jl")
8092
end
8193

82-
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part6"
94+
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part5"
8395
@time include("gemm.jl")
8496
end
8597

86-
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part7"
87-
@time include("tensors.jl")
88-
89-
@time include("staticsize.jl")
90-
end
91-
92-
@time if LOOPVECTORIZATION_TEST == "all" || LOOPVECTORIZATION_TEST == "part8"
93-
@time include("ifelsemasks.jl")
94-
95-
@time include("gemv.jl")
96-
97-
@time include("dot.jl")
98-
99-
@time include("special.jl")
100-
101-
@time include("mapreduce.jl")
102-
end
10398
end
10499

105100
const ELAPSED_MINUTES = (time() - START_TIME)/60

0 commit comments

Comments
 (0)