You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by al...@apache.org on 2023/01/05 17:58:19 UTC
[datasketches-cpp] branch master updated: Revert "Finished init and test"
This is an automated email from the ASF dual-hosted git repository.
alsay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/datasketches-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new da77298 Revert "Finished init and test"
da77298 is described below
commit da77298f9796e85557563e8d8910388646e5283f
Author: AlexanderSaydakov <Al...@users.noreply.github.com>
AuthorDate: Thu Jan 5 09:57:00 2023 -0800
Revert "Finished init and test"
This reverts commit 80ed1a33bbc3f1584c67d86bcfb388f752efb802.
---
CMakeLists.txt | 3 +--
count/CMakeLists.txt | 42 ----------------------------------------
count/include/count_min.hpp | 22 ---------------------
count/include/count_min_impl.hpp | 15 --------------
count/test/CMakeLists.txt | 42 ----------------------------------------
count/test/count_min_test.cpp | 14 --------------
6 files changed, 1 insertion(+), 137 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3070f57..705a009 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,13 +115,12 @@ add_subdirectory(sampling)
add_subdirectory(tuple)
add_subdirectory(req)
add_subdirectory(quantiles)
-add_subdirectory(count)
if (WITH_PYTHON)
add_subdirectory(python)
endif()
-target_link_libraries(datasketches INTERFACE hll cpc kll fi theta sampling req quantiles count) # change here
+target_link_libraries(datasketches INTERFACE hll cpc kll fi theta sampling req quantiles)
if (COVERAGE)
find_program(LCOV_PATH NAMES "lcov")
diff --git a/count/CMakeLists.txt b/count/CMakeLists.txt
deleted file mode 100644
index 3cd48c5..0000000
--- a/count/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-add_library(count INTERFACE)
-
-add_library(${PROJECT_NAME}::COUNT ALIAS count)
-
-if (BUILD_TESTS)
- add_subdirectory(test)
-endif()
-
-target_include_directories(count
- INTERFACE
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
- )
-
-target_link_libraries(count INTERFACE common)
-target_compile_features(count INTERFACE cxx_std_11)
-
-install(TARGETS count
- EXPORT ${PROJECT_NAME}
- )
-
-install(FILES
- include/count_min.hpp
- include/count_min_impl.hpp
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/DataSketches")
diff --git a/count/include/count_min.hpp b/count/include/count_min.hpp
deleted file mode 100644
index 10f7148..0000000
--- a/count/include/count_min.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef COUNT_MIN_HPP_
-#define COUNT_MIN_HPP_
-
-#include <cstdint>
-#include <vector>
-
-namespace datasketches {
-
-class count_min_sketch{
-public:
- uint64_t num_hashes ;
- count_min_sketch(uint64_t num_hashes) ;
-
- // Getters
- uint64_t get_num_hashes() ;
-};
-
-} /* namespace datasketches */
-
-#include "count_min_impl.hpp"
-
-#endif
\ No newline at end of file
diff --git a/count/include/count_min_impl.hpp b/count/include/count_min_impl.hpp
deleted file mode 100644
index 9140d3a..0000000
--- a/count/include/count_min_impl.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef COUNT_MIN_IMPL_HPP_
-#define COUNT_MIN_IMPL_HPP_
-
-//#include "count_min.hpp"
-namespace datasketches {
-count_min_sketch::count_min_sketch(const uint64_t num_hashes):num_hashes(num_hashes){
-};
-
-uint64_t count_min_sketch::get_num_hashes() {
- return num_hashes ;
-}
-
-} /* namespace datasketches */
-
-#endif
\ No newline at end of file
diff --git a/count/test/CMakeLists.txt b/count/test/CMakeLists.txt
deleted file mode 100644
index 9d07e83..0000000
--- a/count/test/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-add_executable(count_min_test)
-
-target_link_libraries(count_min_test count common_test_lib)
-
-set_target_properties(count_min_test PROPERTIES
- CXX_STANDARD 11
- CXX_STANDARD_REQUIRED YES
- )
-
-file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" COUNT_TEST_BINARY_PATH)
-string(APPEND COUNT_TEST_BINARY_PATH "/")
-target_compile_definitions(count_min_test
- PRIVATE
- TEST_BINARY_INPUT_PATH="${COUNT_TEST_BINARY_PATH}"
- )
-
-add_test(
- NAME count_min_test
- COMMAND count_min_test
-)
-
-target_sources(count_min_test
- PRIVATE
- count_min_test.cpp
- )
diff --git a/count/test/count_min_test.cpp b/count/test/count_min_test.cpp
deleted file mode 100644
index b2d6d6b..0000000
--- a/count/test/count_min_test.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <catch2/catch.hpp>
-
-#include "count_min.hpp"
-
-namespace datasketches{
-
-TEST_CASE("CM init"){
- uint64_t n_hashes = 5 ;
- count_min_sketch c(n_hashes) ;
- REQUIRE(c.get_num_hashes() == 5) ;
-}
-
-} /* namespace datasketches */
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org