Merge pull request #792 from mkstoyanov/fixes

* enable GNU Include Dirs in CMake
* fix deprecated check in python-pip
* allocating one memory call

Author: mkstoyanov

Addons/CMakeLists.txt

@@ -23,23 +23,19 @@ target_include_directories(Tasmanian_addons INTERFACE $<BUILD_INTERFACE:${CMAKE_
 target_link_libraries(Tasmanian_addons INTERFACE Tasmanian_libdream)
 
 if (Tasmanian_ENABLE_PYTHON) # the C addons are used by Python
-    add_library(Tasmanian_caddons SHARED tsgCExoticQuadrature.cpp 
-                                         tsgCLoadNeededValues.cpp 
-                                         tsgCConstructSurrogate.cpp 
+    add_library(Tasmanian_caddons SHARED tsgCExoticQuadrature.cpp
+                                         tsgCLoadNeededValues.cpp
+                                         tsgCConstructSurrogate.cpp
                                          tsgCLoadUnstructuredPoints.cpp)
 
-    target_link_libraries(Tasmanian_caddons  Tasmanian_addons)
+    target_link_libraries(Tasmanian_caddons Tasmanian_addons)
 
     set_target_properties(Tasmanian_caddons PROPERTIES OUTPUT_NAME "tasmaniancaddons"
                                                        INSTALL_RPATH "${Tasmanian_rpath}"
                                                        SOVERSION ${Tasmanian_VERSION_MAJOR}
                                                        VERSION   ${PROJECT_VERSION})
 
-    install(TARGETS Tasmanian_caddons
-            EXPORT  "${Tasmanian_export_name}"
-            RUNTIME DESTINATION "bin"
-            LIBRARY DESTINATION "lib"
-            ARCHIVE DESTINATION "lib")
+    install(TARGETS Tasmanian_caddons EXPORT "${Tasmanian_export_name}")
 endif()
 
 # The Tasmanian MPI capabilities are templated into the Addons

CMakeLists.txt

@@ -5,6 +5,8 @@ project(Tasmanian VERSION 8.2.0 LANGUAGES CXX)
 set(Tasmanian_version_comment " (release candidate)") # e.g., " (release candidate)", " (development)", ""
 set(Tasmanian_license "BSD 3-Clause with UT-Battelle disclaimer") # used in some headers and python modules (only human readable)
 
+include(GNUInstallDirs) # allows management of install paths
+
 ########################################################################
 #  User specified options:
 #    -D Tasmanian_ENABLE_RECOMMENDED:BOOL=OFF (includes some flags)

DREAM/CMakeLists.txt

@@ -33,11 +33,7 @@ if (Tasmanian_ENABLE_OPENMP)
     target_compile_options(Tasmanian_libdream PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${OpenMP_CXX_FLAGS}>)
 endif()
 
-install(TARGETS Tasmanian_libdream
-        EXPORT  "${Tasmanian_export_name}"
-        RUNTIME DESTINATION "bin"
-        LIBRARY DESTINATION "lib"
-        ARCHIVE DESTINATION "lib")
+install(TARGETS Tasmanian_libdream EXPORT "${Tasmanian_export_name}")
 
 
 ########################################################################

InterfacePython/PipInstaller/setup.py

@@ -2,20 +2,9 @@
 import sys, site
 
 # do standard skbuild setup
-from packaging import version
 from skbuild.exceptions import SKBuildError
-from skbuild.cmaker import get_cmake_version
 from skbuild import setup  # This line replaces 'from setuptools import setup'
 
-# Add CMake as a build requirement if cmake is not installed or too old
-setup_requires = []
-try:
-    if version.parse(get_cmake_version()) < version.parse("3.19"):
-        setup_requires.append('cmake>=3.19')
-except SKBuildError:
-    setup_requires.append('cmake>=3.19')
-setup_requires.append('numpy>=1.10')
-
 with open('README.md', 'r') as fh:
      readme_file = fh.readlines()
 
@@ -84,7 +73,7 @@
     ],
     install_requires=['numpy>=1.10'],
     ### cmake portion of the setup, specific to skbuild ###
-    setup_requires=setup_requires,
+    setup_requires=['numpy>=1.10', ],
     cmake_args=cmake_args,
     py_modules=[]
 )

InterfaceSwig/CMakeLists.txt

@@ -88,11 +88,7 @@ macro(Tasmanian_macro_add_libdfortran03)
     Tasmanian_set_fortran_props(TARGET Tasmanian_libfortran03 OUTPUT_NAME "tasmanianfortran")
     Tasmanian_rpath_target(TARGET Tasmanian_libfortran03)
 
-    install(TARGETS Tasmanian_libfortran03
-            EXPORT "${Tasmanian_export_name}"
-            RUNTIME DESTINATION "bin"
-            LIBRARY DESTINATION "lib"
-            ARCHIVE DESTINATION "lib")
+    install(TARGETS Tasmanian_libfortran03 EXPORT "${Tasmanian_export_name}")
 
     if (Tasmanian_ENABLE_MPI)
         file(READ "${Tasmanian_GENERATE_DIR}/tasmanian_mpi_swig.f90" Tasmanian_generated_f90)
@@ -108,11 +104,8 @@ macro(Tasmanian_macro_add_libdfortran03)
         Tasmanian_rpath_target(TARGET Tasmanian_libfortranmpi03)
         target_link_libraries(Tasmanian_libfortranmpi03  Tasmanian_libfortran03)
 
-        install(TARGETS Tasmanian_libfortranmpi03
-                EXPORT "${Tasmanian_export_name}"
-                RUNTIME DESTINATION "bin"
-                LIBRARY DESTINATION "lib"
-                ARCHIVE DESTINATION "lib")
+        install(TARGETS Tasmanian_libfortranmpi03 EXPORT "${Tasmanian_export_name}")
+
         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tasmanian_mpi.mod"
                 DESTINATION include
                 PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)

SparseGrids/CMakeLists.txt

@@ -123,11 +123,7 @@ if (Tasmanian_ENABLE_OPENMP)
     target_compile_options(Tasmanian_libsparsegrid PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${OpenMP_CXX_FLAGS}>)
 endif()
 
-install(TARGETS Tasmanian_libsparsegrid
-        EXPORT  "${Tasmanian_export_name}"
-        RUNTIME DESTINATION "bin"
-        LIBRARY DESTINATION "lib"
-        ARCHIVE DESTINATION "lib")
+install(TARGETS Tasmanian_libsparsegrid EXPORT "${Tasmanian_export_name}")
 
 foreach(_tsgtarget gridtest benchmarksgrid)
     target_link_libraries(Tasmanian_${_tsgtarget} Tasmanian_libsparsegrid)

SparseGrids/tsgIndexManipulator.hpp

@@ -478,6 +478,7 @@ inline MultiIndexSet getLargestCompletion(MultiIndexSet const &current, MultiInd
         }
     }
 
+    std::vector<int> kid(num_dimensions);
     std::vector<int> scratch(num_dimensions);
     bool loopon = true;
     while(loopon){
@@ -486,7 +487,7 @@ inline MultiIndexSet getLargestCompletion(MultiIndexSet const &current, MultiInd
         MultiIndexSet total = current;
         if (!result.empty()) total += result;
         for(int i=0; i<total.getNumIndexes(); i++){
-            std::vector<int> kid(total.getIndex(i), total.getIndex(i) + num_dimensions);
+            std::copy_n(total.getIndex(i), num_dimensions, kid.begin());
             for(int &k : kid){
                 k++; // construct the kid in the new direction
                 if (!candidates.missing(kid) && result.missing(kid) && isLowerComplete(kid, total, scratch))

Tasgrid/CMakeLists.txt

@@ -47,8 +47,4 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../configured/tasgridLogs.hpp"
         DESTINATION include
         PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 
-install(TARGETS Tasmanian_tasgrid
-        EXPORT "${Tasmanian_export_name}"
-        RUNTIME DESTINATION "bin"
-        LIBRARY DESTINATION "lib"
-        ARCHIVE DESTINATION "lib")
+install(TARGETS Tasmanian_tasgrid EXPORT "${Tasmanian_export_name}")