Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove requires in *-platform modules #900

Merged
merged 4 commits into from
Jun 29, 2020
Merged

Remove requires in *-platform modules #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f80b7d3
Add static to platform requires
HGuillemet Jun 10, 2020
5b75e89
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets …
HGuillemet Jun 27, 2020
b09e7d9
Replace requires with requires static
HGuillemet Jun 27, 2020
b12a2d6
Update CHANGELOG.md and add missing `requires static`
saudet Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Replace `requires` with `requires static` in JPMS `.platform` modules ([pull #900](https://github.com/bytedeco/javacpp-presets/pull/900))
* Add presets for OpenPose 1.6.0 ([pull #898](https://github.com/bytedeco/javacpp-presets/pull/898))
* Add comparison against MKL in `llvm/samples/polly/MatMulBenchmark.java`
* Add `requires org.bytedeco.javacpp.${javacpp.platform.module}` to load `jnijavacpp` with JPMS ([pull #893](https://github.com/bytedeco/javacpp-presets/pull/893))
Expand Down
10 changes: 5 additions & 5 deletions ale/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
16 changes: 8 additions & 8 deletions arpack-ng/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.packageName}.platform {
requires org.bytedeco.${javacpp.packageName}.linux.x86;
requires org.bytedeco.${javacpp.packageName}.linux.x86_64;
requires org.bytedeco.${javacpp.packageName}.linux.armhf;
requires org.bytedeco.${javacpp.packageName}.linux.arm64;
requires org.bytedeco.${javacpp.packageName}.linux.ppc64le;
requires org.bytedeco.${javacpp.packageName}.macosx.x86_64;
requires org.bytedeco.${javacpp.packageName}.windows.x86;
requires org.bytedeco.${javacpp.packageName}.windows.x86_64;
requires static org.bytedeco.${javacpp.packageName}.linux.x86;
requires static org.bytedeco.${javacpp.packageName}.linux.x86_64;
requires static org.bytedeco.${javacpp.packageName}.linux.armhf;
requires static org.bytedeco.${javacpp.packageName}.linux.arm64;
requires static org.bytedeco.${javacpp.packageName}.linux.ppc64le;
requires static org.bytedeco.${javacpp.packageName}.macosx.x86_64;
requires static org.bytedeco.${javacpp.packageName}.windows.x86;
requires static org.bytedeco.${javacpp.packageName}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
6 changes: 3 additions & 3 deletions arrow/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
24 changes: 12 additions & 12 deletions artoolkitplus/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,18 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
// requires org.bytedeco.${javacpp.moduleId}.android.arm;
// requires org.bytedeco.${javacpp.moduleId}.android.arm64;
// requires org.bytedeco.${javacpp.moduleId}.android.x86;
// requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
// requires static org.bytedeco.${javacpp.moduleId}.android.arm;
// requires static org.bytedeco.${javacpp.moduleId}.android.arm64;
// requires static org.bytedeco.${javacpp.moduleId}.android.x86;
// requires static org.bytedeco.${javacpp.moduleId}.android.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
6 changes: 3 additions & 3 deletions caffe/platform/gpu/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
<module>
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64.gpu;
// requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64.gpu;
module org.bytedeco.${javacpp.moduleId}.platform.gpu {
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64.gpu;
// requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64.gpu;
}
</moduleInfoSource>
</module>
Expand Down
6 changes: 3 additions & 3 deletions caffe/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
24 changes: 12 additions & 12 deletions chilitags/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,18 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
// requires org.bytedeco.${javacpp.moduleId}.android.arm;
// requires org.bytedeco.${javacpp.moduleId}.android.arm64;
// requires org.bytedeco.${javacpp.moduleId}.android.x86;
// requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
// requires static org.bytedeco.${javacpp.moduleId}.android.arm;
// requires static org.bytedeco.${javacpp.moduleId}.android.arm64;
// requires static org.bytedeco.${javacpp.moduleId}.android.x86;
// requires static org.bytedeco.${javacpp.moduleId}.android.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
16 changes: 8 additions & 8 deletions cminpack/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
24 changes: 12 additions & 12 deletions cpu_features/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,18 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
// requires org.bytedeco.${javacpp.moduleId}.android.arm;
// requires org.bytedeco.${javacpp.moduleId}.android.arm64;
// requires org.bytedeco.${javacpp.moduleId}.android.x86;
// requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
// requires static org.bytedeco.${javacpp.moduleId}.android.arm;
// requires static org.bytedeco.${javacpp.moduleId}.android.arm64;
// requires static org.bytedeco.${javacpp.moduleId}.android.x86;
// requires static org.bytedeco.${javacpp.moduleId}.android.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
16 changes: 8 additions & 8 deletions cpython/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86;
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
8 changes: 4 additions & 4 deletions cuda/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
// requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le;
// requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
10 changes: 5 additions & 5 deletions cuda/platform/redist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@
<module>
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64.redist;
requires org.bytedeco.${javacpp.moduleId}.linux.ppc64le.redist;
// requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64.redist;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64.redist;
module org.bytedeco.${javacpp.moduleId}.platform.redist {
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64.redist;
requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le.redist;
// requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64.redist;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64.redist;
}
</moduleInfoSource>
</module>
Expand Down
6 changes: 3 additions & 3 deletions dnnl/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@
<file>${project.build.directory}/${project.artifactId}.jar</file>
<moduleInfoSource>
module org.bytedeco.${javacpp.moduleId}.platform {
requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires org.bytedeco.${javacpp.moduleId}.windows.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down
Loading