Merge pull request #335 from joakim-hove/move-matrix

Removed matrix implementation

CMakeLists.txt

@@ -180,18 +180,6 @@ if(M_LIBRARY)
     set(m m)
 endif ()
 
-find_package(BLAS)
-if (BLAS_FOUND)
-    set(blas "${BLAS_LIBRARIES}")
-endif ()
-
-set(ERT_HAVE_LAPACK OFF)
-find_package(LAPACK)
-if (LAPACK_FOUND)
-    set(ERT_HAVE_LAPACK ON)
-    list(APPEND lapack ${LAPACK_LIBRARIES} ${LAPACK_LINKER_FLAGS})
-endif()
-
 find_package(ZLIB)
 if (ZLIB_FOUND)
     set(ERT_HAVE_ZLIB ON)

lib/CMakeLists.txt

@@ -6,11 +6,6 @@ if (HAVE_PTHREAD)
      list(APPEND opt_srcs util/thread_pool.c)
 endif ()
 
-if (LAPACK_FOUND)
-    list(APPEND opt_srcs util/matrix_lapack.c
-                         util/matrix_blas.c
-                         util/matrix_stat.c)
-endif ()
 
 if (HAVE_BACKTRACE)
     list(APPEND opt_srcs util/util_abort_gnu.c)
@@ -93,7 +88,6 @@ add_library(ecl util/rng.c
                 util/vector.c
                 util/parser.c
                 util/stringlist.c
-                util/matrix.c
                 util/buffer.c
                 util/timer.c
                 util/time_interval.c
@@ -168,7 +162,6 @@ target_link_libraries(ecl PUBLIC ${m}
                                  ${dl}
                                  ${pthread}
                                  ${blas}
-                                 ${lapack}
                                  ${zlib}
                                  ${shlwapi}
                                  ${ws2_32}
@@ -244,7 +237,6 @@ foreach (name   ert_util_alloc_file_components
                 ert_util_chdir
                 ert_util_filename
                 ert_util_hash_test
-                ert_util_matrix
                 ert_util_parent_path
                 ert_util_PATH_test
                 ert_util_realpath
@@ -311,15 +303,6 @@ target_link_libraries(ert_util_path_stack_test ecl)
 add_test(NAME ert_util_path_stack_test COMMAND ert_util_path_stack_test
     ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
-if (LAPACK_FOUND)
-   add_executable(ert_util_matrix_lapack util/tests/ert_util_matrix_lapack.c)
-   target_link_libraries(ert_util_matrix_lapack ecl)
-   add_test(NAME ert_util_matrix_lapack COMMAND ert_util_matrix_lapack)
-
-   add_executable(ert_util_matrix_stat util/tests/ert_util_matrix_stat.c)
-   target_link_libraries(ert_util_matrix_stat ecl)
-   add_test(NAME ert_util_matrix_stat COMMAND ert_util_matrix_stat)
-endif()
 
 if (HAVE_BACKTRACE)
    add_executable(ert_util_abort_gnu_tests util/tests/ert_util_abort_gnu_tests.c)

lib/ert_api_config.h.in

@@ -1,4 +1,3 @@
-#cmakedefine ERT_HAVE_LAPACK
 #cmakedefine ERT_HAVE_ZLIB
 #cmakedefine ERT_HAVE_ISFINITE
 #cmakedefine ERT_HAVE_GETOPT