Merge pull request #9241 from eclipse/ag__junit5_long_running

Fix inconsistent tests due to multithreading, exclude long runnin gtests
master
Adam Gibson 2021-03-23 22:23:11 +09:00 committed by GitHub
commit 652b854083
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 188 additions and 213 deletions

View File

@ -1,19 +1,7 @@
on: on:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
# Wait for up to a minute for previous run to complete, abort if not done by then
pre-ci:
runs-on: self-hosted
timeout-minutes: 1
steps:
- name: 'Block Concurrent Executions'
uses: softprops/turnstyle@v1
with:
poll-interval-seconds: 10
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
linux-x86_64: linux-x86_64:
needs: pre-ci
runs-on: [self-hosted] runs-on: [self-hosted]
steps: steps:
- uses: AutoModality/action-clean@v1 - uses: AutoModality/action-clean@v1
@ -34,5 +22,5 @@ jobs:
cmake --version cmake --version
protoc --version protoc --version
export OMP_NUM_THREADS=1 export OMP_NUM_THREADS=1
mvn -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test mvn -DexcludedGroups=long-running-tests -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cpu clean test

View File

@ -34,5 +34,5 @@ jobs:
cmake --version cmake --version
protoc --version protoc --version
export OMP_NUM_THREADS=1 export OMP_NUM_THREADS=1
mvn -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test mvn -DexcludedGroups=long-running-tests -DskipTestResourceEnforcement=true -Ptestresources -Pintegration-tests -Pnd4j-tests-cuda clean test

View File

@ -207,7 +207,6 @@ public class RegressionTest100b3 extends BaseDL4JTest {
@Test @Test
@Disabled("AB 2019/05/23 - Failing on linux-x86_64-cuda-9.2 - see issue #7657")
public void testYoloHouseNumber() throws Exception { public void testYoloHouseNumber() throws Exception {
File f = Resources.asFile("regression_testing/100b3/HouseNumberDetection_100b3.bin"); File f = Resources.asFile("regression_testing/100b3/HouseNumberDetection_100b3.bin");

View File

@ -130,9 +130,6 @@
<OMP_NUM_THREADS>1</OMP_NUM_THREADS> <OMP_NUM_THREADS>1</OMP_NUM_THREADS>
<LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${user.dir}</LD_LIBRARY_PATH> <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${user.dir}</LD_LIBRARY_PATH>
</environmentVariables> </environmentVariables>
<includes>
<include>**/Nd4jTestSuite.java</include>
</includes>
<!--<excludes> <!--<excludes>
<exclude>**/Test*.java</exclude> <exclude>**/Test*.java</exclude>
<exclude>**/*Test.java</exclude> <exclude>**/*Test.java</exclude>
@ -142,7 +139,7 @@
Maximum heap size was set to 8g, as a minimum required value for tests run. Maximum heap size was set to 8g, as a minimum required value for tests run.
Depending on a build machine, default value is not always enough. Depending on a build machine, default value is not always enough.
--> -->
<argLine> -Djava.library.path="${nd4j.basedir}/nd4j-backends/nd4j-backend-impls/nd4j-cuda/target/classes"</argLine> <argLine>-Xmx2g</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View File

@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Isolated;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
@ -47,6 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
@Slf4j @Slf4j
@NativeTag @NativeTag
@Isolated
public class LongTests extends BaseNd4jTestWithBackends { public class LongTests extends BaseNd4jTestWithBackends {
DataType initialType = Nd4j.dataType(); DataType initialType = Nd4j.dataType();

View File

@ -65,7 +65,6 @@ public class CyclicWorkspaceTests extends BaseNd4jTestWithBackends {
} }
} }
@Test
@ParameterizedTest @ParameterizedTest
@MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs") @MethodSource("org.nd4j.linalg.BaseNd4jTestWithBackends#configs")
public void testGc(Nd4jBackend backend) { public void testGc(Nd4jBackend backend) {