Updated JPMML-SkLearn dependency

jpmml · Dec 4, 2024 · 8a453b1 · 8a453b1
1 parent a5b9ec8
commit 8a453b1
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,11 +33,17 @@
 	</issueManagement>
 
 	<properties>
-		<jpmml-sklearn.version>1.8.6</jpmml-sklearn.version>
+		<jpmml-sklearn.version>1.8.7</jpmml-sklearn.version>
 		<project.build.outputTimestamp>2024-10-28T21:00:00Z</project.build.outputTimestamp>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.jpmml</groupId>
+			<artifactId>pmml-converter</artifactId>
+			<version>1.5.9</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.jpmml</groupId>
 			<artifactId>pmml-sklearn</artifactId>

diff --git a/sklearn2pmml/resources/classpath.txt b/sklearn2pmml/resources/classpath.txt
@@ -1,8 +1,8 @@
 sklearn2pmml-1.0-SNAPSHOT.jar
 gson-2.11.0.jar
 guava-33.3.1-jre.jar
-h2o-genmodel-3.46.0.5.jar
-h2o-logger-3.46.0.5.jar
+h2o-genmodel-3.46.0.6.jar
+h2o-logger-3.46.0.6.jar
 h2o-tree-api-0.3.17.jar
 istack-commons-runtime-4.0.1.jar
 jackson-annotations-2.17.2.jar
@@ -12,18 +12,18 @@ jaxb-core-3.0.2.jar
 jaxb-runtime-3.0.2.jar
 jcommander-1.72.jar
 pickle-1.5.jar
-pmml-converter-1.5.8.jar
+pmml-converter-1.5.9.jar
 pmml-h2o-1.2.14.jar
 pmml-lightgbm-1.5.5.jar
-pmml-model-1.6.6.jar
-pmml-model-metro-1.6.6.jar
+pmml-model-1.6.7.jar
+pmml-model-metro-1.6.7.jar
 pmml-python-1.2.5.jar
-pmml-sklearn-1.8.6.jar
-pmml-sklearn-extension-1.8.6.jar
-pmml-sklearn-h2o-1.8.6.jar
-pmml-sklearn-lightgbm-1.8.6.jar
-pmml-sklearn-statsmodels-1.8.6.jar
-pmml-sklearn-xgboost-1.8.6.jar
+pmml-sklearn-1.8.7.jar
+pmml-sklearn-extension-1.8.7.jar
+pmml-sklearn-h2o-1.8.7.jar
+pmml-sklearn-lightgbm-1.8.7.jar
+pmml-sklearn-statsmodels-1.8.7.jar
+pmml-sklearn-xgboost-1.8.7.jar
 pmml-statsmodels-1.1.1.jar
 pmml-xgboost-1.8.7.jar
 serpent-1.40.jar

diff --git a/...2pmml/resources/h2o-genmodel-3.46.0.5.jar → ...2pmml/resources/h2o-genmodel-3.46.0.6.jar b/...2pmml/resources/h2o-genmodel-3.46.0.5.jar → ...2pmml/resources/h2o-genmodel-3.46.0.6.jar
diff --git a/...rn2pmml/resources/h2o-logger-3.46.0.5.jar → ...rn2pmml/resources/h2o-logger-3.46.0.6.jar b/...rn2pmml/resources/h2o-logger-3.46.0.5.jar → ...rn2pmml/resources/h2o-logger-3.46.0.6.jar
diff --git a/...n2pmml/resources/pmml-converter-1.5.8.jar → ...n2pmml/resources/pmml-converter-1.5.9.jar b/...n2pmml/resources/pmml-converter-1.5.8.jar → ...n2pmml/resources/pmml-converter-1.5.9.jar
diff --git a/sklearn2pmml/resources/pmml-model-1.6.6.jar → sklearn2pmml/resources/pmml-model-1.6.7.jar b/sklearn2pmml/resources/pmml-model-1.6.6.jar → sklearn2pmml/resources/pmml-model-1.6.7.jar
diff --git a/...pmml/resources/pmml-model-metro-1.6.6.jar → ...pmml/resources/pmml-model-metro-1.6.7.jar b/...pmml/resources/pmml-model-metro-1.6.6.jar → ...pmml/resources/pmml-model-metro-1.6.7.jar
diff --git a/...arn2pmml/resources/pmml-sklearn-1.8.6.jar → ...arn2pmml/resources/pmml-sklearn-1.8.7.jar b/...arn2pmml/resources/pmml-sklearn-1.8.6.jar → ...arn2pmml/resources/pmml-sklearn-1.8.7.jar
diff --git a/...esources/pmml-sklearn-extension-1.8.6.jar → ...esources/pmml-sklearn-extension-1.8.7.jar b/...esources/pmml-sklearn-extension-1.8.6.jar → ...esources/pmml-sklearn-extension-1.8.7.jar
diff --git a/...pmml/resources/pmml-sklearn-h2o-1.8.6.jar → ...pmml/resources/pmml-sklearn-h2o-1.8.7.jar b/...pmml/resources/pmml-sklearn-h2o-1.8.6.jar → ...pmml/resources/pmml-sklearn-h2o-1.8.7.jar
diff --git a/...resources/pmml-sklearn-lightgbm-1.8.6.jar → ...resources/pmml-sklearn-lightgbm-1.8.7.jar b/...resources/pmml-sklearn-lightgbm-1.8.6.jar → ...resources/pmml-sklearn-lightgbm-1.8.7.jar
diff --git a/...ources/pmml-sklearn-statsmodels-1.8.6.jar → ...ources/pmml-sklearn-statsmodels-1.8.7.jar b/...ources/pmml-sklearn-statsmodels-1.8.6.jar → ...ources/pmml-sklearn-statsmodels-1.8.7.jar
diff --git a/.../resources/pmml-sklearn-xgboost-1.8.6.jar → .../resources/pmml-sklearn-xgboost-1.8.7.jar b/.../resources/pmml-sklearn-xgboost-1.8.6.jar → .../resources/pmml-sklearn-xgboost-1.8.7.jar
diff --git a/sklearn2pmml/resources/sklearn2pmml-1.0-SNAPSHOT.jar b/sklearn2pmml/resources/sklearn2pmml-1.0-SNAPSHOT.jar
diff --git a/src/main/java/com/sklearn2pmml/Main.java b/src/main/java/com/sklearn2pmml/Main.java
@@ -34,13 +34,13 @@
 import org.dmg.pmml.PMML;
 import org.dmg.pmml.Version;
 import org.jpmml.converter.Application;
-import org.jpmml.converter.SAXTransformerUtil;
 import org.jpmml.converter.VersionConverter;
-import org.jpmml.converter.visitors.VersionStandardizer;
 import org.jpmml.model.MarkupException;
-import org.jpmml.model.filters.ExportFilter;
+import org.jpmml.model.PMMLOutputStream;
 import org.jpmml.model.metro.MetroJAXBUtil;
 import org.jpmml.model.visitors.VersionChecker;
+import org.jpmml.model.visitors.VersionDowngrader;
+import org.jpmml.model.visitors.VersionStandardizer;
 import org.jpmml.python.PickleUtil;
 import org.jpmml.python.Storage;
 import org.jpmml.python.StorageUtil;
@@ -112,6 +112,9 @@ private void run() throws Exception {
 			VersionStandardizer versionStandardizer = new VersionStandardizer();
 			versionStandardizer.applyTo(pmml);
 
+			VersionDowngrader versionDowngrader = new VersionDowngrader(this.version);
+			versionDowngrader.applyTo(pmml);
+
 			VersionChecker versionChecker = new VersionChecker(this.version);
 			versionChecker.applyTo(pmml);
 
@@ -131,15 +134,9 @@ private void run() throws Exception {
 				}
 			}
 
-			File tempFile = File.createTempFile("sklearn2pmml-", ".pmml");
-
-			try(OutputStream os = new FileOutputStream(tempFile)){
+			try(OutputStream os = new PMMLOutputStream(new FileOutputStream(this.outputFile), this.version)){
 				MetroJAXBUtil.marshalPMML(pmml, os);
 			}
-
-			SAXTransformerUtil.transform(tempFile, this.outputFile, new ExportFilter(this.version));
-
-			tempFile.delete();
 		} else
 
 		{