Skip to content

Commit 305078f

Browse files
authored
Merge pull request #129 from alicevision/doc/updateVcpkg
[doc] update with vcpkg package
2 parents 9dd7ae4 + 026a41f commit 305078f

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

README.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
PopSift is an open-source implementation of the SIFT algorithm in CUDA.
77
PopSift tries to stick as closely as possible to David Lowe's famous paper [1], while extracting features from an image in real-time at least on an NVidia GTX 980 Ti GPU.
88

9-
## HW requirements
9+
Check out the [documentation](https://popsift.readthedocs.io/) for more info.
1010

11+
## HW requirements
1112

1213
PopSift compiles and works with NVidia cards of compute capability >= 3.0 (including the GT 650M), but the code is developed with the compute capability 5.2 card GTX 980 Ti in mind.
1314

@@ -44,15 +45,6 @@ Some build options are available:
4445

4546
* `BUILD_SHARED_LIBS` (default: `ON`) controls the type of library to build (`ON` for shared libraries, `OFF` for static)
4647

47-
48-
### Continuous integration:
49-
- [![Build Status](https://travis-ci.org/alicevision/popsift.svg?branch=master)](https://travis-ci.org/alicevision/popsift) master branch.
50-
- [![Build Status](https://travis-ci.org/alicevision/popsift.svg?branch=develop)](https://travis-ci.org/alicevision/popsift) develop branch.
51-
- [![Build status](https://ci.appveyor.com/api/projects/status/rsm5269hs288c2ji/branch/develop?svg=true)](https://ci.appveyor.com/project/AliceVision/popsift/branch/develop)
52-
develop branch.
53-
54-
55-
5648
## Usage
5749

5850
The main artifact created is `libpopsift`.
@@ -84,8 +76,6 @@ Then, in order to build just pass the location of `PopSiftConfig.cmake` from the
8476
cmake .. -DPopSift_DIR=<prefix>/lib/cmake/PopSift/
8577
```
8678

87-
88-
8979
### Calling the API
9080

9181
The caller must create a `popart::Config` struct (documented in `src/sift/sift_conf.h`) to control the behaviour of the PopSift, and instantiate an object of class `PopSift` (found in `src/sift/popsift.h`).
@@ -109,6 +99,11 @@ PopSift can be configured at runtime to use constants that affect it behaviours.
10999
In particular, users can choose to generate results very similar to VLFeat or results that are closer (but not as close) to the SIFT implementation of the OpenCV extras.
110100
We acknowledge that there is at least one SIFT implementation that is vastly faster, but it makes considerable sacrifices in terms of accuracy and compatibility.
111101

102+
## Continuous integration:
103+
- [![Build Status](https://travis-ci.org/alicevision/popsift.svg?branch=master)](https://travis-ci.org/alicevision/popsift) master branch.
104+
- [![Build Status](https://travis-ci.org/alicevision/popsift.svg?branch=develop)](https://travis-ci.org/alicevision/popsift) develop branch.
105+
- [![Build status](https://ci.appveyor.com/api/projects/status/rsm5269hs288c2ji/branch/develop?svg=true)](https://ci.appveyor.com/project/AliceVision/popsift/branch/develop)
106+
develop branch.
112107

113108
## License
114109

doc/sphinx/source/install/install.rst

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,20 @@ vcpkg
5050

5151
`vcpkg <https://github.com/microsoft/vcpkg>`_ is a cross-platform (Windows, Linux and MacOS), open-source package manager created by Microsoft.
5252

53-
We are planning to release a port of the library so that it can be easily built using the package manager on all supported platforms.
54-
Stay tuned!
53+
Starting from v0.9, PopSift package can be installed on each platform via vcpkg.
54+
To install the library:
5555

56+
.. code:: shell
57+
58+
vcpkg install popsift --triplet <arch>
59+
60+
where :code:`<arch>` is the architecture to build for (e.g. :code:`x64-windows`, :code:`x64-linux-dynamic` etc.)
61+
62+
If you want to install the demo applications that come with the library you can add the option :code:`apps`:
63+
64+
.. code:: shell
65+
66+
vcpkg install popsift[apps] --triplet <arch>
5667
5768
------------
5869

0 commit comments

Comments
 (0)