Merge pull request #476 from bluescarni/pr/more_models

Additional models

Author: bluescarni

.github/workflows/gha_ci.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Build
         shell: pwsh
         run: |
-          conda install -y cmake llvmdev tbb-devel tbb libboost-devel xtensor xtensor-blas blas blas-devel fmt spdlog sleef zlib libzlib mppp
+          conda install -y cmake llvmdev tbb-devel tbb libboost-devel xtensor xtensor-blas blas blas-devel fmt spdlog sleef zlib libzlib mppp openssl
           mkdir build
           cd build
           cmake ../ -G "Visual Studio 17 2022" -A x64 -DHEYOKA_BUILD_TESTS=yes -DHEYOKA_WITH_MPPP=yes -DHEYOKA_BUILD_TUTORIALS=ON -DHEYOKA_ENABLE_IPO=yes -DHEYOKA_WITH_SLEEF=yes
@@ -68,13 +68,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          # NOTE: this is needed by codecov
-          # apparently:
-          # https://github.com/codecov/codecov-action/issues/190
-          fetch-depth: 2
       - name: Build
         run: bash tools/gha_conda_coverage.sh
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          files: ./build/coverage.info
+          token: ${{ secrets.CODECOV_TOKEN }}
   conda_ubsan:
     runs-on: ubuntu-latest
     steps:

CMakeLists.txt

@@ -11,7 +11,7 @@ if(NOT CMAKE_BUILD_TYPE)
 	FORCE)
 endif()
 
-project(heyoka VERSION 7.2.2 LANGUAGES CXX C)
+project(heyoka VERSION 7.3.0 LANGUAGES CXX C)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/yacma")
 
@@ -32,6 +32,7 @@ include(YACMACompilerLinkerSettings)
 option(HEYOKA_BUILD_TESTS "Build unit tests." OFF)
 option(HEYOKA_BUILD_BENCHMARKS "Build benchmarks." OFF)
 option(HEYOKA_BUILD_TUTORIALS "Build tutorials." OFF)
+option(HEYOKA_BUILD_UTILS "Build utilities." OFF)
 option(HEYOKA_WITH_MPPP "Enable features relying on mp++." OFF)
 option(HEYOKA_WITH_SLEEF "Enable features relying on SLEEF." OFF)
 option(HEYOKA_BUILD_STATIC_LIBRARY "Build heyoka as a static library, instead of dynamic." OFF)
@@ -205,6 +206,10 @@ set(HEYOKA_SRC_FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/src/lagrangian.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/hamiltonian.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/logging.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/eop_data.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/eop_data_download.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/eop_data_iers_rapid.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/eop_data_iers_long_term.cpp"
     # VSOP2013 details.
     "${CMAKE_CURRENT_SOURCE_DIR}/src/detail/vsop2013/vsop2013_1_1.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/detail/vsop2013/vsop2013_1_2.cpp"
@@ -266,6 +271,8 @@ set(HEYOKA_SRC_FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/src/detail/elp2000/elp2000_10_15.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/detail/elp2000/elp2000_16_21.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/detail/elp2000/elp2000_22_36.cpp"
+    # EOP data details.
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/detail/eop_data/builtin_eop_data.cpp"
     # Models.
     "${CMAKE_CURRENT_SOURCE_DIR}/src/model/pendulum.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/model/nbody.cpp"
@@ -280,6 +287,9 @@ set(HEYOKA_SRC_FILES
     "${CMAKE_CURRENT_SOURCE_DIR}/src/model/nrlmsise00_tn.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/model/jb08_tn.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/model/sgp4.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/model/time_conversions.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/model/frame_transformations.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/model/era.cpp"
     # Callbacks.
     "${CMAKE_CURRENT_SOURCE_DIR}/src/callback/angle_reducer.cpp"
     # Math functions.
@@ -330,7 +340,7 @@ if(HEYOKA_WITH_SLEEF)
 endif()
 
 # Setup the heyoka ABI version number.
-set(HEYOKA_ABI_VERSION 34)
+set(HEYOKA_ABI_VERSION 35)
 
 if(HEYOKA_BUILD_STATIC_LIBRARY)
     # Setup of the heyoka static library.
@@ -501,36 +511,26 @@ find_package(TBB REQUIRED CONFIG)
 target_link_libraries(heyoka PRIVATE TBB::tbb)
 
 # Mandatory dependency on Boost.
-# NOTE: need 1.69 for safe numerics.
-set(_HEYOKA_MIN_BOOST_VERSION "1.69")
+# NOTE: need 1.85 for charconv.
+set(_HEYOKA_MIN_BOOST_VERSION "1.85")
 # NOTE: we look for Boost in CONFIG mode first, as that has become the official supported way
 # of locating Boost in recent Boost/CMake versions. If we fail, we try again in
 # MODULE mode as last resort.
-find_package(Boost ${_HEYOKA_MIN_BOOST_VERSION} QUIET COMPONENTS serialization CONFIG)
+find_package(Boost ${_HEYOKA_MIN_BOOST_VERSION} QUIET COMPONENTS serialization charconv CONFIG)
 if(NOT ${Boost_FOUND})
     message(STATUS "Boost not found in CONFIG mode, retrying in MODULE mode.")
-    find_package(Boost ${_HEYOKA_MIN_BOOST_VERSION} QUIET MODULE COMPONENTS serialization)
+    find_package(Boost ${_HEYOKA_MIN_BOOST_VERSION} QUIET MODULE COMPONENTS serialization charconv)
 endif()
 if(NOT ${Boost_FOUND})
     message(FATAL_ERROR "Could not locate Boost in either CONFIG or MODULE mode.")
 endif()
 message(STATUS "Found Boost version ${Boost_VERSION}.")
 target_link_libraries(heyoka PUBLIC Boost::boost Boost::serialization)
+target_link_libraries(heyoka PRIVATE Boost::charconv)
 # NOTE: quench warnings from Boost when building the library.
 target_compile_definitions(heyoka PRIVATE BOOST_ALLOW_DEPRECATED_HEADERS)
-
-# NOTE: recent versions of libcxx remove std::unary_function/std::binary_function
-# (which have been deprecated since long) in C++17 mode. This breaks, e.g., hashing
-# functionality on older Boost versions. See:
-# https://github.com/boostorg/container_hash/issues/22
-# Note that the better approach here would be to detect libcxx rather than
-# just Apple, but at this time it seems like there's no easy way to detect
-# the stdlib implementation/version from CMake.
-if(APPLE AND Boost_VERSION VERSION_LESS "1.81.0")
-    # NOTE: make this a PUBLIC definition just to err on the side
-    # of caution.
-    target_compile_definitions(heyoka PUBLIC BOOST_NO_CXX98_FUNCTION_BASE)
-endif()
+# NOTE: make sure we do not use deprecated ASIO bits.
+target_compile_definitions(heyoka PRIVATE BOOST_ASIO_NO_DEPRECATED)
 
 # Optional dependency on mp++.
 set(_HEYOKA_MIN_SUPPORTED_MPPP_VERSION 2)
@@ -571,6 +571,10 @@ if(HEYOKA_WITH_SLEEF)
     target_link_libraries(heyoka PRIVATE heyoka::SLEEF)
 endif()
 
+# Mandatory private dependency on openssl.
+find_package(OpenSSL REQUIRED CONFIG)
+target_link_libraries(heyoka PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+
 # Configure config.hpp.
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/include/heyoka/config.hpp" @ONLY)
 
@@ -627,3 +631,7 @@ endif()
 if(HEYOKA_BUILD_TUTORIALS)
     add_subdirectory(tutorial)
 endif()
+
+if(HEYOKA_BUILD_UTILS)
+    add_subdirectory(utils)
+endif()

benchmark/CMakeLists.txt

@@ -1,6 +1,3 @@
-# NOTE: we look for Boost in CONFIG mode first, as that has become the official supported way
-# of locating Boost in recent Boost/CMake versions. If we fail, we try again in
-# MODULE mode as last resort.
 # NOTE: don't find a specific version as we already checked
 # outside that the Boost version is appropriate.
 find_package(Boost QUIET COMPONENTS program_options CONFIG)
@@ -11,17 +8,6 @@ endif()
 if(NOT ${Boost_FOUND})
     message(FATAL_ERROR "Could not locate Boost in either CONFIG or MODULE mode.")
 endif()
-if(NOT TARGET Boost::program_options)
-    message(STATUS "The 'Boost::program_options' imported target is missing, creating it.")
-    add_library(Boost::program_options UNKNOWN IMPORTED)
-    set_target_properties(Boost::program_options PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
-    )
-    set_target_properties(Boost::program_options PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${Boost_PROGRAM_OPTIONS_LIBRARY}"
-    )
-endif()
 
 # Find the xtensor bits.
 find_package(xtensor REQUIRED CONFIG)

codecov.yml

@@ -4,6 +4,7 @@ coverage:
   - "tutorial/.*"
   - "src/detail/vsop2013/.*"
   - "src/detail/elp2000/.*"
+  - "src/detail/eop_data/.*"
   - "include/heyoka/detail/tanuki*"
   - "include/heyoka/detail/mdspan*"
   - "src/detail/erfa/.*"

doc/changelog.rst

@@ -1,6 +1,31 @@
 Changelog
 =========
 
+7.3.0 (unreleased)
+------------------
+
+New
+~~~
+
+- Add support for LLVM 20
+  (`#477 <https://github.com/bluescarni/heyoka/pull/477>`__).
+- Introduce class to represent, manage and update EOP data
+  (`#476 <https://github.com/bluescarni/heyoka/pull/476>`__).
+- New models: time conversions, frame transformations, Earth
+  rotation angle
+  (`#476 <https://github.com/bluescarni/heyoka/pull/476>`__).
+
+Changes
+~~~~~~~
+
+- heyoka now requires LLVM >= 16
+  (`#477 <https://github.com/bluescarni/heyoka/pull/477>`__).
+- heyoka now requires Boost >= 1.85
+  (`#476 <https://github.com/bluescarni/heyoka/pull/476>`__).
+- heyoka now depends on OpenSSL
+  (`#476 <https://github.com/bluescarni/heyoka/pull/476>`__).
+
+
 7.2.1 (2025-01-07)
 ------------------
 

doc/install.rst

@@ -15,10 +15,11 @@ and several CPU architectures (x86-64, 64-bit ARM and 64-bit PowerPC).
 heyoka has the following **mandatory** dependencies:
 
 * the `LLVM <https://llvm.org/>`__ compiler infrastructure library (version >=16 and <=20),
-* the `Boost <https://www.boost.org/>`__ C++ libraries (version >=1.69),
+* the `Boost <https://www.boost.org/>`__ C++ libraries (version >=1.85),
 * the `{fmt} <https://fmt.dev/latest/index.html>`__ library (version >=9 and <=11),
 * the `spdlog <https://github.com/gabime/spdlog>`__ library,
-* the `TBB <https://github.com/oneapi-src/oneTBB>`__ library.
+* the `TBB <https://github.com/oneapi-src/oneTBB>`__ library,
+* the `OpenSSL <https://www.openssl.org/>`__ library.
 
 Additionally, heyoka has the following **optional** dependencies:
 

heyoka-config.cmake.in

@@ -21,9 +21,9 @@ endif()
 # NOTE: we look for Boost in CONFIG mode first, as that has become the official supported way
 # of locating Boost in recent Boost/CMake versions. If we fail, we try again in
 # MODULE mode as last resort.
-find_package(Boost @_HEYOKA_MIN_BOOST_VERSION@ QUIET COMPONENTS serialization CONFIG)
+find_package(Boost @_HEYOKA_MIN_BOOST_VERSION@ QUIET COMPONENTS serialization charconv CONFIG)
 if(NOT ${Boost_FOUND})
-    find_package(Boost @_HEYOKA_MIN_BOOST_VERSION@ QUIET MODULE COMPONENTS serialization)
+    find_package(Boost @_HEYOKA_MIN_BOOST_VERSION@ QUIET MODULE COMPONENTS serialization charconv)
 endif()
 if(NOT ${Boost_FOUND})
     message(FATAL_ERROR "Could not locate Boost in either CONFIG or MODULE mode.")

include/heyoka/detail/eop_data/builtin_eop_data.hpp

@@ -0,0 +1,28 @@
+// Copyright 2020-2025 Francesco Biscani ([email protected]), Dario Izzo ([email protected])
+//
+// This file is part of the heyoka library.
+//
+// This Source Code Form is subject to the terms of the Mozilla
+// Public License v. 2.0. If a copy of the MPL was not distributed
+// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#ifndef HEYOKA_DETAIL_EOP_DATA_BUILTIN_EOP_DATA_HPP
+#define HEYOKA_DETAIL_EOP_DATA_BUILTIN_EOP_DATA_HPP
+
+#include <heyoka/config.hpp>
+#include <heyoka/eop_data.hpp>
+
+HEYOKA_BEGIN_NAMESPACE
+
+namespace detail
+{
+
+extern const char *const builtin_eop_data_ts;
+
+extern const eop_data_row builtin_eop_data[19437];
+
+} // namespace detail
+
+HEYOKA_END_NAMESPACE
+
+#endif

include/heyoka/detail/erfa_decls.hpp

@@ -0,0 +1,22 @@
+// Copyright 2020-2025 Francesco Biscani ([email protected]), Dario Izzo ([email protected])
+//
+// This file is part of the heyoka library.
+//
+// This Source Code Form is subject to the terms of the Mozilla
+// Public License v. 2.0. If a copy of the MPL was not distributed
+// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#ifndef HEYOKA_DETAIL_ERFA_DECLS_HPP
+#define HEYOKA_DETAIL_ERFA_DECLS_HPP
+
+// NOTE: this header contains declarations of erfa functions used within heyoka.
+
+extern "C" {
+int eraUtctai(double, double, double *, double *);
+int eraTaitt(double, double, double *, double *);
+int eraUtcut1(double, double, double, double *, double *);
+int eraTaiutc(double, double, double *, double *);
+double eraEra00(double, double);
+}
+
+#endif

include/heyoka/detail/fast_unordered.hpp

@@ -11,57 +11,22 @@
 
 #include <heyoka/config.hpp>
 
-#include <boost/version.hpp>
-
-#if (BOOST_VERSION / 100000 > 1) || (BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 % 1000 >= 81)
-
-#define HEYOKA_HAVE_BOOST_UNORDERED_FLAT
-
-#endif
-
-#if defined(HEYOKA_HAVE_BOOST_UNORDERED_FLAT)
-
 #include <boost/unordered/unordered_flat_map.hpp>
 #include <boost/unordered/unordered_flat_set.hpp>
 
-#else
-
-#include <unordered_map>
-#include <unordered_set>
-
-#endif
-
 HEYOKA_BEGIN_NAMESPACE
 
 namespace detail
 {
 
 template <typename... Args>
-using fast_uset =
-#if defined(HEYOKA_HAVE_BOOST_UNORDERED_FLAT)
-    boost::unordered_flat_set<Args...>
-#else
-    std::unordered_set<Args...>
-#endif
-    ;
+using fast_uset = boost::unordered_flat_set<Args...>;
 
 template <typename... Args>
-using fast_umap =
-#if defined(HEYOKA_HAVE_BOOST_UNORDERED_FLAT)
-    boost::unordered_flat_map<Args...>
-#else
-    std::unordered_map<Args...>
-#endif
-    ;
+using fast_umap = boost::unordered_flat_map<Args...>;
 
 } // namespace detail
 
 HEYOKA_END_NAMESPACE
 
-#if defined(HEYOKA_HAVE_BOOST_UNORDERED_FLAT)
-
-#undef HEYOKA_HAVE_BOOST_UNORDERED_FLAT
-
-#endif
-
 #endif

include/heyoka/detail/llvm_helpers.hpp

@@ -140,6 +140,7 @@ HEYOKA_DLL_PUBLIC llvm::Constant *llvm_constantfp(llvm_state &, llvm::Type *, do
 
 HEYOKA_DLL_PUBLIC llvm::Value *llvm_fcmp_ult(llvm_state &, llvm::Value *, llvm::Value *);
 HEYOKA_DLL_PUBLIC llvm::Value *llvm_fcmp_uge(llvm_state &, llvm::Value *, llvm::Value *);
+HEYOKA_DLL_PUBLIC llvm::Value *llvm_fcmp_ule(llvm_state &, llvm::Value *, llvm::Value *);
 HEYOKA_DLL_PUBLIC llvm::Value *llvm_fcmp_oge(llvm_state &, llvm::Value *, llvm::Value *);
 HEYOKA_DLL_PUBLIC llvm::Value *llvm_fcmp_ole(llvm_state &, llvm::Value *, llvm::Value *);
 HEYOKA_DLL_PUBLIC llvm::Value *llvm_fcmp_olt(llvm_state &, llvm::Value *, llvm::Value *);
@@ -209,6 +210,10 @@ HEYOKA_DLL_PUBLIC std::pair<llvm::Value *, llvm::Value *> llvm_eft_product(llvm_
 HEYOKA_DLL_PUBLIC std::pair<llvm::Value *, llvm::Value *> llvm_dl_add(llvm_state &, llvm::Value *, llvm::Value *,
                                                                       llvm::Value *, llvm::Value *);
 
+// Subtraction.
+HEYOKA_DLL_PUBLIC std::pair<llvm::Value *, llvm::Value *> llvm_dl_sub(llvm_state &, llvm::Value *, llvm::Value *,
+                                                                      llvm::Value *, llvm::Value *);
+
 // Multiplication.
 HEYOKA_DLL_PUBLIC std::pair<llvm::Value *, llvm::Value *> llvm_dl_mul(llvm_state &, llvm::Value *, llvm::Value *,
                                                                       llvm::Value *, llvm::Value *);

include/heyoka/detail/real_helpers.hpp

@@ -35,6 +35,7 @@ llvm::Function *real_nary_op(llvm_state &, llvm::Type *, const std::string &, un
 std::pair<llvm::Value *, llvm::Value *> llvm_real_sincos(llvm_state &, llvm::Value *);
 llvm::Value *llvm_real_fcmp_ult(llvm_state &, llvm::Value *, llvm::Value *);
 llvm::Value *llvm_real_fcmp_uge(llvm_state &, llvm::Value *, llvm::Value *);
+llvm::Value *llvm_real_fcmp_ule(llvm_state &, llvm::Value *, llvm::Value *);
 llvm::Value *llvm_real_fcmp_oge(llvm_state &, llvm::Value *, llvm::Value *);
 llvm::Value *llvm_real_fcmp_ole(llvm_state &, llvm::Value *, llvm::Value *);
 llvm::Value *llvm_real_fcmp_olt(llvm_state &, llvm::Value *, llvm::Value *);