diff --git a/AnomalyDetection/Core/pom.xml b/AnomalyDetection/Core/pom.xml
index 64862926a..44d6fa9e4 100644
--- a/AnomalyDetection/Core/pom.xml
+++ b/AnomalyDetection/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-anomaly
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
AnomalyDetection-Core
diff --git a/AnomalyDetection/LibLinear/pom.xml b/AnomalyDetection/LibLinear/pom.xml
index 69bccd1e4..0198337b3 100644
--- a/AnomalyDetection/LibLinear/pom.xml
+++ b/AnomalyDetection/LibLinear/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-anomaly
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
AnomalyDetection-LibLinear
diff --git a/AnomalyDetection/LibSVM/pom.xml b/AnomalyDetection/LibSVM/pom.xml
index 23fc0a27d..dd7a383b7 100644
--- a/AnomalyDetection/LibSVM/pom.xml
+++ b/AnomalyDetection/LibSVM/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-anomaly
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
AnomalyDetection-LibSVM
diff --git a/AnomalyDetection/pom.xml b/AnomalyDetection/pom.xml
index f95ad4c7e..8c48134b8 100644
--- a/AnomalyDetection/pom.xml
+++ b/AnomalyDetection/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-anomaly
diff --git a/Classification/Core/pom.xml b/Classification/Core/pom.xml
index b0078edb6..4a22f9978 100644
--- a/Classification/Core/pom.xml
+++ b/Classification/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-Core
diff --git a/Classification/DecisionTree/pom.xml b/Classification/DecisionTree/pom.xml
index a9fc5f66f..8f14270a8 100644
--- a/Classification/DecisionTree/pom.xml
+++ b/Classification/DecisionTree/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-Tree
diff --git a/Classification/Experiments/pom.xml b/Classification/Experiments/pom.xml
index 186faf55c..8fdb35dd9 100644
--- a/Classification/Experiments/pom.xml
+++ b/Classification/Experiments/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-Experiments
diff --git a/Classification/Explanations/pom.xml b/Classification/Explanations/pom.xml
index 26ea96960..6831d9232 100644
--- a/Classification/Explanations/pom.xml
+++ b/Classification/Explanations/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-Explanations
diff --git a/Classification/LibLinear/pom.xml b/Classification/LibLinear/pom.xml
index 5404b9418..35e9fda4d 100644
--- a/Classification/LibLinear/pom.xml
+++ b/Classification/LibLinear/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-LibLinear
diff --git a/Classification/LibSVM/pom.xml b/Classification/LibSVM/pom.xml
index 8afe44cdd..63d2b8b4e 100644
--- a/Classification/LibSVM/pom.xml
+++ b/Classification/LibSVM/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-LibSVM
diff --git a/Classification/MultinomialNaiveBayes/pom.xml b/Classification/MultinomialNaiveBayes/pom.xml
index b35cb7c60..ee7352295 100644
--- a/Classification/MultinomialNaiveBayes/pom.xml
+++ b/Classification/MultinomialNaiveBayes/pom.xml
@@ -22,7 +22,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
Classification-MultinomialNaiveBayes
tribuo-classification-mnnaivebayes
diff --git a/Classification/SGD/pom.xml b/Classification/SGD/pom.xml
index 369c37fad..0451d81e7 100644
--- a/Classification/SGD/pom.xml
+++ b/Classification/SGD/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-SGD
diff --git a/Classification/XGBoost/pom.xml b/Classification/XGBoost/pom.xml
index d8fc67c3d..a58052fb9 100644
--- a/Classification/XGBoost/pom.xml
+++ b/Classification/XGBoost/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-classification
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Classification-XGBoost
diff --git a/Classification/pom.xml b/Classification/pom.xml
index ebc0f158c..4db14d54e 100644
--- a/Classification/pom.xml
+++ b/Classification/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-classification
diff --git a/Clustering/Core/pom.xml b/Clustering/Core/pom.xml
index 8e65ad3db..79b812016 100644
--- a/Clustering/Core/pom.xml
+++ b/Clustering/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-clustering
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Clustering-Core
diff --git a/Clustering/KMeans/pom.xml b/Clustering/KMeans/pom.xml
index 19b7143b8..d9307495f 100644
--- a/Clustering/KMeans/pom.xml
+++ b/Clustering/KMeans/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-clustering
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Clustering-KMeans
diff --git a/Clustering/pom.xml b/Clustering/pom.xml
index e138a005f..b523666e2 100644
--- a/Clustering/pom.xml
+++ b/Clustering/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-clustering
diff --git a/Common/LibLinear/pom.xml b/Common/LibLinear/pom.xml
index 1faedbf3c..0bd3e55d1 100644
--- a/Common/LibLinear/pom.xml
+++ b/Common/LibLinear/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-common
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Common-LibLinear
diff --git a/Common/LibSVM/pom.xml b/Common/LibSVM/pom.xml
index d13ffdac4..1f0887ba2 100644
--- a/Common/LibSVM/pom.xml
+++ b/Common/LibSVM/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-common
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Common-LibSVM
diff --git a/Common/NearestNeighbour/pom.xml b/Common/NearestNeighbour/pom.xml
index 429478849..93a90ec12 100644
--- a/Common/NearestNeighbour/pom.xml
+++ b/Common/NearestNeighbour/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-common
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Common-NearestNeighbour
diff --git a/Common/SGD/pom.xml b/Common/SGD/pom.xml
index d89095d5c..516cc94b9 100644
--- a/Common/SGD/pom.xml
+++ b/Common/SGD/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-common
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Common-SGD
diff --git a/Common/Trees/pom.xml b/Common/Trees/pom.xml
index 54dbf2a38..05105036a 100644
--- a/Common/Trees/pom.xml
+++ b/Common/Trees/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-common
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Common-Tree
diff --git a/Common/XGBoost/pom.xml b/Common/XGBoost/pom.xml
index 306e03161..5fda38753 100644
--- a/Common/XGBoost/pom.xml
+++ b/Common/XGBoost/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-common
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Common-XGBoost
diff --git a/Common/pom.xml b/Common/pom.xml
index 166920d5f..91f026a89 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-common
diff --git a/Core/pom.xml b/Core/pom.xml
index 7c7895003..a827c1ba0 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Core
diff --git a/Data/pom.xml b/Data/pom.xml
index d9c7f0d92..8fa2b0756 100644
--- a/Data/pom.xml
+++ b/Data/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Data
diff --git a/Interop/Core/pom.xml b/Interop/Core/pom.xml
index 4d99659e8..879b9542f 100644
--- a/Interop/Core/pom.xml
+++ b/Interop/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-interop
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Interop-Core
diff --git a/Interop/ONNX/pom.xml b/Interop/ONNX/pom.xml
index 01029ea4b..163c83b72 100644
--- a/Interop/ONNX/pom.xml
+++ b/Interop/ONNX/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-interop
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Interop-ONNX
diff --git a/Interop/Tensorflow/pom.xml b/Interop/Tensorflow/pom.xml
index 576bfb27f..a4fe49bab 100644
--- a/Interop/Tensorflow/pom.xml
+++ b/Interop/Tensorflow/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-interop
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Interop-Tensorflow
diff --git a/Interop/pom.xml b/Interop/pom.xml
index c71ebaa14..b95f5d039 100644
--- a/Interop/pom.xml
+++ b/Interop/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-interop
diff --git a/Json/pom.xml b/Json/pom.xml
index 9e2a78e69..bdb43cab8 100644
--- a/Json/pom.xml
+++ b/Json/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
4.0.0
Json
diff --git a/Math/pom.xml b/Math/pom.xml
index e591a1c3b..609bd0183 100644
--- a/Math/pom.xml
+++ b/Math/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Math
diff --git a/MultiLabel/Core/pom.xml b/MultiLabel/Core/pom.xml
index 6c85605d3..b9461c611 100644
--- a/MultiLabel/Core/pom.xml
+++ b/MultiLabel/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-multilabel
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
MultiLabel-Core
diff --git a/MultiLabel/SGD/pom.xml b/MultiLabel/SGD/pom.xml
index 47e391c27..2b37da8da 100644
--- a/MultiLabel/SGD/pom.xml
+++ b/MultiLabel/SGD/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-multilabel
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
MultiLabel-SGD
diff --git a/MultiLabel/pom.xml b/MultiLabel/pom.xml
index 2ba88c7ca..378419c52 100644
--- a/MultiLabel/pom.xml
+++ b/MultiLabel/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-multilabel
diff --git a/README.md b/README.md
index 9903f6656..68cad6683 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,7 @@ Currently we have interfaces to:
* [LibLinear](https://github.com/bwaldvogel/liblinear-java) - via the LibLinear-java port of the original [LibLinear](https://www.csie.ntu.edu.tw/~cjlin/liblinear/) (v2.43).
* [LibSVM](https://www.csie.ntu.edu.tw/~cjlin/libsvm/) - using the pure Java transformed version of the C++ implementation (v3.24).
* [ONNX Runtime](https://onnxruntime.ai) - via the Java API contributed by our group (v1.7.0).
-* [TensorFlow](https://tensorflow.org) - Using [TensorFlow Java](https://github.com/tensorflow/java) v0.3.1 (based on TensorFlow v2.4.1). This allows the training and deployment of TensorFlow models entirely in Java.
+* [TensorFlow](https://tensorflow.org) - Using [TensorFlow Java](https://github.com/tensorflow/java) v0.4.0 (based on TensorFlow v2.7.0). This allows the training and deployment of TensorFlow models entirely in Java.
* [XGBoost](https://xgboost.ai) - via the built in XGBoost4J API (v1.4.1).
## Binaries
@@ -174,13 +174,13 @@ Maven:
org.tribuo
tribuo-all
- 4.1.0
+ 4.1.1
pom
```
or from Gradle:
```groovy
-implementation ("org.tribuo:tribuo-all:4.1.0@pom") {
+implementation ("org.tribuo:tribuo-all:4.1.1@pom") {
transitive = true // for build.gradle (i.e., Groovy)
// isTransitive = true // for build.gradle.kts (i.e., Kotlin)
}
@@ -242,6 +242,7 @@ Tribuo is licensed under the [Apache 2.0 License](./LICENSE.txt).
## Release Notes:
+- v4.1.1 - Bug fixes for multidimensional regression, reproducibility fixes for liblinear and libsvm, fixes for KMeans and KNN running with SecurityManager, and updated TF-Java to fix bugs in upstream TF.
- v4.1.0 - Added TensorFlow training support, a BERT feature extractor, ExtraTrees, K-Means++, many linear model & CRF performance improvements, new tutorials on TF and document classification. Many bug fixes & documentation improvements.
- v4.0.2 - Many bug fixes (CSVDataSource, JsonDataSource, RowProcessor, LibSVMTrainer, Evaluations, Regressor serialization). Improved javadoc and documentation. Added two new tutorials (columnar data and external models).
- v4.0.1 - Bugfix for CSVReader to cope with blank lines, added IDXDataSource to allow loading of native MNIST format data.
diff --git a/Regression/Core/pom.xml b/Regression/Core/pom.xml
index dd0e85ddb..4ae1debb8 100644
--- a/Regression/Core/pom.xml
+++ b/Regression/Core/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-Core
diff --git a/Regression/LibLinear/pom.xml b/Regression/LibLinear/pom.xml
index 5a568be5e..edebae656 100644
--- a/Regression/LibLinear/pom.xml
+++ b/Regression/LibLinear/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-LibLinear
diff --git a/Regression/LibSVM/pom.xml b/Regression/LibSVM/pom.xml
index 5fa3f50a3..d8ec7c623 100644
--- a/Regression/LibSVM/pom.xml
+++ b/Regression/LibSVM/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-LibSVM
diff --git a/Regression/RegressionTree/pom.xml b/Regression/RegressionTree/pom.xml
index 61e2c49c1..dda354375 100644
--- a/Regression/RegressionTree/pom.xml
+++ b/Regression/RegressionTree/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-Tree
diff --git a/Regression/SGD/pom.xml b/Regression/SGD/pom.xml
index 1c2f945d4..4c99e1e08 100644
--- a/Regression/SGD/pom.xml
+++ b/Regression/SGD/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-SGD
diff --git a/Regression/SLM/pom.xml b/Regression/SLM/pom.xml
index 9df9aef96..fbc84ae15 100644
--- a/Regression/SLM/pom.xml
+++ b/Regression/SLM/pom.xml
@@ -20,7 +20,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-SLM
diff --git a/Regression/XGBoost/pom.xml b/Regression/XGBoost/pom.xml
index 1f8a7423c..6a8fe859b 100644
--- a/Regression/XGBoost/pom.xml
+++ b/Regression/XGBoost/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-regression
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Regression-XGBoost
diff --git a/Regression/pom.xml b/Regression/pom.xml
index 9f7df5b97..b82a83e7a 100644
--- a/Regression/pom.xml
+++ b/Regression/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-regression
diff --git a/Util/InformationTheory/pom.xml b/Util/InformationTheory/pom.xml
index 796d32841..926f1fc31 100644
--- a/Util/InformationTheory/pom.xml
+++ b/Util/InformationTheory/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-util
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
InformationTheory
diff --git a/Util/Tokenization/pom.xml b/Util/Tokenization/pom.xml
index 97e07b83b..17c841d32 100644
--- a/Util/Tokenization/pom.xml
+++ b/Util/Tokenization/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo-util
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
Tokenization
diff --git a/Util/pom.xml b/Util/pom.xml
index 9db67013e..7bda74ef5 100644
--- a/Util/pom.xml
+++ b/Util/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
tribuo-util
diff --git a/distribution/pom.xml b/distribution/pom.xml
index e5801cdeb..46cfeab71 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
diff --git a/docs/jep-290-filter.txt b/docs/jep-290-filter.txt
index 6de2395b2..3d004a0ca 100644
--- a/docs/jep-290-filter.txt
+++ b/docs/jep-290-filter.txt
@@ -1 +1 @@
-org.tribuo.**;libsvm.svm_model;libsvm.svm_parameter;libsvm.svm_node;de.bwaldvogel.liblinear.Model;de.bwaldvogel.liblinear.SolverType;java.util.**;java.lang.*;!*;
+org.tribuo.**;com.oracle.labs.mlrg.olcut.util.*;com.oracle.labs.mlrg.olcut.provenance.**;com.oracle.labs.mlrg.olcut.config.*;libsvm.svm_model;libsvm.svm_parameter;libsvm.svm_node;de.bwaldvogel.liblinear.Model;de.bwaldvogel.liblinear.SolverType;java.util.**;java.io.File;java.nio.file.Path;java.net.URL;java.time.*;java.lang.*;!*
diff --git a/pom.xml b/pom.xml
index c9342b9e9..e92c90434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.tribuo
tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
pom
Core
diff --git a/tests/pom.xml b/tests/pom.xml
index 411169056..a268df446 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
tribuo
org.tribuo
- 4.1.1-SNAPSHOT
+ 4.1.1
../pom.xml
4.0.0
diff --git a/tutorials/anomaly-tribuo-v4.ipynb b/tutorials/anomaly-tribuo-v4.ipynb
index d9c733174..fe4309cdb 100644
--- a/tutorials/anomaly-tribuo-v4.ipynb
+++ b/tutorials/anomaly-tribuo-v4.ipynb
@@ -19,7 +19,7 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-anomaly-libsvm-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-anomaly-libsvm-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -110,7 +110,7 @@
"obj = 293.8182352369252, rho = 3.201748862633537\n",
"nSV = 301, nBSV = 120\n",
"\n",
- "Training took (00:00:00:149)\n"
+ "Training took (00:00:00:211)\n"
]
}
],
@@ -209,7 +209,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/clustering-tribuo-v4.ipynb b/tutorials/clustering-tribuo-v4.ipynb
index 9f6f56aac..7ade6bbdf 100644
--- a/tutorials/clustering-tribuo-v4.ipynb
+++ b/tutorials/clustering-tribuo-v4.ipynb
@@ -19,7 +19,7 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-clustering-kmeans-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-clustering-kmeans-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -98,7 +98,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training with 5 clusters took (00:00:00:102)\n"
+ "Training with 5 clusters took (00:00:00:076)\n"
]
}
],
@@ -175,7 +175,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training with 5 clusters took (00:00:00:074)\n"
+ "Training with 5 clusters took (00:00:00:057)\n"
]
}
],
@@ -347,7 +347,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training with 5 clusters on 4 threads took (00:00:00:062)\n"
+ "Training with 5 clusters on 4 threads took (00:00:00:066)\n"
]
}
],
@@ -376,7 +376,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training with 20 clusters on 4 threads took (00:00:00:080)\n"
+ "Training with 20 clusters on 4 threads took (00:00:00:114)\n"
]
}
],
@@ -478,7 +478,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/columnar-tribuo-v4.ipynb b/tutorials/columnar-tribuo-v4.ipynb
index 36a27982e..ecd389a9b 100644
--- a/tutorials/columnar-tribuo-v4.ipynb
+++ b/tutorials/columnar-tribuo-v4.ipynb
@@ -38,8 +38,8 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-classification-experiments-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-json-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-classification-experiments-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-json-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -568,7 +568,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/configuration-tribuo-v4.ipynb b/tutorials/configuration-tribuo-v4.ipynb
index 47872ec4c..e3af24826 100644
--- a/tutorials/configuration-tribuo-v4.ipynb
+++ b/tutorials/configuration-tribuo-v4.ipynb
@@ -32,8 +32,8 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-classification-experiments-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-json-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-classification-experiments-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-json-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -487,7 +487,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training logistic regression took (00:00:03:669)\n"
+ "Training logistic regression took (00:00:05:330)\n"
]
}
],
@@ -805,7 +805,7 @@
"\t\t\t\t\t\t\tfeaturesPath = /Users/apocock/Development/Tribuo/tutorials/train-images-idx3-ubyte.gz\n",
"\t\t\t\t\t\t\tfeatures-file-modified-time = 2000-07-21T14:20:24-04:00\n",
"\t\t\t\t\t\t\toutput-resource-hash = 3552534A0A558BBED6AED32B30C495CCA23D567EC52CAC8BE1A0730E8010255C\n",
- "\t\t\t\t\t\t\tdatasource-creation-time = 2021-05-24T12:24:14.958637-04:00\n",
+ "\t\t\t\t\t\t\tdatasource-creation-time = 2021-12-10T11:47:09.089060-05:00\n",
"\t\t\t\t\t\t\toutput-file-modified-time = 2000-07-21T14:20:27-04:00\n",
"\t\t\t\t\t\t\tidx-feature-type = UBYTE\n",
"\t\t\t\t\t\t\tfeatures-resource-hash = 440FCABF73CC546FA21475E81EA370265605F56BE210A4024D2CA8F203523609\n",
@@ -817,7 +817,7 @@
"\t\t\t\t\tnum-examples = 60000\n",
"\t\t\t\t\tnum-features = 717\n",
"\t\t\t\t\tnum-outputs = 10\n",
- "\t\t\t\t\ttribuo-version = 4.1.0\n",
+ "\t\t\t\t\ttribuo-version = 4.1.1\n",
"\t\t\t\t)\n",
"\t\t\ttrainer = LinearSGDTrainer(\n",
"\t\t\t\t\tclass-name = org.tribuo.classification.sgd.linear.LinearSGDTrainer\n",
@@ -837,17 +837,17 @@
"\t\t\t\t\t\t\tclass-name = org.tribuo.classification.sgd.objectives.LogMulticlass\n",
"\t\t\t\t\t\t\thost-short-name = LabelObjective\n",
"\t\t\t\t\t\t)\n",
- "\t\t\t\t\ttribuo-version = 4.1.0\n",
+ "\t\t\t\t\ttribuo-version = 4.1.1\n",
"\t\t\t\t\ttrain-invocation-count = 0\n",
"\t\t\t\t\tis-sequence = false\n",
"\t\t\t\t\thost-short-name = Trainer\n",
"\t\t\t\t)\n",
- "\t\t\ttrained-at = 2021-05-24T12:24:19.604718-04:00\n",
+ "\t\t\ttrained-at = 2021-12-10T11:47:15.230398-05:00\n",
"\t\t\tinstance-values = Map{\n",
"\t\t\t\treconfigured-model=true\n",
"\t\t\t}\n",
- "\t\t\ttribuo-version = 4.1.0\n",
- "\t\t\tjava-version = 17-ea\n",
+ "\t\t\ttribuo-version = 4.1.1\n",
+ "\t\t\tjava-version = 11.0.10\n",
"\t\t\tos-name = Mac OS X\n",
"\t\t\tos-arch = x86_64\n",
"\t\t)\n",
@@ -862,7 +862,7 @@
"\t\t\t\t\tfeaturesPath = /Users/apocock/Development/Tribuo/tutorials/t10k-images-idx3-ubyte.gz\n",
"\t\t\t\t\tfeatures-file-modified-time = 2000-07-21T14:19:56-04:00\n",
"\t\t\t\t\toutput-resource-hash = F7AE60F92E00EC6DEBD23A6088C31DBD2371ECA3FFA0DEFAEFB259924204AEC6\n",
- "\t\t\t\t\tdatasource-creation-time = 2021-05-24T12:24:03.396403-04:00\n",
+ "\t\t\t\t\tdatasource-creation-time = 2021-12-10T11:46:46.771287-05:00\n",
"\t\t\t\t\toutput-file-modified-time = 2000-07-21T14:20:05-04:00\n",
"\t\t\t\t\tidx-feature-type = UBYTE\n",
"\t\t\t\t\tfeatures-resource-hash = 8D422C7B0A1C1C79245A5BCF07FE86E33EEAFEE792B84584AEC276F5A2DBC4E6\n",
@@ -874,9 +874,9 @@
"\t\t\tnum-examples = 10000\n",
"\t\t\tnum-features = 668\n",
"\t\t\tnum-outputs = 10\n",
- "\t\t\ttribuo-version = 4.1.0\n",
+ "\t\t\ttribuo-version = 4.1.1\n",
"\t\t)\n",
- "\ttribuo-version = 4.1.0\n",
+ "\ttribuo-version = 4.1.1\n",
")\n"
]
}
@@ -904,7 +904,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training transformed logistic regression took (00:00:05:252)\n"
+ "Training transformed logistic regression took (00:00:07:148)\n"
]
}
],
@@ -1111,7 +1111,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/document-classification-tribuo-v4.ipynb b/tutorials/document-classification-tribuo-v4.ipynb
index 0c56c915b..75a745360 100644
--- a/tutorials/document-classification-tribuo-v4.ipynb
+++ b/tutorials/document-classification-tribuo-v4.ipynb
@@ -49,8 +49,8 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-classification-experiments-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-onnx-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-classification-experiments-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-onnx-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -198,7 +198,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training the model on BoW features took (00:00:09:659)\n",
+ "Training the model on BoW features took (00:00:12:586)\n",
"\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 352 46 110 0.884 0.762 0.819\n",
@@ -291,7 +291,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training the model on Unigram features took (00:00:10:529)\n",
+ "Training the model on Unigram features took (00:00:11:234)\n",
"\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 362 36 88 0.910 0.804 0.854\n",
@@ -381,7 +381,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training the model on Bigram features took (00:00:41:981)\n",
+ "Training the model on Bigram features took (00:00:47:663)\n",
"\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 331 67 57 0.832 0.853 0.842\n",
@@ -480,7 +480,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training the model on TF-IDF features took (00:00:42:471)\n",
+ "Training the model on TF-IDF features took (00:00:47:049)\n",
"\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 350 48 183 0.879 0.657 0.752\n",
@@ -570,7 +570,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training the model on hashed features took (00:00:24:289)\n",
+ "Training the model on hashed features took (00:00:31:979)\n",
"\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 306 92 125 0.769 0.710 0.738\n",
@@ -662,7 +662,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training the model on trimmed TF-IDF features took (00:00:19:049)\n",
+ "Training the model on trimmed TF-IDF features took (00:00:23:625)\n",
"\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 337 61 93 0.847 0.784 0.814\n",
@@ -750,7 +750,7 @@
"text": [
"bert training data size = 11314, number of features = 768, number of classes = 20\n",
"bert testing data size = 7532, number of features = 768, number of classes = 20\n",
- "Extracting features with BERT took (01:06:52:756)\n"
+ "Extracting features with BERT took (01:00:41:372)\n"
]
}
],
@@ -789,7 +789,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training a LR on BERT features took (00:00:08:960)\n",
+ "Training a LR on BERT features took (00:00:04:506)\n",
"Class n tp fn fp recall prec f1\n",
"soc.religion.christian 398 353 45 111 0.887 0.761 0.819\n",
"rec.autos 396 332 64 99 0.838 0.770 0.803\n",
@@ -880,7 +880,7 @@
"\t\t\tclass-name = org.tribuo.classification.LabelFactory\n",
"\t\t)\n",
"\tfile-modified-time = 2003-03-18T07:24:55-05:00\n",
- "\tdatasource-creation-time = 2021-05-24T12:46:58.801385-04:00\n",
+ "\tdatasource-creation-time = 2021-12-10T12:13:40.560651-05:00\n",
")\n"
]
}
@@ -918,7 +918,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/external-models-tribuo-v4.ipynb b/tutorials/external-models-tribuo-v4.ipynb
index 7efb71265..9eb54824e 100644
--- a/tutorials/external-models-tribuo-v4.ipynb
+++ b/tutorials/external-models-tribuo-v4.ipynb
@@ -24,8 +24,8 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars tribuo-classification-experiments-4.1.0-jar-with-dependencies.jar\n",
- "%jars tribuo-onnx-4.1.0-jar-with-dependencies.jar"
+ "%jars tribuo-classification-experiments-4.1.1-jar-with-dependencies.jar\n",
+ "%jars tribuo-onnx-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -469,7 +469,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/irises-tribuo-v4.ipynb b/tutorials/irises-tribuo-v4.ipynb
index 2b25514e7..bc0c2ad46 100644
--- a/tutorials/irises-tribuo-v4.ipynb
+++ b/tutorials/irises-tribuo-v4.ipynb
@@ -27,8 +27,8 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-classification-experiments-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-json-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-classification-experiments-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-json-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -397,7 +397,7 @@
"\t\t\tclass-name = org.tribuo.classification.sgd.objectives.LogMulticlass\n",
"\t\t\thost-short-name = LabelObjective\n",
"\t\t)\n",
- "\ttribuo-version = 4.1.0\n",
+ "\ttribuo-version = 4.1.1\n",
"\ttrain-invocation-count = 0\n",
"\tis-sequence = false\n",
"\thost-short-name = Trainer\n",
@@ -458,7 +458,7 @@
" \"tribuo-version\" : {\n",
" \"marshalled-class\" : \"com.oracle.labs.mlrg.olcut.provenance.io.SimpleMarshalledProvenance\",\n",
" \"key\" : \"tribuo-version\",\n",
- " \"value\" : \"4.1.0\",\n",
+ " \"value\" : \"4.1.1\",\n",
" \"provenance-class\" : \"com.oracle.labs.mlrg.olcut.provenance.primitives.StringProvenance\",\n",
" \"additional\" : \"\",\n",
" \"is-reference\" : false\n",
@@ -466,7 +466,7 @@
" \"java-version\" : {\n",
" \"marshalled-class\" : \"com.oracle.labs.mlrg.olcut.provenance.io.SimpleMarshalledProvenance\",\n",
" \"key\" : \"java-version\",\n",
- " \"value\" : \"17-ea\",\n",
+ " \"value\" : \"11.0.10\",\n",
" \"provenance-class\" : \"com.oracle.labs.mlrg.olcut.provenance.primitives.StringProvenance\",\n",
" \"additional\" : \"\",\n",
" \"is-reference\" : false\n",
@@ -490,7 +490,7 @@
" \"trained-at\" : {\n",
" \"marshalled-class\" : \"com.oracle.labs.mlrg.olcut.provenance.io.SimpleMarshalledProvenance\",\n",
" \"key\" : \"trained-at\",\n",
- " \"value\" : \"2021-05-24T12:27:10.387150-04:00\",\n",
+ " \"value\" : \"2021-12-10T11:52:04.588461-05:00\",\n",
" \"provenance-class\" : \"com.oracle.labs.mlrg.olcut.provenance.primitives.DateTimeProvenance\",\n",
" \"additional\" : \"\",\n",
" \"is-reference\" : false\n",
@@ -553,7 +553,7 @@
" \"tribuo-version\" : {\n",
" \"marshalled-class\" : \"com.oracle.labs.mlrg.olcut.provenance.io.SimpleMarshalledProvenance\",\n",
" \"key\" : \"tribuo-version\",\n",
- " \"value\" : \"4.1.0\",\n",
+ " \"value\" : \"4.1.1\",\n",
" \"provenance-class\" : \"com.oracle.labs.mlrg.olcut.provenance.primitives.StringProvenance\",\n",
" \"additional\" : \"\",\n",
" \"is-reference\" : false\n",
@@ -612,7 +612,7 @@
" \"tribuo-version\" : {\n",
" \"marshalled-class\" : \"com.oracle.labs.mlrg.olcut.provenance.io.SimpleMarshalledProvenance\",\n",
" \"key\" : \"tribuo-version\",\n",
- " \"value\" : \"4.1.0\",\n",
+ " \"value\" : \"4.1.1\",\n",
" \"provenance-class\" : \"com.oracle.labs.mlrg.olcut.provenance.primitives.StringProvenance\",\n",
" \"additional\" : \"\",\n",
" \"is-reference\" : false\n",
@@ -940,7 +940,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "linear-sgd-model - Model(class-name=org.tribuo.classification.sgd.linear.LinearSGDModel,dataset=Dataset(class-name=org.tribuo.MutableDataset,datasource=SplitDataSourceProvenance(className=org.tribuo.evaluation.TrainTestSplitter,innerSourceProvenance=CSV(class-name=org.tribuo.data.csv.CSVLoader,outputFactory=OutputFactory(class-name=org.tribuo.classification.LabelFactory),response-name=species,separator=,,quote=\",path=file:/Users/apocock/Development/Tribuo/tutorials/bezdekIris.data,file-modified-time=1999-12-14T15:12:39-05:00,resource-hash=SHA-256[0FED2A99DB77EC533A62DC66894D3EC6DF3B58B6A8F3CF4A6B47E4086B7F97DC]),trainProportion=0.7,seed=1,size=150,isTrain=true),transformations=[],is-sequence=false,is-dense=true,num-examples=105,num-features=4,num-outputs=3,tribuo-version=4.1.0),trainer=Trainer(class-name=org.tribuo.classification.sgd.linear.LogisticRegressionTrainer,seed=12345,minibatchSize=1,shuffle=true,epochs=5,optimiser=StochasticGradientOptimiser(class-name=org.tribuo.math.optimisers.AdaGrad,epsilon=0.1,initialLearningRate=1.0,initialValue=0.0,host-short-name=StochasticGradientOptimiser),loggingInterval=1000,objective=LabelObjective(class-name=org.tribuo.classification.sgd.objectives.LogMulticlass,host-short-name=LabelObjective),tribuo-version=4.1.0,train-invocation-count=0,is-sequence=false,host-short-name=Trainer),trained-at=2021-05-24T12:27:10.387150-04:00,instance-values={},tribuo-version=4.1.0,java-version=17-ea,os-name=Mac OS X,os-arch=x86_64)\n"
+ "linear-sgd-model - Model(class-name=org.tribuo.classification.sgd.linear.LinearSGDModel,dataset=Dataset(class-name=org.tribuo.MutableDataset,datasource=SplitDataSourceProvenance(className=org.tribuo.evaluation.TrainTestSplitter,innerSourceProvenance=CSV(class-name=org.tribuo.data.csv.CSVLoader,outputFactory=OutputFactory(class-name=org.tribuo.classification.LabelFactory),response-name=species,separator=,,quote=\",path=file:/Users/apocock/Development/Tribuo/tutorials/bezdekIris.data,file-modified-time=1999-12-14T15:12:39-05:00,resource-hash=SHA-256[0FED2A99DB77EC533A62DC66894D3EC6DF3B58B6A8F3CF4A6B47E4086B7F97DC]),trainProportion=0.7,seed=1,size=150,isTrain=true),transformations=[],is-sequence=false,is-dense=true,num-examples=105,num-features=4,num-outputs=3,tribuo-version=4.1.1),trainer=Trainer(class-name=org.tribuo.classification.sgd.linear.LogisticRegressionTrainer,seed=12345,minibatchSize=1,shuffle=true,epochs=5,optimiser=StochasticGradientOptimiser(class-name=org.tribuo.math.optimisers.AdaGrad,epsilon=0.1,initialLearningRate=1.0,initialValue=0.0,host-short-name=StochasticGradientOptimiser),loggingInterval=1000,objective=LabelObjective(class-name=org.tribuo.classification.sgd.objectives.LogMulticlass,host-short-name=LabelObjective),tribuo-version=4.1.1,train-invocation-count=0,is-sequence=false,host-short-name=Trainer),trained-at=2021-12-10T11:52:04.588461-05:00,instance-values={},tribuo-version=4.1.1,java-version=11.0.10,os-name=Mac OS X,os-arch=x86_64)\n"
]
}
],
@@ -965,12 +965,12 @@
"output_type": "stream",
"text": [
"{\n",
- " \"tribuo-version\" : \"4.1.0\",\n",
+ " \"tribuo-version\" : \"4.1.1\",\n",
" \"dataset-provenance\" : {\n",
" \"num-features\" : \"4\",\n",
" \"num-examples\" : \"45\",\n",
" \"num-outputs\" : \"3\",\n",
- " \"tribuo-version\" : \"4.1.0\",\n",
+ " \"tribuo-version\" : \"4.1.1\",\n",
" \"datasource\" : {\n",
" \"train-proportion\" : \"0.7\",\n",
" \"seed\" : \"1\",\n",
@@ -998,11 +998,11 @@
" \"class-name\" : \"org.tribuo.provenance.EvaluationProvenance\",\n",
" \"model-provenance\" : {\n",
" \"instance-values\" : { },\n",
- " \"tribuo-version\" : \"4.1.0\",\n",
- " \"java-version\" : \"17-ea\",\n",
+ " \"tribuo-version\" : \"4.1.1\",\n",
+ " \"java-version\" : \"11.0.10\",\n",
" \"trainer\" : {\n",
" \"seed\" : \"12345\",\n",
- " \"tribuo-version\" : \"4.1.0\",\n",
+ " \"tribuo-version\" : \"4.1.1\",\n",
" \"minibatchSize\" : \"1\",\n",
" \"train-invocation-count\" : \"0\",\n",
" \"is-sequence\" : \"false\",\n",
@@ -1024,13 +1024,13 @@
" }\n",
" },\n",
" \"os-arch\" : \"x86_64\",\n",
- " \"trained-at\" : \"2021-05-24T12:27:10.387150-04:00\",\n",
+ " \"trained-at\" : \"2021-12-10T11:52:04.588461-05:00\",\n",
" \"os-name\" : \"Mac OS X\",\n",
" \"dataset\" : {\n",
" \"num-features\" : \"4\",\n",
" \"num-examples\" : \"105\",\n",
" \"num-outputs\" : \"3\",\n",
- " \"tribuo-version\" : \"4.1.0\",\n",
+ " \"tribuo-version\" : \"4.1.1\",\n",
" \"datasource\" : {\n",
" \"train-proportion\" : \"0.7\",\n",
" \"seed\" : \"1\",\n",
@@ -1112,7 +1112,7 @@
},
"outputs": [],
"source": [
- "String filterPattern = Files.readAllLines(Paths.get(\"../docs/jep-290-allowlist.txt\")).get(0);\n",
+ "String filterPattern = Files.readAllLines(Paths.get(\"../docs/jep-290-filter.txt\")).get(0);\n",
"ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(filterPattern);\n",
"Model> loadedModel;\n",
"try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(tmpFile)))) {\n",
@@ -1199,7 +1199,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/regression-tribuo-v4.ipynb b/tutorials/regression-tribuo-v4.ipynb
index 4e31561f1..7f8584a43 100644
--- a/tutorials/regression-tribuo-v4.ipynb
+++ b/tutorials/regression-tribuo-v4.ipynb
@@ -23,10 +23,10 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-json-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-regression-sgd-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-regression-xgboost-4.1.0-jar-with-dependencies.jar\n",
- "%jars ./tribuo-regression-tree-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-json-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-regression-sgd-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-regression-xgboost-4.1.1-jar-with-dependencies.jar\n",
+ "%jars ./tribuo-regression-tree-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -264,7 +264,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training Linear Regression (SGD) took (00:00:00:123)\n",
+ "Training Linear Regression (SGD) took (00:00:00:107)\n",
"Evaluation (train):\n",
" RMSE 0.979522\n",
" MAE 0.741870\n",
@@ -357,7 +357,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training Linear Regression (AdaGrad) took (00:00:00:091)\n",
+ "Training Linear Regression (AdaGrad) took (00:00:00:083)\n",
"Evaluation (train):\n",
" RMSE 0.735311\n",
" MAE 0.575096\n",
@@ -403,7 +403,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training CART took (00:00:00:060)\n",
+ "Training CART took (00:00:00:079)\n",
"Evaluation (train):\n",
" RMSE 0.544516\n",
" MAE 0.405062\n",
@@ -436,7 +436,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Training XGBoost took (00:00:00:320)\n",
+ "Training XGBoost took (00:00:00:480)\n",
"Evaluation (train):\n",
" RMSE 0.143871\n",
" MAE 0.097167\n",
@@ -477,7 +477,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17-ea+22-1964"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,
diff --git a/tutorials/tensorflow-tribuo-v4.ipynb b/tutorials/tensorflow-tribuo-v4.ipynb
index 909a75d87..fe24c8455 100644
--- a/tutorials/tensorflow-tribuo-v4.ipynb
+++ b/tutorials/tensorflow-tribuo-v4.ipynb
@@ -41,7 +41,7 @@
"metadata": {},
"outputs": [],
"source": [
- "%jars ./tribuo-tensorflow-4.1.0-jar-with-dependencies.jar"
+ "%jars ./tribuo-tensorflow-4.1.1-jar-with-dependencies.jar"
]
},
{
@@ -274,7 +274,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "Wine quality training took (00:00:02:519)\n"
+ "Wine quality training took (00:00:02:650)\n"
]
}
],
@@ -302,9 +302,9 @@
"output_type": "stream",
"text": [
"Wine quality evaluation:\n",
- " RMSE 0.651519\n",
- " MAE 0.509955\n",
- " R^2 0.347267\n",
+ " RMSE 0.650824\n",
+ " MAE 0.510311\n",
+ " R^2 0.348659\n",
"\n"
]
}
@@ -394,7 +394,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "MNIST MLP training took (00:01:00:660)\n"
+ "MNIST MLP training took (00:01:17:653)\n"
]
}
],
@@ -422,32 +422,32 @@
"output_type": "stream",
"text": [
"Class n tp fn fp recall prec f1\n",
- "0 980 0 980 0 0.000 0.000 0.000\n",
- "1 1,135 1,135 0 8,865 1.000 0.114 0.204\n",
- "2 1,032 0 1,032 0 0.000 0.000 0.000\n",
- "3 1,010 0 1,010 0 0.000 0.000 0.000\n",
- "4 982 0 982 0 0.000 0.000 0.000\n",
- "5 892 0 892 0 0.000 0.000 0.000\n",
- "6 958 0 958 0 0.000 0.000 0.000\n",
- "7 1,028 0 1,028 0 0.000 0.000 0.000\n",
- "8 974 0 974 0 0.000 0.000 0.000\n",
- "9 1,009 0 1,009 0 0.000 0.000 0.000\n",
- "Total 10,000 1,135 8,865 8,865\n",
- "Accuracy 0.114\n",
- "Micro Average 0.114 0.114 0.114\n",
- "Macro Average 0.100 0.011 0.020\n",
- "Balanced Error Rate 0.900\n",
+ "0 980 951 29 41 0.970 0.959 0.965\n",
+ "1 1,135 1,101 34 10 0.970 0.991 0.980\n",
+ "2 1,032 897 135 44 0.869 0.953 0.909\n",
+ "3 1,010 930 80 75 0.921 0.925 0.923\n",
+ "4 982 850 132 520 0.866 0.620 0.723\n",
+ "5 892 795 97 107 0.891 0.881 0.886\n",
+ "6 958 921 37 33 0.961 0.965 0.963\n",
+ "7 1,028 935 93 21 0.910 0.978 0.943\n",
+ "8 974 892 82 236 0.916 0.791 0.849\n",
+ "9 1,009 473 536 168 0.469 0.738 0.573\n",
+ "Total 10,000 8,745 1,255 1,255\n",
+ "Accuracy 0.875\n",
+ "Micro Average 0.875 0.875 0.875\n",
+ "Macro Average 0.874 0.880 0.871\n",
+ "Balanced Error Rate 0.126\n",
" 0 1 2 3 4 5 6 7 8 9\n",
- "0 0 980 0 0 0 0 0 0 0 0\n",
- "1 0 1,135 0 0 0 0 0 0 0 0\n",
- "2 0 1,032 0 0 0 0 0 0 0 0\n",
- "3 0 1,010 0 0 0 0 0 0 0 0\n",
- "4 0 982 0 0 0 0 0 0 0 0\n",
- "5 0 892 0 0 0 0 0 0 0 0\n",
- "6 0 958 0 0 0 0 0 0 0 0\n",
- "7 0 1,028 0 0 0 0 0 0 0 0\n",
- "8 0 974 0 0 0 0 0 0 0 0\n",
- "9 0 1,009 0 0 0 0 0 0 0 0\n",
+ "0 951 0 1 2 3 5 3 1 8 6\n",
+ "1 0 1,101 2 1 0 20 4 0 6 1\n",
+ "2 6 0 897 23 5 5 2 7 83 4\n",
+ "3 0 0 18 930 0 32 0 3 23 4\n",
+ "4 1 0 2 0 850 1 14 2 7 105\n",
+ "5 5 4 2 37 6 795 6 2 22 13\n",
+ "6 8 3 2 1 6 10 921 0 4 3\n",
+ "7 2 1 7 3 23 2 1 935 43 11\n",
+ "8 11 0 10 7 6 21 1 5 892 21\n",
+ "9 8 2 0 1 471 11 2 1 40 473\n",
"\n"
]
}
@@ -490,14 +490,14 @@
},
{
"cell_type": "code",
- "execution_count": 17,
+ "execution_count": 24,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "MNIST CNN training took (00:03:09:806)\n"
+ "MNIST CNN training took (00:03:31:060)\n"
]
}
],
@@ -530,7 +530,7 @@
},
{
"cell_type": "code",
- "execution_count": 18,
+ "execution_count": 25,
"metadata": {},
"outputs": [
{
@@ -538,32 +538,32 @@
"output_type": "stream",
"text": [
"Class n tp fn fp recall prec f1\n",
- "0 980 973 7 11 0.993 0.989 0.991\n",
- "1 1,135 1,129 6 14 0.995 0.988 0.991\n",
- "2 1,032 1,024 8 31 0.992 0.971 0.981\n",
- "3 1,010 989 21 17 0.979 0.983 0.981\n",
- "4 982 965 17 14 0.983 0.986 0.984\n",
- "5 892 865 27 22 0.970 0.975 0.972\n",
- "6 958 936 22 2 0.977 0.998 0.987\n",
- "7 1,028 1,003 25 13 0.976 0.987 0.981\n",
+ "0 980 976 4 20 0.996 0.980 0.988\n",
+ "1 1,135 1,131 4 13 0.996 0.989 0.993\n",
+ "2 1,032 1,018 14 26 0.986 0.975 0.981\n",
+ "3 1,010 993 17 10 0.983 0.990 0.987\n",
+ "4 982 974 8 28 0.992 0.972 0.982\n",
+ "5 892 874 18 41 0.980 0.955 0.967\n",
+ "6 958 915 43 6 0.955 0.993 0.974\n",
+ "7 1,028 995 33 18 0.968 0.982 0.975\n",
"8 974 948 26 15 0.973 0.984 0.979\n",
- "9 1,009 997 12 32 0.988 0.969 0.978\n",
- "Total 10,000 9,829 171 171\n",
- "Accuracy 0.983\n",
- "Micro Average 0.983 0.983 0.983\n",
- "Macro Average 0.983 0.983 0.983\n",
- "Balanced Error Rate 0.017\n",
+ "9 1,009 977 32 22 0.968 0.978 0.973\n",
+ "Total 10,000 9,801 199 199\n",
+ "Accuracy 0.980\n",
+ "Micro Average 0.980 0.980 0.980\n",
+ "Macro Average 0.980 0.980 0.980\n",
+ "Balanced Error Rate 0.020\n",
" 0 1 2 3 4 5 6 7 8 9\n",
- "0 973 2 0 0 0 0 0 2 3 0\n",
- "1 0 1,129 2 1 1 0 0 0 2 0\n",
- "2 1 3 1,024 0 0 0 0 2 2 0\n",
- "3 0 0 4 989 0 9 0 4 1 3\n",
- "4 0 1 1 0 965 0 1 0 0 14\n",
- "5 1 2 1 10 1 865 1 1 5 5\n",
- "6 6 4 3 1 1 7 936 0 0 0\n",
- "7 0 2 14 0 1 0 0 1,003 1 7\n",
- "8 3 0 6 4 3 5 0 2 948 3\n",
- "9 0 0 0 1 7 1 0 2 1 997\n",
+ "0 976 1 0 0 0 0 0 2 1 0\n",
+ "1 0 1,131 1 0 0 2 0 0 1 0\n",
+ "2 0 3 1,018 1 2 0 0 2 6 0\n",
+ "3 1 1 3 993 0 6 0 2 1 3\n",
+ "4 0 0 1 0 974 0 5 0 0 2\n",
+ "5 3 0 0 4 0 874 1 2 2 6\n",
+ "6 11 5 1 0 4 20 915 0 1 1\n",
+ "7 0 3 18 3 3 0 0 995 1 5\n",
+ "8 4 0 2 2 2 11 0 0 948 5\n",
+ "9 1 0 0 0 17 2 0 10 2 977\n",
"\n"
]
}
@@ -719,7 +719,7 @@
"mimetype": "text/x-java-source",
"name": "Java",
"pygments_lexer": "java",
- "version": "17+35-LTS-2724"
+ "version": "11.0.10+8-LTS-162"
}
},
"nbformat": 4,