-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fastpfor: add version 0.2.0, make static-library (#25808)
Co-authored-by: Ernesto de Gracia Herranz <[email protected]> Co-authored-by: Abril Rincón Blanco <[email protected]>
- Loading branch information
1 parent
aa0f621
commit 07f3493
Showing
8 changed files
with
116 additions
and
203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,9 @@ | ||
sources: | ||
"cci.20221225": | ||
url: "https://github.com/lemire/FastPFor/archive/3e7358f8656b4456f4ea1762075553f2984fefcf.tar.gz" | ||
sha256: "cc50b03421db3aa21be2243f5996ea6d027a6563e0863b77cfc46dd08bcfcaf5" | ||
"cci.20220205": | ||
url: "https://github.com/lemire/FastPFor/archive/773283d4a11fa2440a1b3b28fd77f775e86d7898.tar.gz" | ||
sha256: "d4419512420f3bcc65862c5c367021f201b5ba3e8cb0dad895cdf444e0867b30" | ||
|
||
"0.2.0": | ||
url: "https://github.com/lemire/FastPFor/archive/refs/tags/v0.2.0.tar.gz" | ||
sha256: "d9f0eacf9c3c61866cda23bae35107ca9c5d35fa7b7a96ca9ccc85803d7e753d" | ||
patches: | ||
"cci.20221225": | ||
- patch_file: "patches/cci.20221225-0001-fix-cmake.patch" | ||
patch_description: "enable shared build, disable unittest/utility" | ||
patch_type: "conan" | ||
"cci.20220205": | ||
- patch_file: "patches/cci.20220205-0001-fix-cmake.patch" | ||
"0.2.0": | ||
- patch_file: "patches/0.2.0-0001-fix-cmake.patch" | ||
patch_description: "enable shared build, disable unittest/utility" | ||
patch_type: "conan" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index f06b25f..1f6bd0f 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -4,7 +4,7 @@ | ||
# Copyright (c) 2012 Louis Dionne | ||
# | ||
cmake_minimum_required(VERSION 3.0) | ||
-set (CMAKE_CXX_STANDARD 11) # for constexpr specifier and other goodies | ||
+# set (CMAKE_CXX_STANDARD 11) # for constexpr specifier and other goodies | ||
|
||
if (NOT CMAKE_BUILD_TYPE) | ||
message(STATUS "No build type selected, default to Release") | ||
@@ -62,7 +62,7 @@ if( SUPPORT_SSE42 ) | ||
MESSAGE( STATUS "SSE 4.2 support detected" ) | ||
else() | ||
if (SUPPORT_NEON) | ||
- include("${CMAKE_MODULE_PATH}/simde.cmake") | ||
+ find_package(simde REQUIRED CONFIG) | ||
MESSAGE(STATUS "USING SIMDE FOR SIMD OPERATIONS") | ||
else () | ||
MESSAGE(STATUS "SIMDE and SSE 4.2 support not detected") | ||
@@ -103,6 +103,10 @@ elseif(WIN32) | ||
if(NOT MSVC12) | ||
message(STATUS "On Windows, only MSVC version 12 is supported!") | ||
endif() | ||
+ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX") | ||
+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /arch:AVX") | ||
+ set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /arch:AVX") | ||
+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /arch:AVX") | ||
else () | ||
message(FATAL_ERROR "Please, use GCC, Clang, or the Intel compiler!") | ||
endif() | ||
@@ -129,19 +133,19 @@ add_library(FastPFOR STATIC | ||
src/streamvbyte.c) | ||
set_target_properties(FastPFOR PROPERTIES POSITION_INDEPENDENT_CODE TRUE) | ||
|
||
- | ||
+if(0) | ||
# other executables | ||
add_executable(gapstats src/gapstats.cpp) | ||
add_executable(partitionbylength src/partitionbylength.cpp) | ||
add_executable(csv2maropu src/csv2maropu.cpp) | ||
- | ||
+endif() | ||
if (SUPPORT_NEON) | ||
- target_link_libraries(FastPFOR PUBLIC simde) | ||
- target_link_libraries(gapstats PUBLIC simde) | ||
- target_link_libraries(partitionbylength PUBLIC simde) | ||
- target_link_libraries(csv2maropu PUBLIC simde) | ||
+ target_link_libraries(FastPFOR PUBLIC simde::simde) | ||
+ # target_link_libraries(gapstats PUBLIC simde::simde) | ||
+ # target_link_libraries(partitionbylength PUBLIC simde::simde) | ||
+ # target_link_libraries(csv2maropu PUBLIC simde::simde) | ||
endif() | ||
- | ||
+if(0) | ||
add_executable(entropy src/entropy.cpp) | ||
target_link_libraries(entropy FastPFOR) | ||
|
||
@@ -149,7 +153,7 @@ if( SUPPORT_SSE42 ) | ||
add_executable(benchbitpacking src/benchbitpacking.cpp) | ||
target_link_libraries(benchbitpacking FastPFOR) | ||
endif() | ||
- | ||
+endif() | ||
find_package(snappy) | ||
if(NOT ${snappy_FOUND}) | ||
message(STATUS "Snappy was not found. codecssnappy and " | ||
@@ -158,6 +162,7 @@ else() | ||
message(STATUS "Snappy was found. Building additional targets " | ||
"codecssnappy and inmemorybenchmarksnappy.") | ||
include_directories(${snappy_INCLUDE_DIRS}) | ||
+ if(0) | ||
add_executable(codecssnappy src/codecs.cpp) | ||
set_target_properties(codecssnappy PROPERTIES DEFINE_SYMBOL USESNAPPY) | ||
target_link_libraries(codecssnappy FastPFOR ${snappy_LIBRARIES}) | ||
@@ -165,6 +170,7 @@ else() | ||
add_executable(inmemorybenchmarksnappy src/inmemorybenchmark.cpp) | ||
set_target_properties(inmemorybenchmarksnappy PROPERTIES DEFINE_SYMBOL USESNAPPY) | ||
target_link_libraries(inmemorybenchmarksnappy FastPFOR ${snappy_LIBRARIES}) | ||
+ endif() | ||
endif() | ||
|
||
option(WITH_TEST "Build with Google Test" ON) |
72 changes: 0 additions & 72 deletions
72
recipes/fastpfor/all/patches/cci.20220205-0001-fix-cmake.patch
This file was deleted.
Oops, something went wrong.
71 changes: 0 additions & 71 deletions
71
recipes/fastpfor/all/patches/cci.20221225-0001-fix-cmake.patch
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
versions: | ||
"cci.20221225": | ||
folder: all | ||
"cci.20220205": | ||
"0.2.0": | ||
folder: all |