-
Notifications
You must be signed in to change notification settings - Fork 747
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.
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
Some modules support LoongArch64 #1401
base: master
Are you sure you want to change the base?
Some modules support LoongArch64 #1401
Conversation
@saudet RFR, thanks |
@@ -90,7 +90,7 @@ | |||
<configuration> | |||
<archive> | |||
<manifestEntries> | |||
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path> | |||
<Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-loongarch64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please put linux-loongarch64 after linux-arm64 for consistency, everywhere, here and in all the other files.
# | ||
|
||
-cmake_minimum_required(VERSION 3.16) | ||
+cmake_minimum_required(VERSION 3.13.4) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's use a sed command for small changes like this:
https://github.com/bytedeco/javacpp-presets/blob/master/onnxruntime/cppbuild.sh#L69
patch -Np1 -d $VO_AMRWBENC < ../../vo-amrwbenc-add-loongarch-cpuinfo.patch | ||
patch -Np1 -d $X264 < ../../x264-stable-add-loongarch-cpuinfo.patch | ||
patch -Np1 -d SVT-AV1-v$SVTAV1_VERSION < ../../change-cmake-version.patch | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we put all this under the case
for linux-loongarch64)
below?
if [ "$PATCH_ARCH" == "loongarch64" ]; then | ||
patch -Np1 -d libdc1394-$LIBDC1394_VERSION < ../../libdc1394-add-loongarch-cpuinfo.patch | ||
fi | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here as well, and in all the other cppbuild.sh files below please.
<artifactId>${javacpp.moduleId}</artifactId> | ||
<version>${project.version}</version> | ||
<classifier>${javacpp.platform.linux-loongarch64}</classifier> | ||
</dependency> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll need to keep these entries in all platform/pom.xml commented out until we're able to get builds running as part of CI. You can leave them there, but just in comments for now as per other ones in the files.
Thanks for wasting your valuable time. I'll make adjustments to the code based on your suggestions |
No description provided.