@@ -43,10 +43,10 @@ index 5a83b9b..037f707 100644
43
43
- include(cmake/install.cmake)
44
44
diff --git a/cmake/FindLAPACK.cmake b/cmake/FindLAPACK.cmake
45
45
deleted file mode 100644
46
- index 2016c7c ..0000000
46
+ index 35395c6 ..0000000
47
47
--- a/cmake/FindLAPACK.cmake
48
48
+++ /dev/null
49
- @@ -1,571 +0,0 @@
49
+ @@ -1,591 +0,0 @@
50
50
- # Distributed under the OSI-approved BSD 3-Clause License. See accompanying
51
51
- # file Copyright.txt or https://cmake.org/licensing for details.
52
52
-
@@ -302,14 +302,34 @@ index 2016c7c..0000000
302
302
-
303
303
- function(aocl_libs)
304
304
-
305
+ - set(_names flame)
306
+ - if(WIN32)
307
+ - if(BUILD_SHARED_LIBS)
308
+ - list(APPEND _names AOCL-LibFlame-Win-MT-dll AOCL-LibFlame-Win-dll)
309
+ - else()
310
+ - list(APPEND _names AOCL-LibFlame-Win-MT AOCL-LibFlame-Win)
311
+ - endif()
312
+ - endif()
313
+ -
305
314
- find_library(LAPACK_LIBRARY
306
- - NAMES flame AOCL-LibFLAME-Win-MT-dll AOCL-LibFLAME-Win
315
+ - NAMES ${_names}
316
+ - NAMES_PER_DIR
307
317
- PATH_SUFFIXES LP64
308
318
- DOC "LAPACK Flame library"
309
319
- )
310
320
-
321
+ - set(_names blis-mt blis)
322
+ - if(WIN32)
323
+ - if(BUILD_SHARED_LIBS)
324
+ - list(APPEND _names AOCL-LibBlis-Win-MT-dll AOCL-LibBlis-Win-dll)
325
+ - else()
326
+ - list(APPEND _names AOCL-LibBlis-Win-MT AOCL-LibBlis-Win)
327
+ - endif()
328
+ - endif()
329
+ -
311
330
- find_library(BLAS_LIBRARY
312
- - NAMES blis-mt blis AOCL-LibBlis-Win-MT-dll
331
+ - NAMES ${_names}
332
+ - NAMES_PER_DIR
313
333
- PATH_SUFFIXES LP64
314
334
- DOC "BLAS Blis library"
315
335
- )
@@ -620,10 +640,10 @@ index 2016c7c..0000000
620
640
- mark_as_advanced(LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
621
641
diff --git a/cmake/FindSCALAPACK.cmake b/cmake/FindSCALAPACK.cmake
622
642
deleted file mode 100644
623
- index 47543a1 ..0000000
643
+ index e93337f ..0000000
624
644
--- a/cmake/FindSCALAPACK.cmake
625
645
+++ /dev/null
626
- @@ -1,301 +0,0 @@
646
+ @@ -1,315 +0,0 @@
627
647
- # Distributed under the OSI-approved BSD 3-Clause License. See accompanying
628
648
- # file Copyright.txt or https://cmake.org/licensing for details.
629
649
-
@@ -810,6 +830,37 @@ index 47543a1..0000000
810
830
-
811
831
- endfunction(scalapack_mkl)
812
832
-
833
+ -
834
+ - function(scalapack_lib)
835
+ -
836
+ - if(BUILD_SHARED_LIBS)
837
+ - set(_s shared)
838
+ - else()
839
+ - set(_s static)
840
+ - endif()
841
+ - list(APPEND _s openmpi/lib mpich/lib)
842
+ -
843
+ - find_library(SCALAPACK_LIBRARY
844
+ - NAMES scalapack scalapack-openmpi scalapack-mpich
845
+ - NAMES_PER_DIR
846
+ - PATH_SUFFIXES ${_s}
847
+ - DOC "SCALAPACK library"
848
+ - )
849
+ -
850
+ - # some systems have libblacs as a separate file, instead of being subsumed in libscalapack.
851
+ - if(NOT DEFINED BLACS_ROOT)
852
+ - get_filename_component(BLACS_ROOT ${SCALAPACK_LIBRARY} DIRECTORY)
853
+ - endif()
854
+ -
855
+ - find_library(BLACS_LIBRARY
856
+ - NAMES blacs
857
+ - NO_DEFAULT_PATH
858
+ - HINTS ${BLACS_ROOT}
859
+ - DOC "BLACS library"
860
+ - )
861
+ -
862
+ - endfunction(scalapack_lib)
863
+ -
813
864
- # === main
814
865
-
815
866
- set(scalapack_cray false)
@@ -855,24 +906,7 @@ index 47543a1..0000000
855
906
- elseif(scalapack_cray)
856
907
- # Cray PE has Scalapack build into LibSci. Use Cray compiler wrapper.
857
908
- else()
858
- -
859
- - find_library(SCALAPACK_LIBRARY
860
- - NAMES scalapack scalapack-openmpi scalapack-mpich
861
- - NAMES_PER_DIR
862
- - PATH_SUFFIXES openmpi/lib mpich/lib
863
- - DOC "SCALAPACK library"
864
- - )
865
- -
866
- - # some systems have libblacs as a separate file, instead of being subsumed in libscalapack.
867
- - get_filename_component(BLACS_ROOT ${SCALAPACK_LIBRARY} DIRECTORY)
868
- -
869
- - find_library(BLACS_LIBRARY
870
- - NAMES blacs
871
- - NO_DEFAULT_PATH
872
- - HINTS ${BLACS_ROOT}
873
- - DOC "BLACS library"
874
- - )
875
- -
909
+ - scalapack_lib()
876
910
- endif()
877
911
-
878
912
- if(STATIC IN_LIST SCALAPACK_FIND_COMPONENTS)
@@ -926,7 +960,7 @@ index 47543a1..0000000
926
960
-
927
961
- mark_as_advanced(SCALAPACK_LIBRARY SCALAPACK_INCLUDE_DIR)
928
962
diff --git a/cmake/lapack.cmake b/cmake/lapack.cmake
929
- index a01dbf9..4e2c75e 100644
963
+ index d4e6336..e565d0e 100644
930
964
--- a/cmake/lapack.cmake
931
965
+++ b/cmake/lapack.cmake
932
966
@@ -2,38 +2,13 @@
@@ -968,7 +1002,7 @@ index a01dbf9..4e2c75e 100644
968
1002
- endif()
969
1003
+ set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
970
1004
971
- if(BUILD_DOUBLE AND BLAS_HAVE_GEMMT )
1005
+ if(BUILD_DOUBLE)
972
1006
check_fortran_source_compiles(
973
1007
diff --git a/cmake/options.cmake b/cmake/options.cmake
974
1008
index 57572cd..29ae9a3 100644
0 commit comments