From 6d3114e44985cf858445a0f8789bc762c5db21c3 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov Date: Thu, 15 Feb 2024 12:53:21 -0500 Subject: [PATCH 1/3] can disable recommended in pip --- Config/CMakeIncludes/sanity_check_and_xsdk.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Config/CMakeIncludes/sanity_check_and_xsdk.cmake b/Config/CMakeIncludes/sanity_check_and_xsdk.cmake index fa6522fa4..f3de83b41 100644 --- a/Config/CMakeIncludes/sanity_check_and_xsdk.cmake +++ b/Config/CMakeIncludes/sanity_check_and_xsdk.cmake @@ -7,6 +7,9 @@ endif() # get extra options from the ENV variables (pip-installer) if (SKBUILD) + if ("$ENV{Tasmanian_ENABLE_RECOMMENDED}" STREQUAL "OFF") + set(Tasmanian_ENABLE_RECOMMENDED OFF) + endif() if (NOT "$ENV{Tasmanian_ENABLE_BLAS}" STREQUAL "") set(Tasmanian_ENABLE_BLAS ON) set(BLAS_LIBRARIES "$ENV{Tasmanian_ENABLE_BLAS}") From 7678f6128fca017e87f2a8908947d5d9606b8743 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov Date: Thu, 15 Feb 2024 12:56:37 -0500 Subject: [PATCH 2/3] update pip fix version --- InterfacePython/PipInstaller/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InterfacePython/PipInstaller/setup.py b/InterfacePython/PipInstaller/setup.py index 822e0e9e1..30cb08667 100644 --- a/InterfacePython/PipInstaller/setup.py +++ b/InterfacePython/PipInstaller/setup.py @@ -70,7 +70,7 @@ # call the actual package setup command setup( name='Tasmanian', - version='8.0', + version='8.0fix1', author='Miroslav Stoyanov', author_email='stoyanovmk@ornl.gov', description='UQ library for sparse grids, optimization and Bayesian inference', From 92778cfc3dbb966b623a6e1dd3036dcd887bebd5 Mon Sep 17 00:00:00 2001 From: Miroslav Stoyanov Date: Thu, 15 Feb 2024 13:29:36 -0500 Subject: [PATCH 3/3] update the docs --- Doxygen/Installation.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Doxygen/Installation.md b/Doxygen/Installation.md index f385f35b8..9220db330 100644 --- a/Doxygen/Installation.md +++ b/Doxygen/Installation.md @@ -208,12 +208,15 @@ Tasmanian is included in the Python Pip index: [https://pypi.org/project/Tasmani The Tasmanian module is not a regular Python-only project but a wrapper around the C++ libraries, note the following: * The compiled binaries are cached by pip and `--no-cache-dir` option must be used to change the options. -* Pip versions prior to 1.10 require that dependencies are installed manually. * Only user installations are supported, installation for all users is possible with CMake but not Pip. * Python virtual environments are supported, as well as Linux, Mac and Windows operating systems. +* By default, Tasmanian will install with `Tasmanian_ENABLE_RECOMMENDED=ON` which will safe-auto-enable BLAS and OpenMP + * environment variable (see below) can be used to disable the recommended options and switch to manual enable/disable * The Pip installer will accept Tasmanian options specified in the environment variables: ``` Environment Option will translate to CMake Options +export Tasmanian_ENABLE_RECOMMENDED=OFF -D Tasmanian_ENABLE_RECOMMENDED=OFF + export Tasmanian_ENABLE_BLAS= -D Tasmanian_ENABLE_BLAS=ON -D BLAS_LIBRARIES= -D LAPACK_LIBRARIES=