From 659462007229563a0b13e8a485c3d1cb4bf5c7da Mon Sep 17 00:00:00 2001
From: Eduard Valeyev <eduard@valeyev.net>
Date: Sat, 2 Jan 2021 14:46:02 -0500
Subject: [PATCH 1/2] moved blaspp_headers definition to BTAS

---
 CMakeLists.txt                        |  2 -
 cmake/modules/FindBLASPPHeaders.cmake | 54 ---------------------------
 external/versions.cmake               |  4 +-
 3 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 cmake/modules/FindBLASPPHeaders.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e969c794d5..42cccfa424 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -300,8 +300,6 @@ include(external/eigen.cmake)
 # BTAS does a better job of building and checking Boost since it uses Boost::serialization
 # it also memorized the location of its config for use from install tree
 include(FindOrFetchBTAS)
-# this generates blaspp_headers needed to include header files associated with the BLAS++ libraries
-include(FindBLASPPHeaders)
 include(FindOrFetchBoost)
 if(ENABLE_SCALAPACK)
   include(external/scalapack.cmake)
diff --git a/cmake/modules/FindBLASPPHeaders.cmake b/cmake/modules/FindBLASPPHeaders.cmake
deleted file mode 100644
index 3f9c37983e..0000000000
--- a/cmake/modules/FindBLASPPHeaders.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-#  This file is a part of TiledArray.
-#  Copyright (C) 2019  Virginia Tech
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#  Edward Valeev
-#  Department of Chemistry, Virginia Tech
-#
-#  FindBLASPPHeaders.cmake
-#  Dec 28, 2020
-#
-
-# check for MKL
-include( CheckFunctionExists )
-include(CMakePushCheckState)
-cmake_push_check_state( RESET )
-find_package( OpenMP QUIET ) #XXX Open LAPACKPP issue for this...
-set( CMAKE_REQUIRED_LIBRARIES "${blaspp_libraries}" m )
-check_function_exists( mkl_dimatcopy  BLAS_IS_MKL )
-cmake_pop_check_state()
-
-add_library(blaspp_headers INTERFACE)
-
-if (BLAS_IS_MKL)
-  foreach(_lib ${blaspp_libraries})
-    if (EXISTS ${_lib} AND _lib MATCHES libmkl_)
-      string(REGEX REPLACE "/lib/(|intel64/|intel64_lin/)libmkl_.*" "" _mklroot "${_lib}")
-    elseif (_lib MATCHES "^-L")
-      string(REGEX REPLACE "^-L" "" _mklroot "${_lib}")
-      string(REGEX REPLACE "/lib(|/intel64|/intel64_lin)(|/)" "" _mklroot "${_mklroot}")
-    endif()
-    if (_mklroot)
-      break()
-    endif(_mklroot)
-  endforeach()
-
-  target_include_directories(blaspp_headers INTERFACE "${_mklroot}/include")
-endif()
-
-install(TARGETS blaspp_headers EXPORT tiledarray COMPONENT blaspp_headers
-    LIBRARY DESTINATION "${TILEDARRAY_INSTALL_LIBDIR}"
-    ARCHIVE DESTINATION "${TILEDARRAY_INSTALL_LIBDIR}")
diff --git a/external/versions.cmake b/external/versions.cmake
index da41ac1fb5..90ad5ca0f9 100644
--- a/external/versions.cmake
+++ b/external/versions.cmake
@@ -22,8 +22,8 @@ set(TA_TRACKED_MADNESS_PREVIOUS_TAG 925552feaf326cca8e83de7bd042074ad3cfd3f1)
 set(TA_TRACKED_MADNESS_VERSION 0.10.1)
 set(TA_TRACKED_MADNESS_PREVIOUS_VERSION 0.10.1)
 
-set(TA_TRACKED_BTAS_TAG bd42eb3a2b84a46953edc7a8f7afbe5c98efa2c5)
-set(TA_TRACKED_BTAS_PREVIOUS_TAG 8418021a283000ada8edd4994bd81f35652d4b49)
+set(TA_TRACKED_BTAS_TAG ef198e3fa53911eac308c8100c8651b5952c4f26)
+set(TA_TRACKED_BTAS_PREVIOUS_TAG bd42eb3a2b84a46953edc7a8f7afbe5c98efa2c5)
 
 set(TA_TRACKED_CUTT_TAG 0e8685bf82910bc7435835f846e88f1b39f47f09)
 set(TA_TRACKED_CUTT_PREVIOUS_TAG 592198b93c93b7ca79e7900b9a9f2e79f9dafec3)

From 105bb7aa7c2265484dd5225be85a50eaec483036 Mon Sep 17 00:00:00 2001
From: Eduard Valeyev <eduard@valeyev.net>
Date: Sat, 2 Jan 2021 14:47:42 -0500
Subject: [PATCH 2/2] updated INSTALL.md with updated BTAS SHA

---
 INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index aeac59eb62..b5518de630 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -40,7 +40,7 @@ Both methods are supported. However, for most users we _strongly_ recommend to b
   - Boost.Container: header-only
   - Boost.Test: header-only or (optionally) as a compiled library, *only used for unit testing*
   - Boost.Range: header-only, *only used for unit testing*
-- [BTAS](http://github.com/ValeevGroup/BTAS), tag bd42eb3a2b84a46953edc7a8f7afbe5c98efa2c5 . If usable BTAS installation is not found, TiledArray will download and compile
+- [BTAS](http://github.com/ValeevGroup/BTAS), tag ef198e3fa53911eac308c8100c8651b5952c4f26 . If usable BTAS installation is not found, TiledArray will download and compile
   BTAS from source. *This is the recommended way to compile BTAS for all users*.
 - [MADNESS](https://github.com/m-a-d-n-e-s-s/madness), tag b22ee85059e6ccc9a6e803ba0550652ece8d9df1 .
   Only the MADworld runtime and BLAS/LAPACK C API component of MADNESS is used by TiledArray.