FIX: Fix logic to check for existence of different oneDAL libraries (#2577)

* fix logic to detect present onedal libs

* missing import

* check that path exists

* pass variable instead of redefining

* missing arg

* remove unused import

Author: david-cortes-intel

scripts/version.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 # ===============================================================================
 
+import os
 import re
 from ctypes.util import find_library
 from os.path import isfile
@@ -70,7 +71,19 @@ def get_onedal_version(dal_root, version_type="release"):
     return version
 
 
-def get_onedal_shared_libs(dal_root):
+def find_library_custom_paths(alias: str, dal_root: str, is_win: bool) -> bool:
+    if find_library(alias):
+        return True
+    path_from_dal_root = (
+        jp(dal_root, "Library", "bin") if is_win else jp(dal_root, "lib", "intel64")
+    )
+    if os.path.exists(path_from_dal_root):
+        return alias in os.listdir(path_from_dal_root)
+    else:
+        return False
+
+
+def get_onedal_shared_libs(dal_root: str, is_win: bool) -> list[str]:
     """Function to find which oneDAL shared libraries are available in the system"""
     lib_names = [
         "onedal",
@@ -88,6 +101,9 @@ def get_onedal_shared_libs(dal_root):
             f"lib{lib_name}.{major_bin_version}.dylib",
             f"{lib_name}.{major_bin_version}.dll",
         ]
-        if any(find_library(alias) for alias in possible_aliases):
+        if any(
+            find_library_custom_paths(alias, dal_root, is_win)
+            for alias in possible_aliases
+        ):
             found_libraries.append(lib_name)
     return found_libraries

setup.py

@@ -104,15 +104,15 @@
         " Use 'NO_DIST=1' to build without distributed mode."
     )
 dpcpp = (
-    shutil.which("icpx") is not None
-    and "onedal_dpc" in get_onedal_shared_libs(dal_root)
+    shutil.which("icpx" if not IS_WIN else "icx") is not None
+    and "onedal_dpc" in get_onedal_shared_libs(dal_root, IS_WIN)
     and not no_dpc
     and not (IS_WIN and debug_build)
 )
 
 use_parameters_lib = (not IS_WIN) and (ONEDAL_VERSION >= 20240000)
 
-build_distribute = dpcpp and not no_dist and IS_LIN
+build_distributed = dpcpp and not no_dist and IS_LIN
 
 daal_lib_dir = lib_dir if (IS_MAC or os.path.isdir(lib_dir)) else os.path.dirname(lib_dir)
 ONEDAL_LIBDIRS = [daal_lib_dir]
@@ -418,12 +418,12 @@ def gen_pyx(odir):
 def get_onedal_py_libs():
     ext_suffix = get_config_vars("EXT_SUFFIX")[0]
     libs = [f"_onedal_py_host{ext_suffix}", f"_onedal_py_dpc{ext_suffix}"]
-    if build_distribute:
+    if build_distributed:
         libs += [f"_onedal_py_spmd_dpc{ext_suffix}"]
     if IS_WIN:
         ext_suffix_lib = ext_suffix.replace(".dll", ".lib")
         libs += [f"_onedal_py_host{ext_suffix_lib}", f"_onedal_py_dpc{ext_suffix_lib}"]
-        if build_distribute:
+        if build_distributed:
             libs += [f"_onedal_py_spmd_dpc{ext_suffix_lib}"]
     return libs
 
@@ -476,7 +476,7 @@ def onedal_run(self):
             build_onedal("host")
             if dpcpp:
                 build_onedal("dpc")
-                if build_distribute:
+                if build_distributed:
                     build_onedal("spmd_dpc")
 
     def onedal_post_build(self):
@@ -569,7 +569,7 @@ class build(onedal_build, orig_build.build):
 if ONEDAL_VERSION >= 20230200:
     packages_with_tests += ["onedal.cluster"]
 
-if build_distribute:
+if build_distributed:
     packages_with_tests += [
         "onedal.spmd",
         "onedal.spmd.covariance",