From 009edd32bd5e166df014f1686696f880e7b3bc6e Mon Sep 17 00:00:00 2001 From: Kelvin Tan Date: Sat, 11 Nov 2023 10:25:28 -0800 Subject: [PATCH 1/3] Update Java's step-by-step building and running instructions. This has only been tested on Ubuntu. The Windows version is not tested but likely to be correct. --- CONTRIBUTING.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0663405b..42df658b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -238,15 +238,18 @@ java -cp . -Djava.library.path="$(pwd)/build/libs/usearch/shared" java/cloud/unu Or step by-step: ```sh -cs java/unum/cloud/usearch -javac -h . Index.java +cd java/cloud/unum/usearch +javac -h . Index.java NativeUtils.java + +# Ensure JAVA_HOME system environment variable has been set +# e.g. export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 # Ubuntu: -g++ -c -fPIC -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux cloud_unum_usearch_Index.cpp -o cloud_unum_usearch_Index.o -g++ -shared -fPIC -o libusearch_c.so cloud_unum_usearch_Index.o -lc +g++ -c -fPIC -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux -I../../../../include cloud_unum_usearch_Index.cpp -o cloud_unum_usearch_Index.o +g++ -shared -fPIC -o libusearch.so cloud_unum_usearch_Index.o -lc # Windows -g++ -c -I%JAVA_HOME%\include -I%JAVA_HOME%\include\win32 cloud_unum_usearch_Index.cpp -o cloud_unum_usearch_Index.o +g++ -c -I%JAVA_HOME%\include -I%JAVA_HOME%\include\win32 cloud_unum_usearch_Index.cpp -I..\..\..\..\include -o cloud_unum_usearch_Index.o g++ -shared -o USearchJNI.dll cloud_unum_usearch_Index.o -Wl,--add-stdcall-alias # MacOS @@ -256,9 +259,11 @@ g++ -std=c++11 -c -fPIC \ -I../../../../simsimd/include \ -I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin cloud_unum_usearch_Index.cpp -o cloud_unum_usearch_Index.o g++ -dynamiclib -o libusearch.dylib cloud_unum_usearch_Index.o -lc + # Run linking to that directory -java -cp . -Djava.library.path="$(pwd)/java/cloud/unum/usearch/" Index.java -java -cp . -Djava.library.path="$(pwd)/java" cloud.unum.usearch.Index +cd ../../../.. +cp cloud/unum/usearch/libusearch.* . +java -cp . -Djava.library.path="$(pwd)" cloud.unum.usearch.Index ``` ## Wolfram From 2d9c9b8441ca233a8b21857abc5473d882b652ad Mon Sep 17 00:00:00 2001 From: Kelvin Tan Date: Sat, 11 Nov 2023 10:28:19 -0800 Subject: [PATCH 2/3] Update mvn package in Java README. --- java/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/README.md b/java/README.md index 489d9953..e03e0225 100644 --- a/java/README.md +++ b/java/README.md @@ -6,7 +6,7 @@ cloud.unum usearch - 0.2.3 + 2.8.11 ``` From 3470a1545fea7fe8c107c97c999688c392d46df9 Mon Sep 17 00:00:00 2001 From: Kelvin Tan Date: Sat, 11 Nov 2023 10:35:15 -0800 Subject: [PATCH 3/3] Fix typo in Java README. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 42df658b..981e9c18 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -261,7 +261,7 @@ g++ -std=c++11 -c -fPIC \ g++ -dynamiclib -o libusearch.dylib cloud_unum_usearch_Index.o -lc # Run linking to that directory -cd ../../../.. +cd ../../.. cp cloud/unum/usearch/libusearch.* . java -cp . -Djava.library.path="$(pwd)" cloud.unum.usearch.Index ```