Skip to content

Commit f6c9fc9

Browse files
author
GroG
committed
javacpp 1.5.11 and cpython 3.13.0
1 parent f4b2fca commit f6c9fc9

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

src/main/java/org/myrobotlab/service/meta/Deeplearning4jMeta.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public Deeplearning4jMeta() {
2323
addCategory("ai");
2424

2525
// Force javacpp 1.5.3 to resolve conflict between dl4j and javacv
26-
addDependency("org.bytedeco", "javacpp", "1.5.8");
26+
addDependency("org.bytedeco", "javacpp", "1.5.11");
2727

2828
// REMOVED FOR COLLISION
29-
// addDependency("org.bytedeco", "openblas", "0.3.21-" + "1.5.8");
29+
// addDependency("org.bytedeco", "openblas", "0.3.28-" + "1.5.11");
3030

3131
// dl4j deps.
3232
addDependency("org.deeplearning4j", "deeplearning4j-core", dl4jVersion);

src/main/java/org/myrobotlab/service/meta/OpenCVMeta.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public OpenCVMeta() {
1616

1717
addDescription("OpenCV (computer vision) service wrapping many of the functions and filters of OpenCV");
1818
addCategory("video", "vision", "sensors");
19-
String javaCvVersion = "1.5.8";
19+
String javaCvVersion = "1.5.11";
2020
// addDependency("org.bytedeco", "javacv", javaCvVersion);
2121
addDependency("org.bytedeco", "javacv-platform", javaCvVersion);
2222
addDependency("org.bytedeco", "javacpp", javaCvVersion);
23-
addDependency("org.bytedeco", "openblas", "0.3.21-" + javaCvVersion);
23+
addDependency("org.bytedeco", "openblas", "0.3.28-" + javaCvVersion);
2424
// FIXME - finish with cmdLine flag -gpu vs cudaEnabled for DL4J ?
2525
boolean gpu = false;
2626
if (gpu) {

src/main/java/org/myrobotlab/service/meta/Py4jMeta.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.myrobotlab.service.meta;
22

3-
import org.myrobotlab.framework.Platform;
43
import org.myrobotlab.logging.LoggerFactory;
54
import org.myrobotlab.service.meta.abstracts.MetaData;
65
import org.slf4j.Logger;
@@ -22,8 +21,8 @@ public Py4jMeta() {
2221

2322
// Used just as a Python exe redistributable.
2423
// ABSOLUTELY NO JNI/JNA IS USED
25-
addDependency("org.bytedeco", "cpython-platform", "3.10.8-1.5.8");
26-
addDependency("org.bytedeco", "cpython", "3.10.8-1.5.8");
24+
addDependency("org.bytedeco", "cpython-platform", "3.13.0-1.5.11");
25+
addDependency("org.bytedeco", "cpython", "3.13.0-1.5.11");
2726
}
2827

2928
}

src/main/java/org/myrobotlab/service/meta/TesseractOcrMeta.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public class TesseractOcrMeta extends MetaData {
1313
* dependencies, and all other meta data related to the service.
1414
*/
1515
public TesseractOcrMeta() {
16-
String javaCvVersion = "1.5.8";
16+
String javaCvVersion = "1.5.11";
1717

18-
String tesseractVersion = "5.2.0-" + javaCvVersion;
18+
String tesseractVersion = "5.5.0-" + javaCvVersion;
1919
addDescription("Optical character recognition - the ability to read");
2020
addCategory("ai", "vision");
2121
addDependency("org.bytedeco", "tesseract", tesseractVersion);
2222
addDependency("org.bytedeco", "tesseract-platform", tesseractVersion);
2323
addDependency("tesseract", "tessdata", "0.0.2", "zip");
24-
addDependency("org.bytedeco", "openblas", "0.3.21-" + javaCvVersion);
24+
addDependency("org.bytedeco", "openblas", "0.3.28-" + javaCvVersion);
2525

2626
}
2727

0 commit comments

Comments
 (0)