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

Small fixes for Makefile #59

Merged
merged 2 commits into from
Oct 7, 2016
Merged

Small fixes for Makefile #59

merged 2 commits into from
Oct 7, 2016

Conversation

mruegenberg
Copy link

I added some small fixes to the Makefile so that installing the Python package works for Python 3 (by doing make python_package followed by pip install [path-to-falconn/python_pkg).

See #14 and uses swig instead of swig3.0 as suggested in #48.

@ludwigschmidt
Copy link
Collaborator

Hi Marcel,

thank you for the pull request! Our makefile certainly needs some work.

You mention the python_package target in your pull request, but the NUMPY_INCLUDE_DIR variable is only used in the python_swig target. Is that intentional? The python_swig target is only for meant for development purposes, I added it so I could test changes to the Python wrapper more quickly.

Cheers,
Ludwig

@ilyaraz
Copy link
Member

ilyaraz commented Oct 7, 2016

Either way, I'm merging it for now. The change of swig is very useful.

@ilyaraz ilyaraz merged commit 54dbc80 into FALCONN-LIB:master Oct 7, 2016
@mruegenberg
Copy link
Author

Hi, sorry for not responding earlier. The main goal of my changes was to get make to run without complaining ;-)
If I remember correctly, make complained about numpy missing (not 100% sure though, I might have tried different make targets).

@ludwigschmidt
Copy link
Collaborator

Yup, the changes should definitely make the Makefile more robust. Thanks!

A-Guldborg pushed a commit to duckth/FOENNIX that referenced this pull request May 12, 2024
@harsha-simhadri
Count ties using extended ground truth list (FALCONN-LIB#59)
732fe43 
* Count ties using extended ground truth list
A-Guldborg pushed a commit to duckth/FOENNIX that referenced this pull request May 12, 2024
@qiaoyuKs @harsha-simhadri
@maumueller @dependabot @sourcesync
first commit (FALCONN-LIB#62)
b475f10 
* first commit

* final version

* add ssnpp-1B in benchmarks

* fix no new line in algo.yaml

* modify benchmark

* modify new line

* Update algos.yaml

add missing "}" to make msturing-1B work

* modify algos.yaml to make all CI test pass

* remove new line in algos.yaml

* add new line in algo.yaml

* modify new line

* algo.yaml new line

* fix bigann

* fix comma problem in ssnpp-1B

* Count ties using extended ground truth list (FALCONN-LIB#59)

* Count ties using extended ground truth list

* added credit to ann-benchmarks.com

* added diskann-v0.3 and medoids to component list

* Bump pyyaml from 5.3.1 to 5.4

Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3.1 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](yaml/pyyaml@5.3.1...5.4)

---
updated-dependencies:
- dependency-name: pyyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Change default search radius for SSNPP-1B to 96237

* Update metrics.py

* a proposed recall-with-ties impl with related unit tests (FALCONN-LIB#74)

* a new impl of recall-with-ties with careful attention determining true_ids subset and inner product distance; unit tests adjusted accordingly.

* more compact and readable code based on martin's suggestion

* validated on existing recall unit tests, in addition approved by T3 participants who noticed the ties issue.

* First T3 track leaderboard (FALCONN-LIB#75)

* adding latest leaderboard and all readme's that link to it

* sync tasks from gw/T3 branch

* syncing from gw/T3

* The markdown rel paths didnt work with the last PR to main.  Switching to absolute paths which is not ideal, but should be ok for now. (FALCONN-LIB#76)

* updated leaderboard with cuanns updates (FALCONN-LIB#77)

* cumulative updates forcing new LEADERBOARD;updated TASKS as well (FALCONN-LIB#78)

* added float32 coercion to data before faiss range search call; locked python version to 369 for docker build (FALCONN-LIB#79)

* new leaderboard based on eval of new gemini indexes for ssnpp and text2image (FALCONN-LIB#80)

* Store individual search times and extend CSV export capability for search times and power metrics. (FALCONN-LIB#81)

* storing the list of search times as h5py attr during query evaluation
* support for power sensor and search_times extraction to CSV in data_export.py
* added --detect_caching and --sensor_times flags
* added simple logic to detect possible response caching

* added leaderboard history directory with first snapshot (FALCONN-LIB#82)

* Update the last LB rankings and TASKs for public query set (FALCONN-LIB#83)

* updated the last LB rankings and TASK for public query set
* fixing a few typos
* added logic to generate a leaderboard version that rejects anomalous query sets

* T1/T2 public query set results

* T1/T2 public query set results

* T1/T2 public query set results

* T1/T2 public query set results

* refactored LM into multi LB READMEs and new navigation logic (FALCONN-LIB#86)

* Adding more private_query functionality and fixes (FALCONN-LIB#87)

* added some private query sets
* added paths to heldout queries and GT100 for all datasets except msspacev
* added spacev private queries
* updates
* isolating pqs changes for merge
* need to update main with the baseline config and algo from T3 for testing
* fix issue with failed extraction of search times
* using hyphens in cmd flags
* undoing/commenting the deep1b incorrect header HACK

* adding a priv run script for testing

* removed debug print

Co-authored-by: Harsha Vardhan Simhadri <harshasi@microsoft.com>

* Fix T1/T2 results

* Fix typo in T1/T2 readme

* Adding winners to the T3 public data leaderboard (FALCONN-LIB#88)

* adding co-winner announcements
* synced LB that fixed wording
* synced LB changes from gw/T3
* synced LB fix with missing msspacev
* synced LB with public link fix

* updated both T3 LBs (FALCONN-LIB#89)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: qiaoyu <qiaoyu@MacBook-Pro-5.local>
Co-authored-by: Harsha Vardhan Simhadri <harsha-simhadri@users.noreply.github.com>
Co-authored-by: Martin Aumueller <maau@itu.dk>
Co-authored-by: Harsha Vardhan Simhadri <harsha.v.simhadri@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: C. George Williams <george.williams@gmail.com>
Co-authored-by: Harsha Vardhan Simhadri <harshasi@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mruegenberg @ludwigschmidt @ilyaraz