Skip to content

Commit

Permalink
Merge pull request #724 from cppalliance/develop
Browse files Browse the repository at this point in the history
Merge to master for v2.3
  • Loading branch information
mborland committed Sep 4, 2024
2 parents 97d5ae8 + 489e13b commit 85480cc
Show file tree
Hide file tree
Showing 11 changed files with 74 additions and 228 deletions.
66 changes: 66 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -730,3 +730,69 @@ jobs:

- name: Run tests
run: ci/build.sh

intel:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
compiler: [ intel ]
standard: [ c++20 ]
steps:
- uses: actions/checkout@v4
with:
fetch-depth: '0'

- name: Intel Apt repository
timeout-minutes: 1
run: |
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update
- name: Install Intel oneAPI compilers
timeout-minutes: 5
run: sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-compiler-dpcpp-cpp

- name: Setup Intel oneAPI environment
run: |
source /opt/intel/oneapi/setvars.sh
printenv >> $GITHUB_ENV
- name: Setup Boost
run: |
echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
LIBRARY=${GITHUB_REPOSITORY#*/}
echo LIBRARY: $LIBRARY
echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
echo GITHUB_BASE_REF: $GITHUB_BASE_REF
echo GITHUB_REF: $GITHUB_REF
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
REF=${REF#refs/heads/}
echo REF: $REF
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
echo BOOST_BRANCH: $BOOST_BRANCH
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
mkdir -p libs/$LIBRARY
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
- name: Configure
run: |
cd ../boost-root
mkdir __build__ && cd __build__
cmake -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DBUILD_TESTING=ON ..
- name: Build tests
run: |
cd ../boost-root/__build__
cmake --build . --target tests
- name: Run tests
run: |
cd ../boost-root/__build__
ctest --output-on-failure --no-tests=error
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ conan create decimal/conan --build missing

# Supported Platforms

Boost.Decimal is tested on Ubuntu (x86_64, s390x, and aarch64),
macOS (x86_64, and Apple Silicon), and Windows (x86_64)
with the following compilers:
Boost.Decimal is tested natively on Ubuntu (x86_64, s390x, and aarch64), macOS (x86_64, and Apple Silicon), and Windows (x32 and x64);
as well as emulated PPC64LE and STM32 using QEMU with the following compilers:

* GCC 7 and later
* Clang 6 and later
* Visual Studio 2017 and later
* Intel OneAPI DPC++

# Synopsis

Expand Down
1 change: 0 additions & 1 deletion doc/decimal.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ include::decimal/cstdio.adoc[]
include::decimal/functional.adoc[]
include::decimal/limits.adoc[]
include::decimal/config.adoc[]
include::decimal/type_traits.adoc[]
include::decimal/examples.adoc[]
include::decimal/benchmarks.adoc[]
include::decimal/design.adoc[]
Expand Down
4 changes: 3 additions & 1 deletion doc/decimal/overview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ For example, while a fixed-point representation that allocates 8 decimal digits

== Supported Compilers

Boost.Decimal is tested on Ubuntu (x86_64, s390x, and aarch64), macOS (x86_64, and Apple Silicon), and Windows with the following compilers:
Boost.Decimal is tested natively on Ubuntu (x86_64, s390x, and aarch64), macOS (x86_64, and Apple Silicon), and Windows (x32 and x64);
as well as emulated PPC64LE and STM32 using QEMU with the following compilers:

* GCC 7 and later
* Clang 6 and later
* Visual Studio 2017 and later
* Intel OneAPI DPC++

Tested on https://github.com/cppalliance/decimal/actions[Github Actions] and https://drone.cpp.al/cppalliance/decimal[Drone].
Coverage can be found on https://app.codecov.io/gh/cppalliance/decimal[Codecov].
Expand Down
61 changes: 0 additions & 61 deletions doc/decimal/type_traits.adoc

This file was deleted.

1 change: 0 additions & 1 deletion include/boost/decimal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include <boost/decimal/hash.hpp>
#include <boost/decimal/cfloat.hpp>
#include <boost/decimal/charconv.hpp>
#include <boost/decimal/type_traits.hpp>
#include <boost/decimal/detail/io.hpp>
#include <boost/decimal/cstdio.hpp>
#include <boost/decimal/bid_conversion.hpp>
Expand Down
2 changes: 1 addition & 1 deletion include/boost/decimal/detail/remove_trailing_zeros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ constexpr auto remove_trailing_zeros(std::uint64_t n) noexcept -> remove_trailin
s = s * 2U + static_cast<std::size_t>(b);
n = b ? r : n;

r = rotr<64>(n * UINT32_C(14757395258967641293), 1);
r = rotr<64>(n * UINT64_C(14757395258967641293), 1);
b = r < UINT64_C(1844674407370955162);
s = s * 2U + static_cast<std::size_t>(b);
n = b ? r : n;
Expand Down
115 changes: 0 additions & 115 deletions include/boost/decimal/type_traits.hpp

This file was deleted.

2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)

if(HAVE_BOOST_TEST)

boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::decimal Boost::core Boost::math Boost::multiprecision Boost::charconv Boost::type_traits)
boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::decimal Boost::core Boost::math Boost::multiprecision Boost::charconv)

endif()
1 change: 0 additions & 1 deletion test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,4 @@ run test_tanh.cpp ;
run test_tgamma.cpp ;
run test_to_chars.cpp ;
run test_to_string.cpp ;
run test_type_traits.cpp ;
run test_zeta.cpp ;
43 changes: 0 additions & 43 deletions test/test_type_traits.cpp

This file was deleted.

0 comments on commit 85480cc

Please sign in to comment.