Merge pull request #178 from Kaaserne/dev

Pairwise iterator, compile time improvements

Author: Kaaserne

.github/workflows/clang.yml

@@ -1,5 +1,6 @@
 env:
   CTEST_OUTPUT_ON_FAILURE: 1
+  LIBCXX_STANDARDS_JSON: '["20","23"]'
 
 on:
   workflow_call:
@@ -30,15 +31,17 @@ jobs:
         run: sudo apt-get install -y clang-${{ matrix.version }}
 
       - name: Install libc++ Clang ${{ matrix.version }}
-        if: matrix.standard == '20'
+        if: contains(fromJson(env.LIBCXX_STANDARDS_JSON), matrix.standard)
         run: sudo apt-get install -y libc++-${{ matrix.version }}-dev libc++abi-${{ matrix.version }}-dev
 
       - name: Configure (install)
         env:
           CC: clang-${{ matrix.version }}
           CXX: clang-${{ matrix.version }}
         run: |
-          if [ "${{ matrix.standard }}" = "20" ]; then
+          sudo apt-get update && sudo apt-get install -y jq
+          STDS=$(echo '${{ env.LIBCXX_STANDARDS_JSON }}' | jq -r '.[]' | xargs)
+          if echo "$STDS" | grep -wq "${{ matrix.standard }}"; then
             CXX_FLAGS='-stdlib=libc++'
           else
             CXX_FLAGS=''
@@ -60,10 +63,12 @@ jobs:
 
       - name: Configure tests
         run: |
-          if [ "${{ matrix.standard }}" == "20" ]; then
-            CXX_FLAGS="-stdlib=libc++"
+          sudo apt-get update && sudo apt-get install -y jq
+          STDS=$(echo '${{ env.LIBCXX_STANDARDS_JSON }}' | jq -r '.[]' | xargs)
+          if echo "$STDS" | grep -wq "${{ matrix.standard }}"; then
+            CXX_FLAGS='-stdlib=libc++'
           else
-            CXX_FLAGS=""
+            CXX_FLAGS=''
           fi
           cmake -S tests -B build/tests -G Ninja \
             -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \

.github/workflows/msvc.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   msvc:
-    name: msvc-${{ matrix.standard }} (C++${{ matrix.standard }})
+    name: msvc-${{ matrix.os }} (C++${{ matrix.standard }})
 
     strategy:
       fail-fast: false

README.md

@@ -1,6 +1,6 @@
-[![Build status](https://github.com/MarcDirven/cpp-lazy/workflows/Continuous%20Integration/badge.svg)](https://github.com/MarcDirven/cpp-lazy/actions)
+[![Build status](https://github.com/Kaaserne/cpp-lazy/workflows/Continuous%20Integration/badge.svg)](https://github.com/Kaaserne/cpp-lazy/actions)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![CodeQL](https://github.com/MarcDirven/cpp-lazy/actions/workflows/codeql.yml/badge.svg)](https://github.com/MarcDirven/cpp-lazy/actions/workflows/codeql.yml)
+[![CodeQL](https://github.com/Kaaserne/cpp-lazy/actions/workflows/codeql.yml/badge.svg)](https://github.com/Kaaserne/cpp-lazy/actions/workflows/codeql.yml)
 
 ![](https://i.ibb.co/ccn2V8N/Screenshot-2021-05-05-Make-A-High-Quality-Logo-In-Just-5-Minutes-For-Under-30-v1-cropped.png)
 
@@ -230,7 +230,7 @@ The following way is recommended (cpp-lazy version >= 5.0.1). Note that you choo
 
 include(FetchContent)
 FetchContent_Declare(cpp-lazy
-        URL https://github.com/MarcDirven/cpp-lazy/releases/download/<TAG_HERE E.G. v9.0.0>/cpp-lazy-src.zip
+        URL https://github.com/Kaaserne/cpp-lazy/releases/download/<TAG_HERE E.G. v9.0.0>/cpp-lazy-src.zip
         # Below is optional
         # URL_MD5 <MD5 HASH OF cpp-lazy-src.zip>
         # If using CMake >= 3.24, preferably set <bool> to TRUE
@@ -249,7 +249,7 @@ An alternative ('less' recommended), add to your `CMakeLists.txt` the following:
 
 include(FetchContent)
 FetchContent_Declare(cpp-lazy
-        GIT_REPOSITORY https://github.com/MarcDirven/cpp-lazy
+        GIT_REPOSITORY https://github.com/Kaaserne/cpp-lazy
         GIT_TAG ... # Commit hash
         # If using CMake >= 3.24, preferably set <bool> to TRUE
         # DOWNLOAD_EXTRACT_TIMESTAMP <bool>
@@ -311,7 +311,7 @@ int main() {
 ```
 
 ### Using `git clone`
-Clone the repository using `git clone https://github.com/MarcDirven/cpp-lazy/` and add to `CMakeLists.txt` the following:
+Clone the repository using `git clone https://github.com/Kaaserne/cpp-lazy/` and add to `CMakeLists.txt` the following:
 ```cmake
 add_subdirectory(cpp-lazy)
 add_executable(${PROJECT_NAME} main.cpp)
@@ -320,19 +320,6 @@ target_link_libraries(${PROJECT_NAME} cpp-lazy::cpp-lazy)
 ```
 
 # Benchmarks
-The time is equal to one iteration. One iteration includes the creation of the iterable and one iteration of that iterable. Compiled with: gcc version 11.4.0 (Ubuntu 11.4.0-1ubuntu1~22.04).
+The time is equal to one iteration. One iteration includes the creation of the iterable and one iteration of that iterable. Compiled with: gcc version 13.3.0.
 
-C++11
-![](https://github.com/Kaaserne/cpp-lazy/blob/master/bench/benchmarks-iterators-11.png?raw=true)
-
-C++14
-
-![](https://github.com/Kaaserne/cpp-lazy/blob/master/bench/benchmarks-iterators-14.png?raw=true)
-
-C++17
-
-![](https://github.com/Kaaserne/cpp-lazy/blob/master/bench/benchmarks-iterators-17.png?raw=true)
-
-C++20
-
-![](https://github.com/Kaaserne/cpp-lazy/blob/master/bench/benchmarks-iterators-20.png?raw=true)
+<div style="text-align:center"><img src="https://raw.githubusercontent.com/Kaaserne/cpp-lazy/master/bench/benchmarks-iterators-C%2B%2B23.png" /></div>

bench/bar_chart_maker.py

@@ -127,11 +127,21 @@ def make_chart(cxx_version: str, path: str):
 
 
 async def main():
+    cxx_version = None
     try:
         cxx_version = sys.argv[1]
     except IndexError:
-        print('Usage: python bar_chart_maker.py <cxx_version>')
-        sys.exit(1)
+        print('No CXX version provided, using CMakeCache.txt.')
+        with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'build', 'CMakeCache.txt'), 'r') as cmake_cache:
+            for line in cmake_cache:
+                if not line.startswith('CMAKE_CXX_STANDARD:'):
+                    continue
+                cxx_version = line.split('=')[1].strip()
+                break
+        if cxx_version is None:
+            print('No CXX version provided and CMakeCache.txt does not contain CMAKE_CXX_STANDARD.')
+            sys.exit(1)
+        print('Found CXX version in CMakeCache.txt:', cxx_version)
 
     make_chart(cxx_version, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'build'))
 

bench/benchmarks-iterators-11.png

@@ -80,6 +80,23 @@ void chunk_if_lz(benchmark::State& state) {
     }
 }
 
+#if defined(__cpp_lib_ranges_chunk_by) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+void chunk_if_std(benchmark::State& state) {
+    auto a = lz::range(static_cast<int>(size_policy)) | lz::to<std::array<int, size_policy>>();
+    constexpr static auto half = static_cast<int>(size_policy / 2);
+
+    for (auto _ : state) {
+        for (auto&& x : std::ranges::chunk_by(a, [](int i) noexcept { return i == half; })) {
+            for (int y : x) {
+                benchmark::DoNotOptimize(y);
+            }
+        }
+    }
+}
+
+#endif
+
 void chunks_lz(benchmark::State& state) {
     auto a = lz::range(static_cast<int>(size_policy)) | lz::to<std::array<int, size_policy>>();
     for (auto _ : state) {
@@ -91,6 +108,21 @@ void chunks_lz(benchmark::State& state) {
     }
 }
 
+#if defined(__cpp_lib_ranges_chunk) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+void chunks_std(benchmark::State& state) {
+    auto a = lz::range(static_cast<int>(size_policy)) | lz::to<std::array<int, size_policy>>();
+    for (auto _ : state) {
+        for (auto&& chunk : std::views::chunks(a, 8)) {
+            for (int x : chunk) {
+                benchmark::DoNotOptimize(x);
+            }
+        }
+    }
+}
+
+#endif
+
 void common_lz(benchmark::State& state) {
     auto a = lz::generate([]() noexcept { return 0; }, size_policy);
 
@@ -480,6 +512,21 @@ void take_every_lz(benchmark::State& state) {
     }
 }
 
+#if defined(__cpp_lib_ranges_stride) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+void take_every_std(benchmark::State& state) {
+    constexpr size_t offset = 2;
+    std::array<int, size_policy * offset> array;
+
+    for (auto _ : state) {
+        for (int taken : lz::ranges::stride(array, offset)) {
+            benchmark::DoNotOptimize(taken);
+        }
+    }
+}
+
+#endif
+
 void take_while_lz(benchmark::State& state) {
     auto array = lz::range(static_cast<int>(size_policy)) | lz::to<std::array<int, size_policy>>();
 
@@ -657,6 +704,21 @@ void split_multiple_std(benchmark::State& state) {
     }
 }
 
+#if defined(__cpp_lib_ranges_cartesian_product) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 20
+
+void cartesian_product_std(benchmark::State& state) {
+    std::array<int, size_policy / 8> a;
+    std::array<char, size_policy / 4> b;
+
+    for (auto _ : state) {
+        for (auto&& tup : std::views::cartesian_product(a, b)) {
+            benchmark::DoNotOptimize(tup);
+        }
+    }
+}
+
+#endif
+
 #if defined(__cpp_lib_ranges_repeat) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 20
 
 void repeat_std(benchmark::State& state) {
@@ -778,6 +840,24 @@ BENCHMARK(zip4_lz);
 BENCHMARK(zip3_lz);
 BENCHMARK(zip2_lz);
 
+#if defined(__cpp_lib_ranges_cartesian_product) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+BENCHMARK(cartesian_product_std);
+
+#endif
+
+#if defined(__cpp_lib_ranges_chunk) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+BENCHMARK(chunks_std);
+
+#endif
+
+#if defined(__cpp_lib_ranges_chunk_by) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+BENCHMARK(chunk_if_std);
+
+#endif
+
 #if LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 20
 
 BENCHMARK(common_std);
@@ -791,13 +871,19 @@ BENCHMARK(split_multiple_std);
 
 #endif
 
-#if defined(__cpp_lib_ranges_repeat) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 20
+#if defined(__cpp_lib_ranges_stride) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
+
+BENCHMARK(take_every_std);
+
+#endif
+
+#if defined(__cpp_lib_ranges_repeat) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
 
 BENCHMARK(repeat_std);
 
 #endif
 
-#if defined(__cpp_lib_ranges_zip) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 20
+#if defined(__cpp_lib_ranges_zip) && LZ_HAS_INCLUDE(<ranges>) && CMAKE_CXX_STANDARD >= 23
 
 BENCHMARK(zip4_std);
 BENCHMARK(zip3_std);