Merge release 1.4.0 from fork

.bazelignore

@@ -0,0 +1,4 @@
+#ignore typical cmake build folders
+build
+out
+cmake-build-debug

.bazelrc

@@ -101,9 +101,9 @@ build:ubsan --linkopt="-lubsan"
 test:ubsan --run_under=//tools/runners/sanitizers/ubsan
 
 # MSAN is disabled for now, as there are false positives and we can't suppress them easily.
-#build:msan --config=base-sanitizer
-#build:msan --copt="-fsanitize=memory"
-#build:msan --linkopt="-fsanitize=memory"
-#test:msan --run_under=//tools/runners/sanitizers/msan
+build:msan --config=base-sanitizer
+build:msan --copt="-fsanitize=memory"
+build:msan --linkopt="-fsanitize=memory"
+test:msan --run_under=//tools/runners/sanitizers/msan
 
 build:lint --define linting_only=true

.github/workflows/bazel.yml

@@ -1,6 +1,6 @@
 name: Bazel build
 
-on: [push, pull_request]
+on: [ push ]
 
 jobs:
   build:
@@ -16,11 +16,21 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup bazel
-        # install bazelisk to install the appropriate bazel version
-        run: |
-          export PATH=$PATH:$HOME/bin && mkdir -p $HOME/bin
-          wget https://github.com/bazelbuild/bazelisk/releases/download/v1.5.0/bazelisk-linux-amd64 && chmod +x bazelisk-linux-amd64 && mv bazelisk-linux-amd64 $HOME/bin/bazel
-          wget https://github.com/bazelbuild/buildtools/releases/download/0.22.0/buildifier && chmod +x buildifier && mv buildifier $HOME/bin/
+        uses: bazelbuild/setup-bazelisk@v2
+
+      - name: Mount bazel cache  # Optional
+        uses: actions/cache@v3
+        with:
+          path: "~/.cache/bazel"
+          key: bazel
+
+      - name: Clang format
+        shell: bash
+        run: ./ci/linting/clang-format.sh
+
+      - name: Bazel format
+        shell: bash
+        run: ./ci/linting/buildifier.sh
 
       - name: Build
         shell: bash

.github/workflows/cmake-codecov.yml

@@ -0,0 +1,49 @@
+name: CMake Codecov
+
+on: [ push ]
+
+env:
+  BUILD_TYPE: Debug
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: hendrikmuhs/[email protected]
+
+      - name: Install lcov
+        run: sudo apt-get install lcov -y
+
+      - name: Create Build Environment
+        run: |
+          cmake -E make_directory ${{github.workspace}}/build
+          cd build
+
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPHTREE_CODE_COVERAGE=ON
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . --config $BUILD_TYPE -j2
+
+      - name: Run tests
+        working-directory: ${{github.workspace}}/build
+        run: ctest -C $BUILD_TYPE
+
+      - name: Create and upload coverage
+        working-directory: ${{github.workspace}}/build
+        run: |
+          cd test/CMakeFiles/all_tests.dir/
+          lcov --directory . --capture -o coverage.info
+          lcov -r coverage.info */build/* */test/* */c++/* */gtest/* -o coverageFiltered.info
+          lcov --list coverageFiltered.info
+          bash <(curl -s https://codecov.io/bash) -f coverageFiltered.info || echo "Upload failed"
+

.github/workflows/cmake-windows.yml

@@ -0,0 +1,32 @@
+name: CMake Windows build
+
+on: [ push ]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: hendrikmuhs/[email protected]
+
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}\out
+
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}\out
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -S ${{github.workspace}} -B ${{github.workspace}}\out -DPHTREE_BUILD_EXAMPLES=ON -DPHTREE_BUILD_TESTS=ON
+
+      - name: Build
+        working-directory: ${{github.workspace}}\out
+        run: cmake --build . --config ${env:BUILD_TYPE} -j2
+
+      - name: Test
+        working-directory: ${{github.workspace}}\out
+        run: ctest -C ${env:BUILD_TYPE}

.github/workflows/cmake.yml

@@ -1,40 +1,41 @@
 name: CMake build
 
-on: [push, pull_request]
+on: [ push ]
 
 env:
   BUILD_TYPE: Release
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{github.workspace}}/build
-
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      working-directory: ${{github.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source 
-      # and build directories, but this is only available with CMake 3.13 and higher.  
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
-    - name: Build
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE
-
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      shell: bash
-      # Execute tests defined by the CMake configuration.  
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      # TODO Currently tests are run via bazel only.
-      run: ctest -C $BUILD_TYPE
+      - uses: actions/checkout@v2
+
+      - uses: hendrikmuhs/[email protected]
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build
+
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/build
+        # Note the current convention is to use the -S and -B options here to specify source
+        # and build directories, but this is only available with CMake 3.13 and higher.
+        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPHTREE_BUILD_ALL=ON
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . --config $BUILD_TYPE -j2
+
+      - name: Test
+        working-directory: ${{github.workspace}}/build
+        run: ctest -C $BUILD_TYPE
+
+      - name: Example
+        working-directory: ${{github.workspace}}/build
+        run: examples/Example

.github/workflows/codcecov.yml_old

@@ -0,0 +1,42 @@
+name: Upload CodeCov Report
+on: [ push ]
+jobs:
+  run:
+    runs-on: windows-latest
+    name: Build, Test , Upload Code Coverage Report
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: ‘2’
+        id: checkout_code
+      - name: Setup MSBuild and add to PATH
+        uses: microsoft/[email protected]
+        id: setup_msbuild
+
+      - name: Generate Solution
+        run: cmake -G "Visual Studio 17 2022" -A x64 . -DPHTREE_CODE_COVERAGE=ON -DCMAKE_BUILD_TYPE=Debug
+
+      - name: Run MSBuild
+        id: run_msbuild
+        run: msbuild /p:Configuration=Debug /p:Platform=x64 /p:gtest_force_shared_crt=on phtree.sln
+      - name: Setup VSTest and add to PATH
+        uses: darenm/Setup-VSTest@v1
+        id: setup_vstest
+
+      - name: Setup OpenCppCoverage and add to PATH
+        id: setup_opencppcoverage
+        run: |
+          choco install OpenCppCoverage -y
+          echo "C:\Program Files\OpenCppCoverage" >> $env:GITHUB_PATH
+
+      - name: Generate Report
+        id: generate_test_report
+        shell: cmd
+        run: OpenCppCoverage.exe --modules phtree --export_type cobertura:phtree.xml -- "vstest.console.exe" test\Debug\all_tests.exe
+      - name: Upload Report to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: ./phtree.xml
+          fail_ci_if_error: true
+          functionalities: fix

.gitignore

@@ -4,9 +4,14 @@
 !.clang-format
 !.gitignore
 !.github
+!*.yml
 bazel-*
 !bazel-*.sh
 compile_commands.json
 perf.data*
 build
+out
+cygwin
+CMakeSettings.json
 
+**/cmake-build-debug/

BUILD

@@ -1,5 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
+licenses(["notice"])  # Apache 2.0
+
+# Expose license for external usage through bazel.
+exports_files([
+    "LICENSE",
+])
+
 # Platform configuration definitions for select()
 
 config_setting(
@@ -62,3 +69,30 @@ filegroup(
     name = "dot_clang_format",
     srcs = [".clang-format"],
 )
+
+cc_library(
+    name = "phtree",
+    srcs = glob(
+        include = [
+            "include/**/*.h",
+        ],
+    ),
+    hdrs = [
+        "include/phtree/converter.h",
+        "include/phtree/distance.h",
+        "include/phtree/filter.h",
+        "include/phtree/phtree.h",
+        "include/phtree/phtree_multimap.h",
+    ],
+    includes = [
+        "include",
+    ],
+    linkstatic = True,
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//include/phtree/common",
+        "//include/phtree/v16",
+    ],
+)