Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
DocheA02 committed Sep 9, 2020
2 parents 561c835 + b9d85d4 commit f7aa325
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project contains a [JNA](https://github.com/java-native-access/jna) (Java N

### __Pre-Generated Shared Library__

The jar file includes some pre-generated libraries for _Windows_, _Debian Linux_ and _MacOS_ (x86-64) which should allow an easy integration and abstract all complexity related to compilation. In the case of operating system issues, a runtime exception will be thrown and the manual compilation will be advised.
The jar file includes some pre-generated libraries for _Windows_, _Debian Linux_ and _MacOS_ (x86-64) which should allow an easy integration and abstract all complexity related to compilation. An extra library for Debian Linux (aarch64) is also available for tests with AWS Graviton 2. In the case of operating system issues, a runtime exception will be thrown and the manual compilation will be advised.

__On Windows, the [Build Tools for Visual Studio 2019 (C++ build tools)](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) is required__.

Expand All @@ -20,7 +20,7 @@ Add the following dependency in your `pom.xml`:
<dependency>
<groupId>com.stepstone.search.hnswlib.jna</groupId>
<artifactId>hnswlib-jna</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
</dependency>
```

Expand All @@ -36,7 +36,7 @@ To generate the shared library required by this project, `binding.cpp` needs to
```
clang++ -O3 -shared bindings.cpp -I hnswlib -o <project_folder>/lib/libhnswlib-jna-x86-64.dylib
```
__Note:__ The shared library's name must be: __libhnswlib-jna-ARCH.EXT__ where `ARCH` is the canonical architecture name (e.g., `x86-64` for `amd64`, or `aarch64` for ARM64) and `EXT` is `dylib` for MacOS, for windows use `dll`, and linux `so`.
__Note:__ The shared library's name must be: __libhnswlib-jna-ARCH.EXT__ where `ARCH` is the canonical architecture name (e.g., `x86-64` for AMD64, or `aarch64` for ARM64) and `EXT` is `dylib` for MacOS, for windows use `dll`, and linux `so`.

#### Instructions for Windows

Expand Down
4 changes: 2 additions & 2 deletions hnswlib-jna-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>com.stepstone.search.hnswlib.jna</groupId>
<artifactId>hnswlib-jna-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>com.stepstone.search.hnswlib.jna</groupId>
<artifactId>hnswlib-jna</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions hnswlib-jna-legacy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<name>hnswlib-jna-legacy</name>
<artifactId>hnswlib-jna-legacy</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>

<licenses>
<license>
Expand All @@ -18,12 +18,12 @@
<parent>
<groupId>com.stepstone.search.hnswlib.jna</groupId>
<artifactId>hnswlib-jna-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<properties>
<hnswlib.jna.version>1.3.1-SNAPSHOT</hnswlib.jna.version>
<hnswlib.jna.version>1.3.2-SNAPSHOT</hnswlib.jna.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down
4 changes: 2 additions & 2 deletions hnswlib-jna/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<name>hnswlib-jna</name>
<artifactId>hnswlib-jna</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>

<licenses>
<license>
Expand All @@ -18,7 +18,7 @@
<parent>
<groupId>com.stepstone.search.hnswlib.jna</groupId>
<artifactId>hnswlib-jna-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Binary file modified hnswlib-jna/src/main/resources/libhnswlib-jna-aarch64.so
Binary file not shown.
Binary file modified hnswlib-jna/src/main/resources/libhnswlib-jna-x86-64.dylib
Binary file not shown.
Binary file modified hnswlib-jna/src/main/resources/libhnswlib-jna-x86-64.so
Binary file not shown.
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>hnswlib</name>
<groupId>com.stepstone.search.hnswlib.jna</groupId>
<artifactId>hnswlib-jna-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>

<description>This project contains a JNA (Java Native Access) implementation built on top of the native Hnswlib (Hierarchical Navigable Small World Graph) which offers a fast approximate nearest neighbor search. It includes some modifications and simplifications in order to provide Hnswlib features with native like performance to applications written in Java. Differently from the original Python implementation, the multi-thread support is not included in the bindings itself but it can be easily implemented on the Java side.</description>
Expand All @@ -20,6 +20,12 @@
</scm>

<developers>
<developer>
<name>Alex Docherty</name>
<email>[email protected]</email>
<organization>StepStone</organization>
<organizationUrl>https://www.stepstone.com</organizationUrl>
</developer>
<developer>
<name>Casper Davies</name>
<email>[email protected]</email>
Expand Down

0 comments on commit f7aa325

Please sign in to comment.