Merge pull request #50 from darioizzo/pr/python_expose

* Exposing to python * Works on docs * Move to obake * New CI based on Azure
darioizzo · Nov 8, 2019 · fc8b69e · fc8b69e
2 parents 368c156 + 266116a
commit fc8b69e
Show file tree

Hide file tree

Showing 89 changed files with 2,902 additions and 12,546 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,36 +35,14 @@ matrix:
           - binutils-gold
     - env: DCGP_BUILD="CoverageGCC"
       dist: bionic
-      compiler: gcc
+      compiler: gcc 
       os: linux
       addons:
         apt:
           sources:
           - ubuntu-toolchain-r-test
           packa1ges:
           - binutils-gold
-    # These are to be uncommented when the quadmath issue is understood and fixed (maybe upstream?)
-    # These builds fail as per a not found quadmath.h ... its not clear why or how
-    #- env: DCGP_BUILD="ReleaseClang"
-    #  dist: bionic
-    #  compiler: clang
-    #  os: linux
-    #  addons:
-    #    apt:
-    #      sources:
-    #      - ubuntu-toolchain-r-test
-    #      packages:
-    #      - clang-7
-    #- env: DCGP_BUILD="DebugClang"
-    #  dist: bionic
-    #  compiler: clang
-    #  os: linux
-    #  addons:
-    #    apt:
-    #      sources:
-    #      - ubuntu-toolchain-r-test
-    #      packages:
-    #      - clang-7
     - env: DCGP_BUILD="Python37"
       dist: bionic
       compiler: gcc
@@ -74,6 +52,7 @@ matrix:
           sources:
           - ubuntu-toolchain-r-test
     - env: DCGP_BUILD="Python27"
+      dist: bionic
       compiler: gcc
       os: linux
       addons:
@@ -84,26 +63,19 @@ matrix:
       os: osx
     - env: DCGP_BUILD="OSXRelease"
       os: osx
-    # These are Commented as per a weird segfault that must be investigated ....
-    #- env: DCGP_BUILD="OSXPython37"
-    #  os: osx
-    #  #osx_image: xcode6.4
-    #- env: DCGP_BUILD="OSXPython27"
-    #  os: osx
-    #  #osx_image: xcode6.4
-    - env: DCGP_BUILD="manylinux64Py37" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
-      sudo: required
-      services:
-      - docker
-    - env: DCGP_BUILD="manylinux64Py36" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+    - env: DCGP_BUILD="OSXPython37"
+      os: osx
+    - env: DCGP_BUILD="OSXPython27"
+      os: osx
+    - env: DCGP_BUILD="manylinux64Py37" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
       sudo: required
       services:
       - docker
-    - env: DCGP_BUILD="manylinux64Py27" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+    - env: DCGP_BUILD="manylinux64Py36" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
       sudo: required
       services:
       - docker
-    - env: DCGP_BUILD="manylinux64Py27mu" DOCKER_IMAGE="pagmo2/manylinux1_x86_64_with_deps"
+    - env: DCGP_BUILD="manylinux64Py27" DOCKER_IMAGE="pagmo2/manylinux2010_x86_64_with_deps"
       sudo: required
       services:
       - docker

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,10 +65,76 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND YACMA_COMPILER_IS_CLANGXX)
   list(APPEND DCGP_CXX_FLAGS_RELEASE "-stdlib=libc++")
 endif()
 if(YACMA_COMPILER_IS_MSVC)
+  include(CheckCXXCompilerFlag)
   # Disable the idiotic minmax macros on MSVC, some annoying warnings,
   # and enable the bigobj option.
-  list(APPEND DCGP_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/bigobj")
-  list(APPEND DCGP_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/bigobj")
+  # Also, enable the WIN32_LEAN_AND_MEAN definition.
+  list(APPEND DCGP_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/bigobj" "-DWIN32_LEAN_AND_MEAN")
+  list(APPEND DCGP_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/bigobj" "-DWIN32_LEAN_AND_MEAN")
+  # Enable strict conformance mode, if supported.
+  set(CMAKE_REQUIRED_QUIET TRUE)
+  check_cxx_compiler_flag("/permissive-" _DCGP_MSVC_SUPPORTS_STRICT_CONFORMANCE)
+  unset(CMAKE_REQUIRED_QUIET)
+  if(_DCGP_MSVC_SUPPORTS_STRICT_CONFORMANCE)
+    message(STATUS "The '/permissive-' flag is supported, enabling it.")
+    list(APPEND DCGP_CXX_FLAGS_DEBUG "/permissive-")
+    list(APPEND DCGP_CXX_FLAGS_RELEASE "/permissive-")
+  endif()
+  unset(_DCGP_MSVC_SUPPORTS_STRICT_CONFORMANCE)
+  if(YACMA_COMPILER_IS_CLANGXX)
+    # clang-cl emits various warnings from GMP/MPFR, let's just silence them.
+    # NOTE: at one point in the recent past, MSVC added an options similar to GCC's isystem:
+    # https://blogs.msdn.microsoft.com/vcblog/2017/12/13/broken-warnings-theory/
+    # We probably just need to wait for this to be picked up by CMake/clang-cl. Let's
+    # revisit the issue in the future.
+    list(APPEND _DCGP_CLANG_CL_DISABLED_WARNINGS
+      "-Wno-unused-variable"
+      "-Wno-inconsistent-dllimport"
+      "-Wno-unknown-pragmas"
+      "-Wno-unused-parameter"
+      "-Wno-sign-compare"
+      "-Wno-deprecated-declarations"
+      "-Wno-deprecated-dynamic-exception-spec"
+      "-Wno-old-style-cast"
+      "-Wno-sign-conversion"
+      "-Wno-non-virtual-dtor"
+      "-Wno-deprecated"
+      "-Wno-shadow"
+      "-Wno-shorten-64-to-32"
+      "-Wno-reserved-id-macro"
+      "-Wno-undef"
+      "-Wno-c++98-compat-pedantic"
+      "-Wno-documentation-unknown-command"
+      "-Wno-zero-as-null-pointer-constant"
+      "-Wno-language-extension-token"
+      "-Wno-gnu-anonymous-struct"
+      "-Wno-nested-anon-types"
+      "-Wno-documentation"
+      "-Wno-comma"
+      "-Wno-nonportable-system-include-path"
+      "-Wno-global-constructors"
+      "-Wno-redundant-parens"
+      "-Wno-exit-time-destructors"
+      "-Wno-missing-noreturn"
+      "-Wno-switch-enum"
+      "-Wno-covered-switch-default"
+      "-Wno-float-equal"
+      "-Wno-double-promotion"
+      "-Wno-microsoft-enum-value"
+      "-Wno-missing-prototypes"
+      "-Wno-implicit-fallthrough"
+      "-Wno-format-nonliteral"
+      "-Wno-cast-qual"
+      "-Wno-disabled-macro-expansion"
+      "-Wno-unused-private-field"
+      "-Wno-unused-template"
+      "-Wno-unused-macros"
+      "-Wno-extra-semi-stmt"
+      "-Wno-c++98-compat")
+    list(APPEND DCGP_CXX_FLAGS_DEBUG ${_DCGP_CLANG_CL_DISABLED_WARNINGS})
+    list(APPEND DCGP_CXX_FLAGS_RELEASE ${_DCGP_CLANG_CL_DISABLED_WARNINGS})
+    unset(_DCGP_CLANG_CL_DISABLED_WARNINGS)
+  endif()
 endif()
 if(YACMA_COMPILER_IS_INTELXX)
   # NOTE: on MSVC we use the push/pop pragmas, but they do not seem to work on Intel (the pragmas
@@ -85,7 +151,7 @@ if(MINGW)
 	list(APPEND DCGP_CXX_FLAGS_RELEASE "-Wa,-mbig-obj")
 endif()
 
-# Some flags that generate warnings due to Eigen or Piranha obsolete versions
+# Some flags that generate warnings due to Eigen obsolete versions
 list(REMOVE_ITEM DCGP_CXX_FLAGS_DEBUG "-Wduplicated-branches")
 list(REMOVE_ITEM DCGP_CXX_FLAGS_DEBUG "-Wold-style-cast")
 
@@ -119,34 +185,9 @@ if(DCGP_BUILD_DCGP)
     message(STATUS "Eigen version detected: ${EIGEN3_VERSION}")
     include_directories(${EIGEN3_INCLUDE_DIR})
 
-    # Piranha setup.
-    find_package(Piranha REQUIRED)
-    message(STATUS "Piranha library found.")
-    message(STATUS "Piranha include dir is: ${Piranha_INCLUDE_DIR}")
-    include_directories(${Piranha_INCLUDE_DIR})
-
-    # GMP setup.
-    find_package(GMP REQUIRED)
-    message(STATUS "GMP library found.")
-    message(STATUS "GMP include dir is: ${GMP_INCLUDE_DIR}")
-    message(STATUS "GMP library is: ${GMP_LIBRARIES}")
-
-    # MPFR setup.
-    find_package(MPFR REQUIRED)
-    message(STATUS "MPFR library found.")
-    message(STATUS "MPFR include dir is: ${MPFR_INCLUDE_DIR}")
-    message(STATUS "MPFR library is: ${MPFR_LIBRARIES}")
-    message(STATUS "Checking MPFR version.")
-    try_compile(MPFR_VERSION_CHECK ${CMAKE_BINARY_DIR} "${CMAKE_SOURCE_DIR}/cmake_modules/mpfr_check_version.cpp"
-        CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${MPFR_INCLUDE_DIR};${GMP_INCLUDE_DIR}")
-    if(NOT MPFR_VERSION_CHECK)
-        message(FATAL_ERROR "Unsupported MPFR version, please upgrade.")
-    endif()
-    message(STATUS "MPFR version is ok.")
-
     # Audi setup
     find_package(Audi REQUIRED)
-    message(STATUS "AUDI include dir is: ${AUDI_INCLUDE_DIRS}")
+    message(STATUS "AUDI include dir is: ${DCGP_INCLUDE_DIRS}")
 
     # Pagmo setup
     find_package(Pagmo REQUIRED)
@@ -167,7 +208,7 @@ if(DCGP_BUILD_DCGP)
 
     # Setup of the header-only dcgp library.
     add_library(dcgp INTERFACE)
-    target_link_libraries(dcgp INTERFACE Threads::Threads Boost::boost Boost::serialization Eigen3::eigen3 MPFR::MPFR GMP::GMP TBB::tbb)
+    target_link_libraries(dcgp INTERFACE Boost::boost Boost::serialization Eigen3::eigen3 TBB::tbb)
     target_link_libraries(dcgp INTERFACE Audi::audi Pagmo::pagmo ${SYMENGINE_LIBRARIES})
 
 
@@ -177,14 +218,11 @@ if(DCGP_BUILD_DCGP)
     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
     $<INSTALL_INTERFACE:include>)
 
-    # These lines are temporary with piranha v0.10, may be simplified when this is updated
-    target_include_directories(dcgp INTERFACE ${Piranha_INCLUDE_DIR})
-
     # Build main
     if(DCGP_BUILD_MAIN)
         add_executable(main main.cpp)
         target_link_libraries(main dcgp)
-        set_property(TARGET main PROPERTY CXX_STANDARD 14)
+        set_property(TARGET main PROPERTY CXX_STANDARD 17)
         set_property(TARGET main PROPERTY CXX_STANDARD_REQUIRED YES)
         set_property(TARGET main PROPERTY CXX_EXTENSIONS NO)
     endif()
@@ -210,11 +248,7 @@ if(DCGP_BUILD_DCGP)
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dcgp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/dcgp-config.cmake" @ONLY)
 
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dcgp-config.cmake" DESTINATION "lib/cmake/dcgp")
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindGMP.cmake" 
-                  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindMPFR.cmake"
-                  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindPiranha.cmake"
-                  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/DCGPFindBoost.cmake"
-                  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindAudi.cmake"
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/DCGPFindBoost.cmake"
                   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindEigen3.cmake"
                   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/FindTBB.cmake"
                   DESTINATION "lib/cmake/dcgp")

diff --git a/README.md b/README.md
@@ -32,7 +32,6 @@ otherwise you will have to compile it by activating the BUILD_DCGPY option in CM
 ### Dependencies
 Several dependencies are necessary to successfully compile d-CGP
  * Audi, headers only library - (git clone https://github.com/darioizzo/audi.git)
- * Piranha, headers only library - (git clone https://github.com/bluescarni/piranha.git)
  * Boost, headers only
 
 After making sure the dependencies above are installed in your system, you may download the latest dCGP version via git:

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -54,6 +54,10 @@ jobs:
                         symengine ^
                         boost-cpp ^
                         boost ^
+                        tbb ^
+                        tbb-devel ^
+                        audi ^
+                        pyaudi ^
                         python=3.7
           conda list
         displayName: "Install conda packages"
@@ -87,7 +91,8 @@ jobs:
                 -DCMAKE_PREFIX_PATH=C:\tools\miniconda3\Library ^
                 -DCMAKE_INSTALL_PREFIX=C:\tools\miniconda3\Library ^
                 -DDCGP_BUILD_DCGP=no ^
-                -DDCGP_BUILD_DCGPY=yes
+                -DDCGP_BUILD_DCGPY=yes ^
+                -DDCGP_CXX_FLAGS_EXTRA="-D_copysign=copysign"
           cmake --build . -- -v
           cmake --build . --target install
           python -c "import dcgpy.test; dcgpy.test.run_test_suite()"

diff --git a/cmake_modules/FindAudi.cmake b/cmake_modules/FindAudi.cmake
diff --git a/cmake_modules/FindGMP.cmake b/cmake_modules/FindGMP.cmake