Merge branch 'master' of github.com:bluescarni/mppp

bluescarni · Sep 2, 2021 · 5ad2dc5 · 5ad2dc5
2 parents 67a6025 + 916a11f
commit 5ad2dc5
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
       arch: ppc64le
       dist: focal
 script:
-    - tools/travis_ubuntu_ppc64.sh
+    - tools/travis_docker.sh
 
 notifications:
   email: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT CMAKE_BUILD_TYPE)
 	FORCE)
 endif()
 
-project(mp++ VERSION 0.25 LANGUAGES CXX C)
+project(mp++ VERSION 0.26 LANGUAGES CXX C)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/yacma")
 
@@ -276,8 +276,8 @@ if(MPPP_BUILD_STATIC_LIBRARY)
 else()
     # Setup of the mp++ shared library.
     add_library(mp++ SHARED "${MPPP_SRC_FILES}")
-    set_property(TARGET mp++ PROPERTY VERSION "11.0")
-    set_property(TARGET mp++ PROPERTY SOVERSION 11)
+    set_property(TARGET mp++ PROPERTY VERSION "12.0")
+    set_property(TARGET mp++ PROPERTY SOVERSION 12)
     set_property(TARGET mp++ PROPERTY DEFINE_SYMBOL "mppp_EXPORTS")
     set_target_properties(mp++ PROPERTIES CXX_VISIBILITY_PRESET hidden)
     set_target_properties(mp++ PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE)

diff --git a/config.hpp.in b/config.hpp.in
@@ -240,11 +240,17 @@
 #else
 
 // On non-clang, let's always assume that __float128
-// can interact with long double.
+// can interact with long double, *unless* we are on
+// PowerPC. On such a setup, GCC disables interaction
+// between __float128 and long double.
+#if !defined(__PPC__)
+
 #define MPPP_FLOAT128_WITH_LONG_DOUBLE
 
 #endif
 
 #endif
 
 #endif
+
+#endif
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.26 (unreleased)
+-----------------
+
+Fix
+~~~
+
+- :cpp:class:`~mppp::real128` and :cpp:class:`~mppp::complex128`
+  are now correctly supported on PPC64, if ``__float128`` is available
+  (`#286 <https://github.com/bluescarni/mppp/pull/286>`__).
+
 0.25 (2021-08-31)
 -----------------
 

diff --git a/tools/travis_docker.sh b/tools/travis_docker.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Echo each command.
+set -x
+
+# Exit on error.
+set -e
+
+docker run --rm -v `pwd`:/mppp ubuntu:focal bash /mppp/tools/travis_ubuntu_ppc64.sh
+
+set +e
+set +x
diff --git a/tools/travis_ubuntu_ppc64.sh b/tools/travis_ubuntu_ppc64.sh
@@ -6,25 +6,25 @@ set -x
 # Exit on error.
 set -e
 
-# Core deps.
-sudo apt-get install build-essential wget
+# Install wget.
+apt-get update
+apt-get -y install wget
 
 # Install conda+deps.
 wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-ppc64le.sh -O miniconda.sh
 export deps_dir=$HOME/local
 export PATH="$HOME/miniconda/bin:$PATH"
 bash miniconda.sh -b -p $HOME/miniconda
-conda_pkgs="cmake gmp mpfr libflint arb python=3.8 pybind11 mpc boost-cpp"
-conda create -q -p $deps_dir -y
+conda create -y -q -p $deps_dir cmake gmp mpfr libflint arb python=3.8 pybind11 mpc boost-cpp c-compiler cxx-compiler make
 source activate $deps_dir
-conda install $conda_pkgs -y
 
 # Create the build dir and cd into it.
+cd /mppp
 mkdir build
 cd build
 
 # GCC build.
-cmake ../ -DCMAKE_PREFIX_PATH=$deps_dir -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Debug -DMPPP_BUILD_TESTS=YES -DBoost_NO_BOOST_CMAKE=ON -DMPPP_WITH_BOOST_S11N=yes -DMPPP_WITH_MPFR=yes -DMPPP_WITH_MPC=yes -DMPPP_WITH_ARB=yes -DMPPP_TEST_PYBIND11=yes -DPYBIND11_PYTHON_VERSION=3.8 -DMPPP_ENABLE_IPO=yes
+cmake ../ -DCMAKE_PREFIX_PATH=$deps_dir -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Debug -DMPPP_BUILD_TESTS=YES -DBoost_NO_BOOST_CMAKE=ON -DMPPP_WITH_BOOST_S11N=yes -DMPPP_WITH_QUADMATH=yes -DMPPP_WITH_MPFR=yes -DMPPP_WITH_MPC=yes -DMPPP_WITH_ARB=yes -DMPPP_TEST_PYBIND11=yes -DPYBIND11_PYTHON_VERSION=3.8
 make -j2 VERBOSE=1
 # Run the tests.
 ctest -V -j2