diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..cd4898c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: cpp +matrix: + include: + + - os: linux + compiler: gcc + env: COMPILER='g++' CXXSTD='c++11' + + +dist: trusty +sudo: false + +script: + mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="-std=${CXXSTD}" .. && cmake --build . && make test diff --git a/CMakeLists.txt b/CMakeLists.txt index c9783a0..23fd6b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.4) +cmake_minimum_required(VERSION 3.2) list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/README.md b/README.md index 5b192f1..25d62fe 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/greg7mdp/parallel_hashmap.svg?branch=master)](https://travis-ci.org/greg7mdp/org/greg7mdp/parallel_hashmap) + # The Parallel Hashmap: very fast, very memory friendly Click here [For a full writeup explaining the design and benefits of the Parallel Hashmap](https://greg7mdp.github.io/parallel-hashmap/). @@ -77,4 +79,8 @@ Key points: b. multithreading support (and inherent internal parallelism) +## Memory usage + + + diff --git a/travis b/travis new file mode 100644 index 0000000..082e5a5 --- /dev/null +++ b/travis @@ -0,0 +1,115 @@ +language: cpp +matrix: + include: + + - os: linux + compiler: gcc + env: COMPILER='g++' CXXSTD='c++11' + + - os: linux + compiler: clang + env: COMPILER='clang++' CXXSTD='c++11' + + - os: osx + compiler: gcc + env: COMPILER='g++' CXXSTD='c++11' + + - os: osx + compiler: clang + env: COMPILER='clang++' CXXSTD='c++11' + + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + env: COMPILER='g++-5' CXXSTD='c++11' + + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-6 + env: COMPILER='g++-6' CXXSTD='c++11' + + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 + env: COMPILER='g++-7' CXXSTD='c++11' + + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-8 + env: COMPILER='g++-8' CXXSTD='c++14' + + - os: linux + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-8 + env: COMPILER='g++-8' CXXSTD='c++17' + + - os: linux + compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-3.9 + packages: + - clang-3.9 + env: COMPILER='clang++-3.9' CXXSTD='c++11' + + - os: linux + compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-4.0 + packages: + - clang-4.0 + env: COMPILER='clang++-4.0' CXXSTD='c++11' + + - os: linux + compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-5.0 + env: COMPILER='clang++-5.0' CXXSTD='c++14' + + - os: linux + compiler: clang + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-5.0 + env: COMPILER='clang++-5.0' CXXSTD='c++17' + +dist: trusty +sudo: false + +script: + mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="-std=${CXXSTD}" .. && cmake --build . && make test