Merge pull request #536 from mkstoyanov/version_71

* bumped the version and some documentation to 7.1

Author: mkstoyanov

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 
 cmake_policy(VERSION 3.10)
 project(Tasmanian VERSION 7.1.0 LANGUAGES CXX)
-set(Tasmanian_version_comment " (release candidate)") # e.g., " (release candidate)", " (development)", ""
+set(Tasmanian_version_comment "") # 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)
 
 ########################################################################

Config/AltBuildSystems/TasmanianConfig.hpp

@@ -33,7 +33,7 @@
 
 #define TASMANIAN_VERSION_MAJOR 7
 #define TASMANIAN_VERSION_MINOR 1
-#define TASMANIAN_VERSION_STRING "7.1 (release candidate)"
+#define TASMANIAN_VERSION_STRING "7.1"
 #define TASMANIAN_LICENSE "BSD 3-Clause with UT-Battelle disclaimer"
 
 #define TASMANIAN_GIT_COMMIT_HASH "Tasmanian git hash is not available here"

Doxygen/Installation.md

@@ -230,8 +230,14 @@ python -m pip install Tasmanian                         # will install Tasmanian
 python -m Tasmanian                                     # print the install log
 ./tasmanian_virtual_env/bin/tasgrid -v                  # print the available CUDA devices
 ```
-**Note:** under MS Windows the environment variables can be set from Advanced System Settings,
-but the paths should use Linux style of back-slashes, e.g., `C:/Program Files/CUDA/bin/nvcc.exe`
+
+Additional notes:
+* under MS Windows the environment variables can be set from Advanced System Settings,
+  but the paths should use Linux style of back-slashes, e.g., `C:/Program Files/CUDA/bin/nvcc.exe`
+* scikit build does not support the latest `Visual Studio 16 2019`, regular CMake install works fine
+* under OSX some users have reported segfaults when using a pip install, the problem does not
+  appear when using CMake or the install script, the issue is under investigation
+
 
 ### Install with Spack
 

InterfacePython/PipInstaller/setup.py

@@ -70,7 +70,7 @@
 # call the actual package setup command
 setup(
     name='Tasmanian',
-    version='7.1rc3',
+    version='7.1',
     author='Miroslav Stoyanov',
     author_email='stoyanovmk@ornl.gov',
     description='UQ library for sparse grids and Bayesian inference',

README.md

@@ -5,7 +5,7 @@ The Toolkit for Adaptive Stochastic Modeling and Non-Intrusive ApproximatioN is
 Visit us at: [https://tasmanian.ornl.gov/](https://tasmanian.ornl.gov/) and
 [https://github.com/ORNL/Tasmanian](https://github.com/ORNL/Tasmanian)
 
-[Documentation: v7.0 (latest stable)](https://tasmanian.ornl.gov/documentation/)
+[Documentation: v7.1 (latest stable)](https://ornl.github.io/TASMANIAN/stable/)
 
 [Documentation: development (rolling)](https://ornl.github.io/TASMANIAN/)
 

SparseGrids/TasmanianSparseGrid.h

@@ -123,6 +123,7 @@ void tsgEvaluateHierarchicalFunctions(void *grid, const double *x, int num_x, do
 void tsgEvaluateSparseHierarchicalFunctions(void *grid, const double x[], int num_x, int **pntr, int **indx, double **vals);
 int tsgEvaluateSparseHierarchicalFunctionsGetNZ(void *grid, const double x[], int num_x);
 void tsgEvaluateSparseHierarchicalFunctionsStatic(void *grid, const double x[], int num_x, int *pntr, int *indx, double *vals);
+void tsgGetHierarchicalSupportStatic(void *grid, double support[]);
 const double* tsgGetHierarchicalCoefficients(void *grid);
 void tsgGetHierarchicalCoefficientsStatic(void *grid, double *coeff);
 void tsgSetHierarchicalCoefficients(void *grid, const double *c);
@@ -134,6 +135,7 @@ int* tsgPythonGetGlobalPolynomialSpace(void *grid, int interpolation, int *num_i
 void tsgGetGlobalPolynomialSpace(void *grid, int interpolation, int *num_indexes, int **indexes);
 void tsgPrintStats(void *grid);
 void tsgEnableAcceleration(void *grid, const char *accel);
+void tsgEnableAccelerationGPU(void *grid, const char *accel, int gpu);
 //int tsgGetAccelerationTypeInt(void *grid){ return AccelerationMeta::getIOAccelerationInt(((TasmanianSparseGrid*) grid)->getAccelerationType()); } // int to acceleration type
 const char* tsgGetAccelerationType(void *grid);
 void tsgSetGPUID(void *grid, int gpuID);

SparseGrids/TasmanianSparseGridWrapC.cpp

@@ -343,8 +343,7 @@ void* tsgGetCandidateConstructionPointsVoidPntr(void *grid, const char *sType, i
     }
     return (void*) vecx;
 }
-void* tsgGetCandidateConstructionPointsSurplusVoidPntr(void *grid, double tolerance, const char *sRefType, int output,
-                                                       const int *limit_levels, const double *scale_correction){ // internal use only
+void* tsgGetCandidateConstructionPointsSurplusVoidPntr(void *grid, double tolerance, const char *sRefType, int output, const int *limit_levels, const double *scale_correction){ // internal use only
     TypeRefinement ref_type = IO::getTypeRefinementString(sRefType);
     #ifndef NDEBUG
     if (ref_type == refine_none){ cerr << "WARNING: incorrect depth type: " << sRefType << ", defaulting to refine_classic." << endl; }
@@ -370,8 +369,7 @@ void tsgGetCandidateConstructionPoints(void *grid, const char *sType, int output
     std::copy_n(vecx->data(), vecx->size(), *x);
     delete vecx;
 }
-void tsgGetCandidateConstructionSurplusPoints(void *grid, double tolerance, const char *sRefType, int output, const int *limit_levels, const double *scale_correction,
-                                              int *num_points, double **x){
+void tsgGetCandidateConstructionSurplusPoints(void *grid, double tolerance, const char *sRefType, int output, const int *limit_levels, const double *scale_correction, int *num_points, double **x){
     size_t dims = (size_t) ((TasmanianSparseGrid*) grid)->getNumDimensions();
     std::vector<double>* vecx = (std::vector<double>*) tsgGetCandidateConstructionPointsSurplusVoidPntr(grid, tolerance, sRefType, output, limit_levels, scale_correction);
     *num_points = (int)(vecx->size() / dims);