From 14700ccc9f949dc46968aaba0f49b48037c023b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Guillemet?= Date: Mon, 4 May 2020 23:30:49 +0200 Subject: [PATCH 1/2] Fix various typo in module-info exports --- arpack-ng/src/main/java9/module-info.java | 2 +- gsl/src/main/java9/module-info.java | 2 +- gym/src/main/java9/module-info.java | 2 -- mxnet/src/main/java9/module-info.java | 2 +- scipy/src/main/java9/module-info.java | 2 -- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arpack-ng/src/main/java9/module-info.java b/arpack-ng/src/main/java9/module-info.java index 632de9b1ea6..fa4c08e8d96 100644 --- a/arpack-ng/src/main/java9/module-info.java +++ b/arpack-ng/src/main/java9/module-info.java @@ -2,5 +2,5 @@ requires transitive org.bytedeco.javacpp; requires transitive org.bytedeco.openblas; exports org.bytedeco.arpackng.global; - exports org.bytedeco.arpacking.presets; + exports org.bytedeco.arpackng.presets; } diff --git a/gsl/src/main/java9/module-info.java b/gsl/src/main/java9/module-info.java index aedafbcdbde..f633bc200a3 100644 --- a/gsl/src/main/java9/module-info.java +++ b/gsl/src/main/java9/module-info.java @@ -2,6 +2,6 @@ requires transitive org.bytedeco.javacpp; requires transitive org.bytedeco.openblas; exports org.bytedeco.gsl.global; - exports org.bytedeco.gls.presets; + exports org.bytedeco.gsl.presets; exports org.bytedeco.gsl; } diff --git a/gym/src/main/java9/module-info.java b/gym/src/main/java9/module-info.java index cb5af8b3b44..8aa62b02228 100644 --- a/gym/src/main/java9/module-info.java +++ b/gym/src/main/java9/module-info.java @@ -1,6 +1,4 @@ module org.bytedeco.gym { requires transitive org.bytedeco.javacpp; - exports org.bytedeco.gym.global; exports org.bytedeco.gym.presets; - exports org.bytedeco.gym; } diff --git a/mxnet/src/main/java9/module-info.java b/mxnet/src/main/java9/module-info.java index 5ddaf7467a5..86d61a81a95 100644 --- a/mxnet/src/main/java9/module-info.java +++ b/mxnet/src/main/java9/module-info.java @@ -23,5 +23,5 @@ exports org.apache.mxnet.spark.example; exports org.apache.mxnet.spark.transformer; exports org.apache.mxnet.spark.io; - exports org.apache.mxnet.spark.optimizer; + exports org.apache.mxnet.optimizer; } diff --git a/scipy/src/main/java9/module-info.java b/scipy/src/main/java9/module-info.java index 30503b807a1..35d0330e838 100644 --- a/scipy/src/main/java9/module-info.java +++ b/scipy/src/main/java9/module-info.java @@ -1,6 +1,4 @@ module org.bytedeco.scipy { requires transitive org.bytedeco.javacpp; - exports org.bytedeco.scipy.global; exports org.bytedeco.scipy.presets; - exports org.bytedeco.scipy; } From 447f8f958077e12b8d76ccea10f12b47fd8e4738 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Wed, 6 May 2020 07:29:26 +0900 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8ba1b64952..3757c168fee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ + * Fix JPMS modules for CUDA, ARPACK-NG, GSL, SciPy, Gym, MXNet ([pull #880](https://github.com/bytedeco/javacpp-presets/pull/880) and [pull #881](https://github.com/bytedeco/javacpp-presets/pull/881)) * Build OpenBLAS with a `TARGET` even for `DYNAMIC_ARCH` to avoid SIGILL ([issue eclipse/deeplearning4j#8747](https://github.com/eclipse/deeplearning4j/issues/8747)) * Upgrade presets for Arrow 0.17.0, MKL-DNN 0.21.5, DNNL 1.4, NumPy 1.18.3, and their dependencies * Add `FullOptimization.h` allowing users to fully optimize LLVM modules ([pull #869](https://github.com/bytedeco/javacpp-presets/pull/869))