[LAPACK] unit tests update (#190)

* Logging refactor
* Accuracy tests corrected and moved to common header
* Dependency variable scope fixed
* Backward compatibility for netlib libraries with weirdNEC macro

Author: ericlars

cmake/FindLAPACKE.cmake

@@ -20,13 +20,13 @@
 include_guard()
 
 find_library(LAPACKE64_file NAMES lapacke64.dll.lib lapacke64.lib lapacke64 HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
-find_package_handle_standard_args(LAPACKE64 REQUIRED_VARS LAPACKE64_file)
+find_package_handle_standard_args(LAPACKE REQUIRED_VARS LAPACKE64_file)
 find_library(LAPACK64_file NAMES lapack64.dll.lib lapack64.lib lapack64 HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
-find_package_handle_standard_args(LAPACK64 REQUIRED_VARS LAPACK64_file)
+find_package_handle_standard_args(LAPACKE REQUIRED_VARS LAPACK64_file)
 find_library(CBLAS64_file NAMES cblas64.dll.lib cblas64.lib cblas64 HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
-find_package_handle_standard_args(CBLAS64 REQUIRED_VARS CBLAS64_file)
+find_package_handle_standard_args(LAPACKE REQUIRED_VARS CBLAS64_file)
 find_library(BLAS64_file NAMES blas64.dll.lib blas64.lib blas64 HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES lib lib64)
-find_package_handle_standard_args(BLAS64 REQUIRED_VARS BLAS64_file)
+find_package_handle_standard_args(LAPACKE REQUIRED_VARS BLAS64_file)
 
 get_filename_component(LAPACKE64_LIB_DIR ${LAPACKE64_file} DIRECTORY)
 find_path(LAPACKE_INCLUDE lapacke.h HINTS ${REF_LAPACK_ROOT} PATH_SUFFIXES include)
@@ -40,4 +40,4 @@ list(APPEND LAPACKE_LINK ${CBLAS64_file})
 list(APPEND LAPACKE_LINK ${BLAS64_file})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LAPACKE64 REQUIRED_VARS LAPACKE_INCLUDE LAPACKE_LINK)
+find_package_handle_standard_args(LAPACKE REQUIRED_VARS LAPACKE_INCLUDE LAPACKE_LINK)

src/lapack/backends/cusolver/CMakeLists.txt

@@ -21,8 +21,8 @@ set(LIB_NAME onemkl_lapack_cusolver)
 set(LIB_OBJ ${LIB_NAME}_obj)
 find_package(cuSOLVER REQUIRED)
 set(SOURCES     cusolver_lapack.cpp
-		cusolver_batch.cpp
-	        $<$<STREQUAL:${ONEMKL_SYCL_IMPLEMENTATION},dpc++>:cusolver_scope_handle.cpp >
+                cusolver_batch.cpp
+                $<$<STREQUAL:${ONEMKL_SYCL_IMPLEMENTATION},dpc++>:cusolver_scope_handle.cpp >
                 $<$<BOOL:${BUILD_SHARED_LIBS}>: cusolver_wrappers.cpp>)
 add_library(${LIB_NAME})
 add_library(${LIB_OBJ} OBJECT ${SOURCES})

tests/unit_tests/lapack/common/CMakeLists.txt

@@ -18,7 +18,7 @@
 #===============================================================================
 
 # Build object from all test sources
-set(LAPACK_COMMON_SOURCES "dependency_check.cpp" "global.cpp")
+set(LAPACK_COMMON_SOURCES "dependency_check.cpp" "test_log.cpp")
 
 if(BUILD_SHARED_LIBS)
   target_sources(lapack_source_rt PRIVATE ${LAPACK_COMMON_SOURCES})

tests/unit_tests/lapack/common/dependency_check.cpp

@@ -37,17 +37,17 @@ sycl::event create_dependency(sycl::queue queue) {
     return host_to_device_copy(queue, ::host_data.data(), ::device_data, ::host_data.size());
 }
 
-void print_status(const char* name, sycl::info::event_command_status status) {
-    global::log << name << " command execution status: ";
+void log_status(const char* name, sycl::info::event_command_status status) {
+    test_log::lout << name << " command execution status: ";
     if (sycl::info::event_command_status::submitted == status)
-        global::log << "submitted";
+        test_log::lout << "submitted";
     else if (sycl::info::event_command_status::running == status)
-        global::log << "running";
+        test_log::lout << "running";
     else if (sycl::info::event_command_status::complete == status)
-        global::log << "complete";
+        test_log::lout << "complete";
     else
-        global::log << "status unknown";
-    global::log << " (" << static_cast<int64_t>(status) << ")" << std::endl;
+        test_log::lout << "status unknown";
+    test_log::lout << " (" << static_cast<int64_t>(status) << ")" << std::endl;
 }
 
 bool check_dependency(sycl::queue queue, sycl::event in_event, sycl::event func_event) {
@@ -63,8 +63,8 @@ bool check_dependency(sycl::queue queue, sycl::event in_event, sycl::event func_
     /* Print results */
     auto result = (in_status == sycl::info::event_command_status::complete);
     if (!result) {
-        print_status("in_event", in_status);
-        print_status("func_event", func_status);
+        log_status("in_event", in_status);
+        log_status("func_event", func_status);
     }
 
     device_free(queue, ::device_data);

tests/unit_tests/lapack/common/global.cpp

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright 2021 Intel Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *******************************************************************************/
+
+#include <array>
+#include <iostream>
+#include <sstream>
+
+namespace test_log {
+
+std::stringstream lout{};
+std::array<char, 1024> buffer{};
+std::string padding{};
+
+void print() {
+    std::cout.clear();
+    if (lout.rdbuf()->in_avail()) { /* check if stream is non-empty */
+        while (lout.good()) {
+            std::string line;
+            std::getline(lout, line);
+            std::cout << padding << "\t" << line << std::endl;
+        }
+    }
+    lout.str("");
+    lout.clear();
+}
+
+} // namespace test_log