cmake fix and toolchain file for LC quartz.

LLNL · Apr 9, 2024 · 6965fa8 · 6965fa8
1 parent 6149020
commit 6965fa8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/cmake_modules/FindSCALAPACK.cmake b/cmake_modules/FindSCALAPACK.cmake
@@ -7,7 +7,7 @@ if(DEFINED ENV{SCALAPACK_ROOT})
 endif(DEFINED ENV{SCALAPACK_ROOT})
 
 if(SCALAPACK_ROOT)
-  set(_SCALAPACK_SEARCH_DIR ${SCALAPACK_ROOT})
+  set(_SCALAPACK_SEARCH_DIR ${SCALAPACK_ROOT} ${SCALAPACK_ROOT}/lib/intel64)
   list(APPEND _SCALAPACK_SEARCHES ${_SCALAPACK_SEARCH_DIR})
 endif(SCALAPACK_ROOT)
 
@@ -29,6 +29,13 @@ if(NOT SCALAPACK_LIBRARY)
   endforeach()
 endif()
 
+unset(SCALAPACK_NAMES)
+
+mark_as_advanced(SCALAPACK_LIBRARY SCALAPACK_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SCALAPACK REQUIRED_VARS SCALAPACK_LIBRARY)
+
 # Search for some default library paths
 if (NOT SCALAPACK_FOUND)
   find_library(SCALAPACK_LIBRARY
@@ -42,13 +49,6 @@ if (NOT SCALAPACK_FOUND)
     ENV BLACSDIR)
 endif()
 
-unset(SCALAPACK_NAMES)
-
-mark_as_advanced(SCALAPACK_LIBRARY SCALAPACK_INCLUDE_DIR)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SCALAPACK REQUIRED_VARS SCALAPACK_LIBRARY)
-
 if(SCALAPACK_FOUND)
   # Only Intel's scalapack requires an include directory
   if(SCALAPACK_INCLUDE_DIR)

diff --git a/cmake_toolchains/quartz.default.cmake b/cmake_toolchains/quartz.default.cmake
@@ -0,0 +1,6 @@
+set(CMAKE_C_COMPILER mpicc)
+set(CMAKE_CXX_COMPILER mpicxx)
+set(CMAKE_Fortran_COMPILER mpif90)
+
+set(SCALAPACK_ROOT $ENV{MKLROOT})
+set(SCALAPACK_BLACS_LIBRARY $ENV{MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.so)