Skip to content

Commit 652b854

Browse files
authored
Merge pull request #9241 from eclipse/ag__junit5_long_running
Fix inconsistent tests due to multithreading, exclude long runnin gtests
2 parents ee67c02 + 01d4ffa commit 652b854

File tree

7 files changed

+189
-214
lines changed

7 files changed

+189
-214
lines changed
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
11
on:
22
workflow_dispatch:
33
jobs:
4-
# Wait for up to a minute for previous run to complete, abort if not done by then
5-
pre-ci:
6-
runs-on: self-hosted
7-
timeout-minutes: 1
8-
steps:
9-
- name: 'Block Concurrent Executions'
10-
uses: softprops/turnstyle@v1
11-
with:
12-
poll-interval-seconds: 10
13-
env:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
154
linux-x86_64:
16-
needs: pre-ci
175
runs-on: [self-hosted]
186
steps:
197
- uses: AutoModality/action-clean@v1
@@ -34,5 +22,5 @@ jobs:
3422
cmake --version
3523
protoc --version
3624
export OMP_NUM_THREADS=1
37-
mvn -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test
25+
mvn -DexcludedGroups=long-running-tests -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test
3826

.github/workflows/run-gpu-integration-tests-self-hosted.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ jobs:
3434
cmake --version
3535
protoc --version
3636
export OMP_NUM_THREADS=1
37-
mvn -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test
37+
mvn -DexcludedGroups=long-running-tests -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test
3838

deeplearning4j/deeplearning4j-core/src/test/java/org/deeplearning4j/regressiontest/RegressionTest100b3.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ public void testVae() throws Exception {
207207

208208

209209
@Test
210-
@Disabled("AB 2019/05/23 - Failing on linux-x86_64-cuda-9.2 - see issue #7657")
211210
public void testYoloHouseNumber() throws Exception {
212211

213212
File f = Resources.asFile("regression_testing/100b3/HouseNumberDetection_100b3.bin");

nd4j/nd4j-backends/nd4j-backend-impls/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@
130130
<OMP_NUM_THREADS>1</OMP_NUM_THREADS>
131131
<LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${user.dir}</LD_LIBRARY_PATH>
132132
</environmentVariables>
133-
<includes>
134-
<include>**/Nd4jTestSuite.java</include>
135-
</includes>
136133
<!--<excludes>
137134
<exclude>**/Test*.java</exclude>
138135
<exclude>**/*Test.java</exclude>
@@ -142,7 +139,7 @@
142139
Maximum heap size was set to 8g, as a minimum required value for tests run.
143140
Depending on a build machine, default value is not always enough.
144141
-->
145-
<argLine> -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine>
142+
<argLine>-Xmx2g</argLine>
146143
</configuration>
147144
</plugin>
148145
<plugin>

nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/Nd4jTestsC.java

Lines changed: 184 additions & 194 deletions
Large diffs are not rendered by default.

nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/specials/LongTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.junit.jupiter.api.Disabled;
2525
import org.junit.jupiter.api.Tag;
2626
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.parallel.Isolated;
2728
import org.junit.jupiter.params.ParameterizedTest;
2829
import org.junit.jupiter.params.provider.MethodSource;
2930

@@ -47,6 +48,7 @@
4748

4849
@Slf4j
4950
@NativeTag
51+
@Isolated
5052
public class LongTests extends BaseNd4jTestWithBackends {
5153

5254
DataType initialType = Nd4j.dataType();

nd4j/nd4j-backends/nd4j-tests/src/test/java/org/nd4j/linalg/workspace/CyclicWorkspaceTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void testBasicMechanics_1(Nd4jBackend backend) {
6565
}
6666
}
6767

68-
@Test
6968
@ParameterizedTest
7069
@MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
7170
public void testGc(Nd4jBackend backend) {

0 commit comments

Comments
 (0)