26f94b24e8
* py-torch: fix build with fujitsu-ssl2 * fix to use fujitsu-ssl2 in py-torch v1.5.0 to v1.11.0 * fix to use fujitsu-ssl2 in py-torch v1.2.0 to v1.11.0 * Delete fj-ssl2.patch * renamed the patches * Rename fj-ssl2.1.5.patch to fj-ssl2_1.5.patch * Delete fj-ssl2_1.5.patch
77 lines
3.0 KiB
Diff
77 lines
3.0 KiB
Diff
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
|
|
index 557ab649a4..56d1699736 100644
|
|
--- a/cmake/Dependencies.cmake
|
|
+++ b/cmake/Dependencies.cmake
|
|
@@ -174,7 +174,7 @@ else()
|
|
set(AT_MKLDNN_ENABLED 0)
|
|
set(AT_MKL_ENABLED 0)
|
|
endif()
|
|
-set_property(CACHE BLAS PROPERTY STRINGS "ATLAS;BLIS;Eigen;FLAME;Generic;MKL;OpenBLAS;vecLib")
|
|
+set_property(CACHE BLAS PROPERTY STRINGS "ATLAS;BLIS;Eigen;FLAME;Generic;MKL;OpenBLAS;SSL2;vecLib")
|
|
message(STATUS "Trying to find preferred BLAS backend of choice: " ${BLAS})
|
|
|
|
if(BLAS STREQUAL "Eigen")
|
|
@@ -229,6 +229,20 @@ elseif(BLAS STREQUAL "vecLib")
|
|
set(BLAS_INFO "veclib")
|
|
set(BLAS_FOUND 1)
|
|
set(BLAS_LIBRARIES ${vecLib_LINKER_LIBS})
|
|
+elseif(BLAS STREQUAL "SSL2")
|
|
+ if(CMAKE_CXX_COMPILER MATCHES ".*/FCC$"
|
|
+ AND CMAKE_C_COMPILER MATCHES ".*/fcc$")
|
|
+ message(STATUS "SSL2 Selected BLAS library")
|
|
+ list(APPEND Caffe2_PUBLIC_DEPENDENCY_LIBS "fjlapackexsve.so")
|
|
+ set(SSL2_FOUND ON)
|
|
+ message(STATUS "set CMAKE_SHARED_LINKER_FLAGS: -SSL2 --linkfortran")
|
|
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -SSL2 --linkfortran")
|
|
+ set(WITH_BLAS "ssl2")
|
|
+ else()
|
|
+ message(STATUS "Not built using fcc and FCC.")
|
|
+ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
|
|
+ message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
|
|
+ endif()
|
|
elseif(BLAS STREQUAL "FlexiBLAS")
|
|
find_package(FlexiBLAS REQUIRED)
|
|
include_directories(SYSTEM ${FlexiBLAS_INCLUDE_DIR})
|
|
@@ -250,7 +264,7 @@ if(NOT INTERN_BUILD_MOBILE)
|
|
set(AT_MKL_SEQUENTIAL 0)
|
|
set(AT_MKL_MT 0)
|
|
set(USE_BLAS 1)
|
|
- if(NOT (ATLAS_FOUND OR BLIS_FOUND OR GENERIC_BLAS_FOUND OR MKL_FOUND OR OpenBLAS_FOUND OR VECLIB_FOUND OR FlexiBLAS_FOUND))
|
|
+ if(NOT (ATLAS_FOUND OR BLIS_FOUND OR GENERIC_BLAS_FOUND OR MKL_FOUND OR OpenBLAS_FOUND OR SSL2_FOUND OR VECLIB_FOUND OR FlexiBLAS_FOUND))
|
|
message(WARNING "Preferred BLAS (" ${BLAS} ") cannot be found, now searching for a general BLAS library")
|
|
find_package(BLAS)
|
|
if(NOT BLAS_FOUND)
|
|
diff --git a/cmake/Modules/FindBLAS.cmake b/cmake/Modules/FindBLAS.cmake
|
|
index 94942d520f..ae5b8db963 100644
|
|
--- a/cmake/Modules/FindBLAS.cmake
|
|
+++ b/cmake/Modules/FindBLAS.cmake
|
|
@@ -289,6 +289,28 @@ if((NOT BLAS_LIBRARIES)
|
|
endif()
|
|
endif()
|
|
|
|
+# BLAS in SSL2 library?
|
|
+if((NOT BLAS_LIBRARIES)
|
|
+ AND ((NOT WITH_BLAS) OR (WITH_BLAS STREQUAL "ssl2")))
|
|
+ if(CMAKE_CXX_COMPILER MATCHES ".*/FCC$"
|
|
+ AND CMAKE_C_COMPILER MATCHES ".*/fcc$")
|
|
+ check_fortran_libraries(
|
|
+ BLAS_LIBRARIES
|
|
+ BLAS
|
|
+ sgemm
|
|
+ "-SSL2;--linkfortran"
|
|
+ "fjlapackexsve")
|
|
+ if (BLAS_LIBRARIES)
|
|
+ set(BLAS_INFO "ssl2")
|
|
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -SSL2 --linkfortran")
|
|
+ endif (BLAS_LIBRARIES)
|
|
+ else()
|
|
+ message(STATUS "Not built using fcc and FCC.")
|
|
+ message(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
|
|
+ message(STATUS "CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
|
|
+ endif()
|
|
+endif()
|
|
+
|
|
# Generic BLAS library?
|
|
if((NOT BLAS_LIBRARIES)
|
|
AND ((NOT WITH_BLAS) OR (WITH_BLAS STREQUAL "generic")))
|