You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by jm...@apache.org on 2019/06/20 17:41:20 UTC
[incubator-datasketches-cpp] branch py_setup updated (62a00ac ->
4fcad9d)
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a change to branch py_setup
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git.
from 62a00ac quasi-working python wrapper, probably works best on mac. planning to merge this and then refactor to use pybind11 for better portability
add fb222fe don't assume long long unsigned int is the same as uint64_t
add c590c2a optimized get_frequent_items
add 3dfbedb kll: comparator and serde as template params, moved implementation out
add 0129426 use comparator
add 5bd97b8 Merge pull request #27 from DataSketches/kll_refactoring
add 31ca415 expose constructor with starting size
new a3e1e9a Merge remote-tracking branch 'origin' into py_setup
add 16c40e6 theta draft
add a4d6e7c correct binary
add 4a2be27 check union theta first
add 8d08772 stream serialize and deserialize
add 1089096 raw bytes serialize and deserialize
add 4fa74c7 raw bytes deserialize as base class
add 4ec3b03 added checking in deserialize
add d8d3d7b removed debug print
add ac3866b union builder
add e91cb71 performance optimization
add c031cec removed unimplemented method for now
add 992a2a2 check seed
add c29b11b slight optimization
add 6426472 removed unstructured test, added test for non-empty sketch with no retained keys in sampling mode
add 84d85dd handling of empty flag
add 70e32c5 test compact
add a752128 theta intersection
add 0f3c7dc a-not-b set operation
add e6f994f error bounds
add 6e3dbe7 disabled debug print
add 49fcec1 moved static tables out of class
add 27d00b8 method was moved to update_theta_sketch
add 7034c50 Merge pull request #28 from apache/theta
add 693aec6 remove duplication
add 98ab97d update with std::string
add d352cfa Merge pull request #29 from apache/theta
add 9528a52 replaced license
add 6f41f1d Merge pull request #30 from apache/license
add 77e7526 added const qualifier to get_upper_bound() and get_lower_bound
add 6763691 Merge pull request #31 from apache/const_get_bounds
add 9cd54ee Checkpointing refactor in non-working state
add f2f30fa hll sketch and union templatized, hllsketchimpl and utility classes not
add 5817aca another non-compiling checkpoint
add 5c2582f most classes seem to compile? still need to update tests
add 17b3b90 most classes seem to compile? still need to update tests
add 84bf848 mostly make types consistent in signatures and cast as needed. still not in a viable state.
add d648867 mostly make types consistent in signatures and cast as needed. still not in a viable state.
add 66a6048 main classes seem fully templatized, still need to work on utility classes (e.g. relative error and interpolation tables
add abda07f lower overall code coverage with new design, but tests nnow show no memory leaks
add 6b936e7 Add option to allow cretion of HLL mode without going through list/set, finish excising calls to new
add ee8c44e update hll wrapper for python
add 6b3ac3b Merge pull request #32 from apache/hll_refactor
add 2b402bd replaced license
add 0a6197f Merge pull request #33 from apache/hll_license
new 09f29bc Merge remote-tracking branch 'origin' into py_setup
new 4fcad9d clean up cmake files so python compiles
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 4 +-
common/CMakeLists.txt | 1 +
common/include/CommonUtil.hpp | 18 +-
common/include/serde.hpp | 173 ++
common/test/test_runner.cpp | 18 +-
cpc/CMakeLists.txt | 2 +-
cpc/include/common.h | 18 +-
cpc/include/cpc_common.hpp | 18 +-
cpc/include/cpc_sketch.hpp | 22 +-
cpc/include/cpc_union.hpp | 18 +-
cpc/include/fm85.h | 18 +-
cpc/include/fm85Compression.h | 18 +-
cpc/include/fm85Confidence.h | 18 +-
cpc/include/fm85Merging.h | 18 +-
cpc/include/fm85Util.h | 18 +-
cpc/include/iconEstimator.h | 18 +-
cpc/include/u32Table.h | 18 +-
cpc/src/compressionData.data | 18 +-
cpc/src/cpc_sketch.cpp | 18 +-
cpc/src/fm85.cpp | 18 +-
cpc/src/fm85Compression.cpp | 18 +-
cpc/src/fm85Confidence.cpp | 18 +-
cpc/src/fm85Merging.cpp | 18 +-
cpc/src/fm85Util.cpp | 18 +-
cpc/src/iconEstimator.cpp | 18 +-
cpc/src/u32Table.cpp | 18 +-
cpc/test/compression_test.cpp | 18 +-
cpc/test/cpc_sketch_test.cpp | 18 +-
cpc/test/cpc_union_test.cpp | 18 +-
fi/CMakeLists.txt | 10 +-
fi/fi.mk | 2 +-
fi/include/frequent_items_sketch.hpp | 160 +-
fi/include/reverse_purge_hash_map.hpp | 30 +-
fi/test/frequent_items_sketch_custom_type_test.cpp | 28 +-
fi/test/frequent_items_sketch_test.cpp | 160 +-
fi/test/reverse_purge_hash_map_test.cpp | 18 +-
hll/CMakeLists.txt | 41 +-
hll/include/AuxHashMap-internal.hpp | 321 ++++
hll/include/AuxHashMap.hpp | 45 +-
.../CompositeInterpolationXTable-internal.hpp | 811 +++++++++
hll/include/CompositeInterpolationXTable.hpp | 23 +-
.../Conversions-internal.hpp} | 37 +-
hll/include/Conversions.hpp | 23 +-
hll/include/CouponHashSet-internal.hpp | 300 ++++
hll/include/CouponHashSet.hpp | 37 +-
hll/include/CouponList-internal.hpp | 438 +++++
hll/include/CouponList.hpp | 45 +-
.../CubicInterpolation-internal.hpp} | 74 +-
hll/include/CubicInterpolation.hpp | 23 +-
.../HarmonicNumbers-internal.hpp} | 31 +-
hll/include/HarmonicNumbers.hpp | 22 +-
.../Hll4Array-internal.hpp} | 210 ++-
hll/include/Hll4Array.hpp | 54 +-
hll/include/Hll6Array-internal.hpp | 155 ++
hll/include/Hll6Array.hpp | 44 +-
hll/include/Hll8Array-internal.hpp | 137 ++
hll/include/Hll8Array.hpp | 44 +-
hll/include/HllArray-internal.hpp | 663 ++++++++
hll/include/HllArray.hpp | 55 +-
hll/include/HllPairIterator-internal.hpp | 99 ++
hll/include/HllPairIterator.hpp | 25 +-
hll/include/HllSketch-internal.hpp | 462 ++++++
hll/include/HllSketch.hpp | 45 +-
hll/include/HllSketchImpl-internal.hpp | 159 ++
hll/include/HllSketchImpl.hpp | 49 +-
hll/include/HllSketchImplFactory.hpp | 269 +++
.../HllUnion.cpp => include/HllUnion-internal.hpp} | 330 ++--
hll/include/HllUnion.hpp | 54 +-
hll/include/HllUtil.hpp | 105 +-
hll/include/IntArrayPairIterator-internal.hpp | 115 ++
hll/include/IntArrayPairIterator.hpp | 23 +-
hll/include/PairIterator.hpp | 22 +-
.../RelativeErrorTables-internal.hpp} | 30 +-
hll/include/RelativeErrorTables.hpp | 23 +-
hll/include/hll.hpp | 309 ++--
hll/include/hll.private.hpp | 37 +
hll/src/AuxHashMap.cpp | 54 +-
hll/src/CompositeInterpolationXTable.cpp | 34 +-
hll/src/Conversions.cpp | 32 +-
hll/src/CouponHashSet.cpp | 84 +-
hll/src/CouponList.cpp | 108 +-
hll/src/CubicInterpolation.cpp | 18 +-
hll/src/HarmonicNumbers.cpp | 18 +-
hll/src/Hll4Array.cpp | 54 +-
hll/src/Hll6Array.cpp | 24 +-
hll/src/Hll8Array.cpp | 28 +-
hll/src/HllArray.cpp | 136 +-
hll/src/HllPairIterator.cpp | 22 +-
hll/src/HllSketch.cpp | 64 +-
hll/src/HllSketchImpl.cpp | 36 +-
hll/src/HllUnion.cpp | 26 +-
hll/src/HllUtil.cpp | 28 +-
hll/src/IntArrayPairIterator.cpp | 24 +-
hll/src/RelativeErrorTables.cpp | 18 +-
hll/test/AuxHashMapTest.cpp | 53 +-
hll/test/CouponHashSetTest.cpp | 119 +-
hll/test/CouponListTest.cpp | 152 +-
hll/test/CrossCountingTest.cpp | 65 +-
hll/test/HllArrayTest.cpp | 165 +-
hll/test/HllSketchTest.cpp | 354 ++--
hll/test/HllUnionTest.cpp | 253 +--
hll/test/TablesTest.cpp | 24 +-
hll/test/ToFromByteArrayTest.cpp | 182 ++-
hll/test/UnionCaseTest.cpp | 43 +-
kll/CMakeLists.txt | 10 +-
kll/include/kll_helper.hpp | 34 +-
kll/include/kll_quantile_calculator.hpp | 22 +-
kll/include/kll_sketch.hpp | 1718 +++++++++++---------
kll/kll.mk | 2 +-
kll/test/kll_sketch_test.cpp | 261 ++-
kll/test/kll_sketch_validation.cpp | 18 +-
python/src/cpc_wrapper.cpp | 18 +-
python/src/datasketches.cpp | 18 +-
python/src/fi_wrapper.cpp | 18 +-
python/src/hll_wrapper.cpp | 166 +-
python/src/kll_wrapper.cpp | 18 +-
theta/include/binomial_bounds.hpp | 458 ++++++
theta/include/theta_a_not_b.hpp | 57 +
theta/include/theta_a_not_b_impl.hpp | 108 ++
theta/include/theta_intersection.hpp | 70 +
theta/include/theta_intersection_impl.hpp | 181 +++
theta/include/theta_sketch.hpp | 307 ++++
theta/include/theta_sketch_impl.hpp | 1092 +++++++++++++
theta/include/theta_union.hpp | 75 +
theta/include/theta_union_impl.hpp | 114 ++
theta/test/theta_a_not_b_test.cpp | 239 +++
theta/test/theta_compact_empty_from_java.bin | Bin 0 -> 8 bytes
theta/test/theta_compact_estimation_from_java.bin | Bin 0 -> 34760 bytes
theta/test/theta_compact_single_item_from_java.bin | Bin 0 -> 16 bytes
theta/test/theta_intersection_test.cpp | 240 +++
theta/test/theta_sketch_test.cpp | 434 +++++
theta/test/theta_union_test.cpp | 112 ++
theta/test/theta_update_empty_from_java.bin | Bin 0 -> 1048 bytes
theta/test/theta_update_estimation_from_java.bin | Bin 0 -> 65560 bytes
theta/theta.mk | 31 +
135 files changed, 12114 insertions(+), 2756 deletions(-)
create mode 100644 common/include/serde.hpp
create mode 100644 hll/include/AuxHashMap-internal.hpp
create mode 100644 hll/include/CompositeInterpolationXTable-internal.hpp
copy hll/{src/Conversions.cpp => include/Conversions-internal.hpp} (67%)
create mode 100644 hll/include/CouponHashSet-internal.hpp
create mode 100644 hll/include/CouponList-internal.hpp
copy hll/{src/CubicInterpolation.cpp => include/CubicInterpolation-internal.hpp} (73%)
copy hll/{src/HarmonicNumbers.cpp => include/HarmonicNumbers-internal.hpp} (60%)
copy hll/{src/Hll4Array.cpp => include/Hll4Array-internal.hpp} (54%)
create mode 100644 hll/include/Hll6Array-internal.hpp
create mode 100644 hll/include/Hll8Array-internal.hpp
create mode 100644 hll/include/HllArray-internal.hpp
create mode 100644 hll/include/HllPairIterator-internal.hpp
create mode 100644 hll/include/HllSketch-internal.hpp
create mode 100644 hll/include/HllSketchImpl-internal.hpp
create mode 100644 hll/include/HllSketchImplFactory.hpp
copy hll/{src/HllUnion.cpp => include/HllUnion-internal.hpp} (51%)
create mode 100644 hll/include/IntArrayPairIterator-internal.hpp
copy hll/{src/RelativeErrorTables.cpp => include/RelativeErrorTables-internal.hpp} (69%)
create mode 100644 hll/include/hll.private.hpp
create mode 100644 theta/include/binomial_bounds.hpp
create mode 100644 theta/include/theta_a_not_b.hpp
create mode 100644 theta/include/theta_a_not_b_impl.hpp
create mode 100644 theta/include/theta_intersection.hpp
create mode 100644 theta/include/theta_intersection_impl.hpp
create mode 100644 theta/include/theta_sketch.hpp
create mode 100644 theta/include/theta_sketch_impl.hpp
create mode 100644 theta/include/theta_union.hpp
create mode 100644 theta/include/theta_union_impl.hpp
create mode 100644 theta/test/theta_a_not_b_test.cpp
create mode 100644 theta/test/theta_compact_empty_from_java.bin
create mode 100644 theta/test/theta_compact_estimation_from_java.bin
create mode 100644 theta/test/theta_compact_single_item_from_java.bin
create mode 100644 theta/test/theta_intersection_test.cpp
create mode 100644 theta/test/theta_sketch_test.cpp
create mode 100644 theta/test/theta_union_test.cpp
create mode 100644 theta/test/theta_update_empty_from_java.bin
create mode 100644 theta/test/theta_update_estimation_from_java.bin
create mode 100644 theta/theta.mk
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-cpp] 02/03: Merge remote-tracking branch
'origin' into py_setup
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a commit to branch py_setup
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit 09f29bc089a5e0366411bcadd070aa2cb677d00e
Merge: a3e1e9a 0a6197f
Author: jmalkin <jm...@users.noreply.github.com>
AuthorDate: Wed Jun 19 15:20:23 2019 -0700
Merge remote-tracking branch 'origin' into py_setup
Makefile | 4 +-
common/include/CommonUtil.hpp | 18 +-
common/include/serde.hpp | 18 +-
common/test/test_runner.cpp | 18 +-
cpc/include/common.h | 18 +-
cpc/include/cpc_common.hpp | 18 +-
cpc/include/cpc_sketch.hpp | 22 +-
cpc/include/cpc_union.hpp | 18 +-
cpc/include/fm85.h | 18 +-
cpc/include/fm85Compression.h | 18 +-
cpc/include/fm85Confidence.h | 18 +-
cpc/include/fm85Merging.h | 18 +-
cpc/include/fm85Util.h | 18 +-
cpc/include/iconEstimator.h | 18 +-
cpc/include/u32Table.h | 18 +-
cpc/src/compressionData.data | 18 +-
cpc/src/cpc_sketch.cpp | 18 +-
cpc/src/fm85.cpp | 18 +-
cpc/src/fm85Compression.cpp | 18 +-
cpc/src/fm85Confidence.cpp | 18 +-
cpc/src/fm85Merging.cpp | 18 +-
cpc/src/fm85Util.cpp | 18 +-
cpc/src/iconEstimator.cpp | 18 +-
cpc/src/u32Table.cpp | 18 +-
cpc/test/compression_test.cpp | 18 +-
cpc/test/cpc_sketch_test.cpp | 18 +-
cpc/test/cpc_union_test.cpp | 18 +-
fi/include/frequent_items_sketch.hpp | 20 +-
fi/include/reverse_purge_hash_map.hpp | 18 +-
fi/test/frequent_items_sketch_custom_type_test.cpp | 18 +-
fi/test/frequent_items_sketch_test.cpp | 18 +-
fi/test/reverse_purge_hash_map_test.cpp | 18 +-
hll/CMakeLists.txt | 37 +-
hll/include/AuxHashMap-internal.hpp | 321 ++++++
hll/include/AuxHashMap.hpp | 45 +-
.../CompositeInterpolationXTable-internal.hpp | 811 +++++++++++++++
hll/include/CompositeInterpolationXTable.hpp | 23 +-
.../Conversions-internal.hpp} | 37 +-
hll/include/Conversions.hpp | 23 +-
hll/include/CouponHashSet-internal.hpp | 300 ++++++
hll/include/CouponHashSet.hpp | 37 +-
hll/include/CouponList-internal.hpp | 438 ++++++++
hll/include/CouponList.hpp | 45 +-
.../CubicInterpolation-internal.hpp} | 74 +-
hll/include/CubicInterpolation.hpp | 23 +-
.../HarmonicNumbers-internal.hpp} | 31 +-
hll/include/HarmonicNumbers.hpp | 22 +-
.../Hll4Array-internal.hpp} | 210 ++--
hll/include/Hll4Array.hpp | 54 +-
hll/include/Hll6Array-internal.hpp | 155 +++
hll/include/Hll6Array.hpp | 44 +-
hll/include/Hll8Array-internal.hpp | 137 +++
hll/include/Hll8Array.hpp | 44 +-
hll/include/HllArray-internal.hpp | 663 ++++++++++++
hll/include/HllArray.hpp | 55 +-
hll/include/HllPairIterator-internal.hpp | 99 ++
hll/include/HllPairIterator.hpp | 25 +-
hll/include/HllSketch-internal.hpp | 462 +++++++++
hll/include/HllSketch.hpp | 45 +-
hll/include/HllSketchImpl-internal.hpp | 159 +++
hll/include/HllSketchImpl.hpp | 49 +-
hll/include/HllSketchImplFactory.hpp | 269 +++++
.../HllUnion.cpp => include/HllUnion-internal.hpp} | 330 +++---
hll/include/HllUnion.hpp | 54 +-
hll/include/HllUtil.hpp | 105 +-
hll/include/IntArrayPairIterator-internal.hpp | 115 +++
hll/include/IntArrayPairIterator.hpp | 23 +-
hll/include/PairIterator.hpp | 22 +-
.../RelativeErrorTables-internal.hpp} | 30 +-
hll/include/RelativeErrorTables.hpp | 23 +-
hll/include/hll.hpp | 309 ++++--
hll/include/hll.private.hpp | 37 +
hll/src/AuxHashMap.cpp | 54 +-
hll/src/CompositeInterpolationXTable.cpp | 34 +-
hll/src/Conversions.cpp | 32 +-
hll/src/CouponHashSet.cpp | 84 +-
hll/src/CouponList.cpp | 108 +-
hll/src/CubicInterpolation.cpp | 18 +-
hll/src/HarmonicNumbers.cpp | 18 +-
hll/src/Hll4Array.cpp | 54 +-
hll/src/Hll6Array.cpp | 24 +-
hll/src/Hll8Array.cpp | 28 +-
hll/src/HllArray.cpp | 136 +--
hll/src/HllPairIterator.cpp | 22 +-
hll/src/HllSketch.cpp | 64 +-
hll/src/HllSketchImpl.cpp | 36 +-
hll/src/HllUnion.cpp | 26 +-
hll/src/HllUtil.cpp | 28 +-
hll/src/IntArrayPairIterator.cpp | 24 +-
hll/src/RelativeErrorTables.cpp | 18 +-
hll/test/AuxHashMapTest.cpp | 53 +-
hll/test/CouponHashSetTest.cpp | 119 ++-
hll/test/CouponListTest.cpp | 152 +--
hll/test/CrossCountingTest.cpp | 65 +-
hll/test/HllArrayTest.cpp | 165 +--
hll/test/HllSketchTest.cpp | 354 ++++---
hll/test/HllUnionTest.cpp | 253 ++---
hll/test/TablesTest.cpp | 24 +-
hll/test/ToFromByteArrayTest.cpp | 182 ++--
hll/test/UnionCaseTest.cpp | 43 +-
kll/include/kll_helper.hpp | 18 +-
kll/include/kll_quantile_calculator.hpp | 18 +-
kll/include/kll_sketch.hpp | 18 +-
kll/test/kll_sketch_test.cpp | 18 +-
kll/test/kll_sketch_validation.cpp | 18 +-
python/src/cpc_wrapper.cpp | 18 +-
python/src/datasketches.cpp | 18 +-
python/src/fi_wrapper.cpp | 18 +-
python/src/hll_wrapper.cpp | 166 +--
python/src/kll_wrapper.cpp | 18 +-
theta/include/binomial_bounds.hpp | 458 ++++++++
theta/include/theta_a_not_b.hpp | 57 +
theta/include/theta_a_not_b_impl.hpp | 108 ++
theta/include/theta_intersection.hpp | 70 ++
theta/include/theta_intersection_impl.hpp | 181 ++++
theta/include/theta_sketch.hpp | 307 ++++++
theta/include/theta_sketch_impl.hpp | 1092 ++++++++++++++++++++
theta/include/theta_union.hpp | 75 ++
theta/include/theta_union_impl.hpp | 114 ++
theta/test/theta_a_not_b_test.cpp | 239 +++++
theta/test/theta_compact_empty_from_java.bin | Bin 0 -> 8 bytes
theta/test/theta_compact_estimation_from_java.bin | Bin 0 -> 34760 bytes
theta/test/theta_compact_single_item_from_java.bin | Bin 0 -> 16 bytes
theta/test/theta_intersection_test.cpp | 240 +++++
theta/test/theta_sketch_test.cpp | 434 ++++++++
theta/test/theta_union_test.cpp | 112 ++
theta/test/theta_update_empty_from_java.bin | Bin 0 -> 1048 bytes
theta/test/theta_update_estimation_from_java.bin | Bin 0 -> 65560 bytes
theta/theta.mk | 31 +
129 files changed, 10804 insertions(+), 1613 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-cpp] 03/03: clean up cmake files so python
compiles
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a commit to branch py_setup
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit 4fcad9d25c2c3e988e654e02b86f0b3cd611d2f5
Author: jmalkin <jm...@users.noreply.github.com>
AuthorDate: Thu Jun 20 10:41:03 2019 -0700
clean up cmake files so python compiles
---
common/CMakeLists.txt | 1 +
cpc/CMakeLists.txt | 2 +-
fi/CMakeLists.txt | 10 +++++++++-
hll/CMakeLists.txt | 4 ++--
kll/CMakeLists.txt | 10 +++++++++-
5 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 16a92c9..aeda58f 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -12,6 +12,7 @@ target_include_directories(common
target_sources(common
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/include/MurmurHash3.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/include/serde.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/CommonUtil.hpp
)
diff --git a/cpc/CMakeLists.txt b/cpc/CMakeLists.txt
index 159dc2c..4d6075e 100644
--- a/cpc/CMakeLists.txt
+++ b/cpc/CMakeLists.txt
@@ -24,7 +24,7 @@ set_target_properties(cpc PROPERTIES
)
install(TARGETS cpc
- EXPORT ${PROJCT_NAME}
+ EXPORT ${PROJECT_NAME}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches
)
diff --git a/fi/CMakeLists.txt b/fi/CMakeLists.txt
index 7cd27d2..42c3929 100644
--- a/fi/CMakeLists.txt
+++ b/fi/CMakeLists.txt
@@ -10,12 +10,20 @@ target_include_directories(fi
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ PRIVATE
+ ${COMMON_INCLUDE_DIR}
+)
+
+target_link_libraries(fi INTERFACE common)
+
+set_target_properties(fi PROPERTIES
+ INTERFACE_COMPILE_FEATURES cxx_std_11
)
set(fi_HEADERS "include/frequent_items_sketch.hpp;include/reverse_purge_hash_map.hpp")
install(TARGETS fi
- EXPORT ${PROJCT_NAME}
+ EXPORT ${PROJECT_NAME}
)
install(FILES ${fi_HEADERS}
diff --git a/hll/CMakeLists.txt b/hll/CMakeLists.txt
index d7f5e8e..e75d466 100644
--- a/hll/CMakeLists.txt
+++ b/hll/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(hll
${COMMON_INCLUDE_DIR}
)
-target_link_libraries(hll common)
+target_link_libraries(hll INTERFACE common)
set_target_properties(hll PROPERTIES
PUBLIC_HEADER "include/hll.hpp"
@@ -24,7 +24,7 @@ set_target_properties(hll PROPERTIES
)
install(TARGETS hll
- EXPORT ${PROJCT_NAME}
+ EXPORT ${PROJECT_NAME}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DataSketches
)
diff --git a/kll/CMakeLists.txt b/kll/CMakeLists.txt
index 7a8d2d8..662d7a2 100644
--- a/kll/CMakeLists.txt
+++ b/kll/CMakeLists.txt
@@ -10,12 +10,20 @@ target_include_directories(kll
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ PRIVATE
+ ${COMMON_INCLUDE_DIR}
+)
+
+target_link_libraries(kll INTERFACE common)
+
+set_target_properties(kll PROPERTIES
+ INTERFACE_COMPILE_FEATURES cxx_std_11
)
set(kll_HEADERS "include/kll_sketch.hpp;include/kll_helper.hpp;include/kll_quantile_calculator.hpp")
install(TARGETS kll
- EXPORT ${PROJCT_NAME}
+ EXPORT ${PROJECT_NAME}
)
install(FILES ${kll_HEADERS}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-cpp] 01/03: Merge remote-tracking branch
'origin' into py_setup
Posted by jm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a commit to branch py_setup
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit a3e1e9a17e7f8f74c78e1e354e1ae0927dd7ced3
Merge: 62a00ac 31ca415
Author: jmalkin <jm...@users.noreply.github.com>
AuthorDate: Wed Jun 19 15:05:21 2019 -0700
Merge remote-tracking branch 'origin' into py_setup
common/include/serde.hpp | 159 ++
fi/fi.mk | 2 +-
fi/include/frequent_items_sketch.hpp | 140 +-
fi/include/reverse_purge_hash_map.hpp | 12 +-
fi/test/frequent_items_sketch_custom_type_test.cpp | 10 +-
fi/test/frequent_items_sketch_test.cpp | 142 +-
kll/include/kll_helper.hpp | 16 +-
kll/include/kll_quantile_calculator.hpp | 4 +-
kll/include/kll_sketch.hpp | 1700 +++++++++++---------
kll/kll.mk | 2 +-
kll/test/kll_sketch_test.cpp | 243 ++-
11 files changed, 1290 insertions(+), 1140 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org