You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2017/06/30 13:56:16 UTC

opennlp git commit: OPENNLP-1105: Add a profile and category for high mem tests

Repository: opennlp
Updated Branches:
  refs/heads/master 0a419ceac -> c5b8162ae


OPENNLP-1105: Add a profile and category for high mem tests


Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/c5b8162a
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/c5b8162a
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/c5b8162a

Branch: refs/heads/master
Commit: c5b8162aea8cec2204983d85f544782fe87f9336
Parents: 0a419ce
Author: Jörn Kottmann <jo...@apache.org>
Authored: Fri Jun 30 11:49:16 2017 +0200
Committer: Jörn Kottmann <jo...@apache.org>
Committed: Fri Jun 30 11:49:16 2017 +0200

----------------------------------------------------------------------
 .../java/opennlp/tools/HighMemoryUsage.java     | 24 +++++++++++++++
 .../opennlp/tools/eval/Conll00ChunkerEval.java  |  3 ++
 .../opennlp/tools/eval/ConllXPosTaggerEval.java |  5 +--
 pom.xml                                         | 32 ++++++++++++++++----
 4 files changed, 56 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/opennlp/blob/c5b8162a/opennlp-tools/src/test/java/opennlp/tools/HighMemoryUsage.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/HighMemoryUsage.java b/opennlp-tools/src/test/java/opennlp/tools/HighMemoryUsage.java
new file mode 100644
index 0000000..ddafd03
--- /dev/null
+++ b/opennlp-tools/src/test/java/opennlp/tools/HighMemoryUsage.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package opennlp.tools;
+
+/**
+ * Marker class for tests with heap memory usage above 4 GB.
+ */
+public class HighMemoryUsage {
+}

http://git-wip-us.apache.org/repos/asf/opennlp/blob/c5b8162a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
index fd3e054..f4712d9 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/Conll00ChunkerEval.java
@@ -23,7 +23,9 @@ import java.nio.charset.StandardCharsets;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import opennlp.tools.HighMemoryUsage;
 import opennlp.tools.chunker.ChunkSample;
 import opennlp.tools.chunker.ChunkSampleStream;
 import opennlp.tools.chunker.ChunkerEvaluator;
@@ -89,6 +91,7 @@ public class Conll00ChunkerEval {
 
   // Note: Don't try to run this on your MacBook
   @Test
+  @Category(HighMemoryUsage.class)
   public void evalEnglishMaxentQn() throws IOException {
     TrainingParameters params = EvalUtil.createMaxentQnParams();
     params.put("Threads", 4);

http://git-wip-us.apache.org/repos/asf/opennlp/blob/c5b8162a/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java b/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
index 6f6ce3a..e546beb 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/eval/ConllXPosTaggerEval.java
@@ -22,9 +22,10 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+import opennlp.tools.HighMemoryUsage;
 import opennlp.tools.formats.ConllXPOSSampleStream;
 import opennlp.tools.postag.POSEvaluator;
 import opennlp.tools.postag.POSModel;
@@ -111,7 +112,7 @@ public class ConllXPosTaggerEval {
   }
 
   @Test
-  @Ignore
+  @Category(HighMemoryUsage.class)
   public void evalDutchMaxentQn() throws IOException {
     TrainingParameters params = EvalUtil.createMaxentQnParams();
 

http://git-wip-us.apache.org/repos/asf/opennlp/blob/c5b8162a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8183c06..dee0533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,12 +420,7 @@
 		</profile>
 
 		<profile>
-			<id>eval</id>
-			<activation>
-				<property>
-					<name>OPENNLP_DATA_DIR</name>
-				</property>
-			</activation>
+			<id>eval-tests</id>
 			<properties>
 				<opennlp.forkCount>0.5C</opennlp.forkCount>
 			</properties>
@@ -441,6 +436,31 @@
 								<include>**/*Test.java</include>
 								<include>**/*Eval.java</include>
 							</includes>
+							<excludedGroups>opennlp.tools.HighMemoryUsage</excludedGroups>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>high-memory-tests</id>
+			<properties>
+				<opennlp.forkCount>1</opennlp.forkCount>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${maven.surefire.plugin}</version>
+						<configuration>
+							<argLine>-Xmx20g</argLine>
+							<includes>
+								<include>**/*Test.java</include>
+								<include>**/*Eval.java</include>
+							</includes>
+							<groups>opennlp.tools.HighMemoryUsage</groups>
 						</configuration>
 					</plugin>
 				</plugins>