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.

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

Remove google::sparsehash #490

Merged
merged 7 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v2

- name: Install dependencies
run: sudo apt-get install -y libsparsehash-dev libicu-dev tzdata gcc-10 libzstd-dev libjemalloc-dev
run: sudo apt-get install -y libicu-dev tzdata gcc-10 libzstd-dev libjemalloc-dev
- name: Install clang 12
run: wget https://apt.llvm.org/llvm.sh && sudo chmod +x llvm.sh && sudo ./llvm.sh 12

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV LC_CTYPE C.UTF-8
ENV DEBIAN_FRONTEND=noninteractive

FROM base as builder
RUN apt-get update && apt-get install -y build-essential cmake libsparsehash-dev libicu-dev tzdata pkg-config uuid-runtime uuid-dev git
RUN apt-get update && apt-get install -y build-essential cmake libicu-dev tzdata pkg-config uuid-runtime uuid-dev git
RUN apt install -y libjemalloc-dev ninja-build libzstd-dev

COPY . /app/
Expand Down
6 changes: 2 additions & 4 deletions docs/native_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@ Arch Linux.

For Ubuntu 18.04 the following packages are required

* build-essential cmake libsparsehash-dev libicu-dev
* build-essential cmake libicu-dev
* wget python3-yaml unzip curl (for End-to-End Tests)

This roughly translates to

* GCC >= 7.x
* CMake >= 2.8.4
* Google's sparsehash >= 2.02
* python >= 3.6 (for End-to-End Tests with type hints)
* python-yaml >= 3.10


## Build and run unit tests

Go to a folder where you want to build the binaries. Usually this is done
Go to a folder where you want to build the binaries. Usually this is done
with a separate `build` subfolder. This is also assumed by the `e2e/e2e.sh`
script.

Expand Down
1 change: 0 additions & 1 deletion src/index/Index.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include <array>
#include <fstream>
#include <google/sparse_hash_set>
#include <memory>
#include <nlohmann/json.hpp>
#include <optional>
Expand Down
1 change: 0 additions & 1 deletion src/index/IndexMetaData.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <array>
#include <cmath>
#include <exception>
#include <google/sparse_hash_map>
#include <limits>
#include <utility>
#include <vector>
Expand Down