[module] import standard module support

FrancoisCarouge · Oct 9, 2024 · 00e730a · 00e730a
1 parent dc6a05f
commit 00e730a
Show file tree

Hide file tree

Showing 28 changed files with 55 additions and 64 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -17,8 +17,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - { os: 'ubuntu-24.04', cxx: 'clang++-18', cc: 'clang-18', generator: 'Unix Makefiles', packages: 'clang-18'  }
-        - { os: 'ubuntu-24.04', cxx: 'g++-14', cc: 'gcc-14', generator: 'Unix Makefiles', packages: 'g++-14'  }
+        - { os: 'ubuntu-24.04', cxx: 'clang++-18', cc: 'clang-18', generator: 'Ninja', packages: 'clang-18'  }
+        - { os: 'ubuntu-24.04', cxx: 'clang++-19', cc: 'clang-19', generator: 'Ninja', packages: 'clang-19'  }
+        - { os: 'ubuntu-24.04', cxx: 'g++-14', cc: 'gcc-14', generator: 'Ninja', packages: 'g++-14'  }
         - { os: 'windows-latest', cxx: 'cl', cc: 'cl', generator: 'Ninja', config: 'Debug' }
         - { os: 'windows-latest', cxx: 'cl', cc: 'cl', generator: 'Ninja', config: 'Release' }
     name: '${{ matrix.os }} / ${{ matrix.cxx }} / ${{ matrix.generator }} / ${{ matrix.config }}'
@@ -32,6 +33,15 @@ jobs:
       uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: 'Install: MSVC'
       uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+    - name: 'Install Ninja'
+      if: ${{ matrix.os == 'ubuntu-24.04' }}
+      run: sudo apt install ninja-build
+    - name: 'Install: Clang 19'
+      if: ${{ matrix.cxx == 'clang++-19' }}
+      run: |
+        wget https://apt.llvm.org/llvm.sh
+        chmod +x llvm.sh
+        sudo ./llvm.sh 19 all
     - name: 'Configure'
       env:
         CXX: '${{ matrix.cxx }}'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,8 +46,10 @@ project(
   VERSION "0.4.0")
 
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_MODULE_STD ON)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD ON)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
 set(CPACK_PACKAGE_CHECKSUM "SHA512")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")

diff --git a/benchmark/baseline.cpp b/benchmark/baseline.cpp
@@ -38,10 +38,9 @@ For more information, please refer to <https://unlicense.org> */
 
 #include "benchmark.hpp"
 
-#include <benchmark/benchmark.h>
+import std;
 
-#include <algorithm>
-#include <chrono>
+#include <benchmark/benchmark.h>
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/include/benchmark.hpp b/benchmark/include/benchmark.hpp
@@ -42,8 +42,7 @@ For more information, please refer to <https://unlicense.org> */
 //! @file
 //! @brief Benchmarking support.
 
-#include <chrono>
-#include <type_traits>
+import std;
 
 namespace fcarouge::benchmark {
 //! @brief Type of the platform steady benchmark clock.

diff --git a/benchmark/predict_1x1x0.cpp b/benchmark/predict_1x1x0.cpp
@@ -41,8 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/predict_1x1x1.cpp b/benchmark/predict_1x1x1.cpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/predict_linalg_x1x.cpp b/benchmark/predict_linalg_x1x.cpp
@@ -43,13 +43,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/update_1x1x0.cpp b/benchmark/update_1x1x0.cpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/update_1x1x1.cpp b/benchmark/update_1x1x1.cpp
@@ -41,9 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <random>
+import std;
 
 namespace fcarouge::benchmark {
 namespace {

diff --git a/benchmark/update_linalg_xx0.cpp b/benchmark/update_linalg_xx0.cpp
@@ -43,13 +43,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include <benchmark/benchmark.h>
 
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <random>
+import std;
 
 template <typename Numerator, fcarouge::algebraic Denominator>
 constexpr auto fcarouge::operator/(const Numerator &lhs, const Denominator &rhs)

diff --git a/include/fcarouge/internal/format.hpp b/include/fcarouge/internal/format.hpp
@@ -41,8 +41,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include "fcarouge/utility.hpp"
 
-#include <format>
-#include <type_traits>
+import std;
 
 namespace fcarouge {
 template <typename> class kalman;

diff --git a/include/fcarouge/internal/function.hpp b/include/fcarouge/internal/function.hpp
@@ -39,7 +39,7 @@ For more information, please refer to <https://unlicense.org> */
 #ifndef FCAROUGE_INTERNAL_FUNCTION_HPP
 #define FCAROUGE_INTERNAL_FUNCTION_HPP
 
-#include <memory>
+import std;
 
 namespace fcarouge::internal {
 // Compile-time `std::function` partial drop-in.

diff --git a/include/fcarouge/internal/utility.hpp b/include/fcarouge/internal/utility.hpp
@@ -39,8 +39,7 @@ For more information, please refer to <https://unlicense.org> */
 #ifndef FCAROUGE_INTERNAL_UTILITY_HPP
 #define FCAROUGE_INTERNAL_UTILITY_HPP
 
-#include <concepts>
-#include <type_traits>
+import std;
 
 namespace fcarouge::internal {
 template <typename Type>

diff --git a/include/fcarouge/kalman.hpp b/include/fcarouge/kalman.hpp
@@ -51,11 +51,7 @@ For more information, please refer to <https://unlicense.org> */
 #include "internal/format.hpp"
 #include "utility.hpp"
 
-#include <concepts>
-#include <cstddef>
-#include <functional>
-#include <type_traits>
-#include <utility>
+import std;
 
 namespace fcarouge {
 //! @name Types

diff --git a/linalg/lazy/fcarouge/linalg.hpp b/linalg/lazy/fcarouge/linalg.hpp
@@ -49,14 +49,7 @@ For more information, please refer to <https://unlicense.org> */
 
 #include "fcarouge/utility.hpp"
 
-#include <algorithm>
-#include <array>
-#include <concepts>
-#include <coroutine>
-#include <generator>
-#include <ranges>
-#include <type_traits>
-#include <utility>
+import std;
 
 namespace fcarouge {
 // Semantic? Guarantees? to_generator? std::ranges::to overload? make_generator?

diff --git a/sample/ekf_4x1x0_soaring.cpp b/sample/ekf_4x1x0_soaring.cpp
@@ -2,7 +2,8 @@
 #include "fcarouge/linalg.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_1x1x0_building_height.cpp b/sample/kf_1x1x0_building_height.cpp
@@ -1,7 +1,8 @@
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_1x1x0_liquid_temperature.cpp b/sample/kf_1x1x0_liquid_temperature.cpp
@@ -1,7 +1,8 @@
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_1x1x1_dog_position.cpp b/sample/kf_1x1x1_dog_position.cpp
@@ -1,7 +1,8 @@
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_2x1x1_rocket_altitude.cpp b/sample/kf_2x1x1_rocket_altitude.cpp
@@ -2,8 +2,8 @@
 #include "fcarouge/linalg.hpp"
 
 #include <cassert>
-#include <chrono>
-#include <cmath>
+
+import std;
 
 namespace fcarouge::sample {
 namespace {

diff --git a/sample/kf_6x2x0_vehicle_location.cpp b/sample/kf_6x2x0_vehicle_location.cpp
@@ -2,7 +2,8 @@
 #include "fcarouge/linalg.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 template <typename Numerator, fcarouge::algebraic Denominator>
 constexpr auto fcarouge::operator/(const Numerator &lhs, const Denominator &rhs)

diff --git a/sample/kf_8x4x0_deep_sort_bounding_box.cpp b/sample/kf_8x4x0_deep_sort_bounding_box.cpp
@@ -2,7 +2,8 @@
 #include "fcarouge/linalg.hpp"
 
 #include <cassert>
-#include <cmath>
+
+import std;
 
 template <typename Numerator, fcarouge::algebraic Denominator>
 constexpr auto fcarouge::operator/(const Numerator &lhs, const Denominator &rhs)

diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
@@ -103,5 +103,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   target_link_options(kalman_options INTERFACE "LINKER:-pie"
                       "LINKER:-z,relro,-z,now")
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  target_compile_options(kalman_options INTERFACE "/EHsc" "/W4")
+  target_compile_options(
+    kalman_options INTERFACE "/EHsc" "/W4" "/experimental:module"
+                             "/std:c++latest")
 endif()
diff --git a/test/kalman_format.cpp b/test/kalman_format.cpp
@@ -39,7 +39,8 @@ For more information, please refer to <https://unlicense.org> */
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <format>
+
+import std;
 
 namespace fcarouge::test {
 namespace {

diff --git a/test/kalman_format_arguments.cpp b/test/kalman_format_arguments.cpp
@@ -39,7 +39,8 @@ For more information, please refer to <https://unlicense.org> */
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <format>
+
+import std;
 
 namespace fcarouge::test {
 namespace {

diff --git a/test/kalman_format_float_1x1x1.cpp b/test/kalman_format_float_1x1x1.cpp
@@ -39,7 +39,8 @@ For more information, please refer to <https://unlicense.org> */
 #include "fcarouge/kalman.hpp"
 
 #include <cassert>
-#include <format>
+
+import std;
 
 namespace fcarouge::test {
 namespace {

diff --git a/test/linalg_identity_default.cpp b/test/linalg_identity_default.cpp
@@ -39,7 +39,8 @@ For more information, please refer to <https://unlicense.org> */
 #include "fcarouge/linalg.hpp"
 
 #include <cassert>
-#include <type_traits>
+
+import std;
 
 namespace fcarouge::test {
 namespace {

diff --git a/test/linalg_zero_default.cpp b/test/linalg_zero_default.cpp
@@ -39,7 +39,8 @@ For more information, please refer to <https://unlicense.org> */
 #include "fcarouge/linalg.hpp"
 
 #include <cassert>
-#include <type_traits>
+
+import std;
 
 namespace fcarouge::test {
 namespace {