|
@@ -0,0 +1,89 @@
|
|
|
+diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
+index 828911d..244a732 100644
|
|
|
+--- a/CMakeLists.txt
|
|
|
++++ b/CMakeLists.txt
|
|
|
+@@ -635,37 +635,10 @@ add_custom_target( lib DEPENDS magma )
|
|
|
+ # compile lapacktest library
|
|
|
+ # If use fortran, compile only Fortran files, not magma_[sdcz]_no_fortran.cpp
|
|
|
+ # else, compile only C++ files, not Fortran files
|
|
|
+-if (USE_FORTRAN)
|
|
|
+- foreach( filename ${liblapacktest_all} )
|
|
|
+- if (filename MATCHES "\\.(f|f90|F90)$")
|
|
|
+- list( APPEND liblapacktest_all_f ${filename} )
|
|
|
+- endif()
|
|
|
+- endforeach()
|
|
|
+- add_library( lapacktest ${liblapacktest_all_f} )
|
|
|
+-else()
|
|
|
+- # alternatively, use only C/C++/CUDA files, including magma_[sdcz]_no_fortran.cpp
|
|
|
+- foreach( filename ${liblapacktest_all} )
|
|
|
+- if (filename MATCHES "\\.(c|cu|cpp)$")
|
|
|
+- list( APPEND liblapacktest_all_cpp ${filename} )
|
|
|
+- endif()
|
|
|
+- endforeach()
|
|
|
+- add_library( lapacktest ${liblapacktest_all_cpp} )
|
|
|
+-endif()
|
|
|
+-target_link_libraries( lapacktest
|
|
|
+- ${blas_fix}
|
|
|
+- ${LAPACK_LIBRARIES}
|
|
|
+-)
|
|
|
+
|
|
|
+
|
|
|
+ # ----------------------------------------
|
|
|
+ # compile tester library
|
|
|
+-add_library( tester ${libtest_all} )
|
|
|
+-target_link_libraries( tester
|
|
|
+- magma
|
|
|
+- lapacktest
|
|
|
+- ${blas_fix}
|
|
|
+- ${LAPACK_LIBRARIES}
|
|
|
+-)
|
|
|
+
|
|
|
+
|
|
|
+ # ----------------------------------------
|
|
|
+@@ -679,7 +652,6 @@ else()
|
|
|
+ include_directories( sparse_hip/include )
|
|
|
+ include_directories( sparse_hip/control )
|
|
|
+ endif()
|
|
|
+-include_directories( testing )
|
|
|
+
|
|
|
+ if (MAGMA_ENABLE_CUDA)
|
|
|
+ add_library( magma_sparse ${libsparse_all} )
|
|
|
+@@ -717,20 +689,6 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY testing_lib )
|
|
|
+ set( CMAKE_LIBRARY_OUTPUT_DIRECTORY testing_lib )
|
|
|
+
|
|
|
+ # skip Fortran testers, which require an extra file from CUDA
|
|
|
+-foreach( filename ${testing_all} )
|
|
|
+- if (filename MATCHES "\\.(c|cu|cpp)$")
|
|
|
+- list( APPEND testing_all_cpp ${filename} )
|
|
|
+- endif()
|
|
|
+-endforeach()
|
|
|
+-foreach( TEST ${testing_all_cpp} )
|
|
|
+- string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
|
|
|
+- string( REGEX REPLACE "testing/" "" EXE ${EXE} )
|
|
|
+- #message( "${TEST} --> ${EXE}" )
|
|
|
+- add_executable( ${EXE} ${TEST} )
|
|
|
+- target_link_libraries( ${EXE} tester lapacktest magma )
|
|
|
+- list( APPEND testing ${EXE} )
|
|
|
+-endforeach()
|
|
|
+-add_custom_target( testing DEPENDS ${testing} )
|
|
|
+
|
|
|
+
|
|
|
+ # ----------------------------------------
|
|
|
+@@ -743,17 +701,6 @@ else()
|
|
|
+ endif()
|
|
|
+
|
|
|
+
|
|
|
+-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${SPARSE_TEST_DIR}" )
|
|
|
+-cmake_policy( SET CMP0037 OLD)
|
|
|
+-foreach( TEST ${sparse_testing_all} )
|
|
|
+- string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} )
|
|
|
+- string( REGEX REPLACE "${SPARSE_TEST_DIR}/" "" EXE ${EXE} )
|
|
|
+- #message( "${TEST} --> ${EXE}" )
|
|
|
+- add_executable( ${EXE} ${TEST} )
|
|
|
+- target_link_libraries( ${EXE} magma_sparse magma )
|
|
|
+- list( APPEND sparse-testing ${EXE} )
|
|
|
+-endforeach()
|
|
|
+-add_custom_target( sparse-testing DEPENDS ${sparse-testing} )
|
|
|
+
|
|
|
+
|
|
|
+ # ----------------------------------------
|