Change dependencies for python 3.10 (#961)

Author: Pahandrovich

daal4py/__init__.py

@@ -20,11 +20,19 @@
     import os
     import sys
     import site
+    current_path = os.path.dirname(__file__)
     path_to_env = site.getsitepackages()[0]
     path_to_libs = os.path.join(path_to_env, "Library", "bin")
+    path_to_oneapi_backend = os.path.join(current_path, "oneapi")
     if sys.version_info.minor >= 8:
+        if 'DALROOT' in os.environ:
+            dal_root_redist = os.path.join(os.environ['DALROOT'], "redist", "intel64")
+            if os.path.exists(dal_root_redist):
+                os.add_dll_directory(dal_root_redist)
+                os.environ['PATH'] = dal_root_redist + os.pathsep + os.environ['PATH']
         os.add_dll_directory(path_to_libs)
-    os.environ['PATH'] += os.pathsep + path_to_libs
+        os.add_dll_directory(path_to_oneapi_backend)
+    os.environ['PATH'] = path_to_libs + os.pathsep + os.environ['PATH']
 
 try:
     from daal4py._daal4py import *

daal4py/oneapi/__init__.py

@@ -25,8 +25,15 @@
 
     sitepackages_path = sysconfig.get_paths()['purelib']
     installed_package_path = os.path.join(sitepackages_path, 'daal4py', 'oneapi')
-
     if sys.version_info.minor >= 8:
+        if 'DPCPPROOT' in os.environ:
+            dpcpp_rt_root_bin = os.path.join(os.environ['DPCPPROOT'], "windows", "bin")
+            dpcpp_rt_root_redist = os.path.join(os.environ['DPCPPROOT'], "windows",
+                                                "redist", "intel64_win", "compiler")
+            if os.path.exists(dpcpp_rt_root_bin):
+                os.add_dll_directory(dpcpp_rt_root_bin)
+            if os.path.exists(dpcpp_rt_root_redist):
+                os.add_dll_directory(dpcpp_rt_root_redist)
         os.add_dll_directory(current_path)
         if os.path.exists(installed_package_path):
             os.add_dll_directory(installed_package_path)

onedal/__init__.py

@@ -22,8 +22,12 @@
     path_to_env = site.getsitepackages()[0]
     path_to_libs = os.path.join(path_to_env, "Library", "bin")
     if sys.version_info.minor >= 8:
+        if 'DALROOT' in os.environ:
+            dal_root_redist = os.path.join(os.environ['DALROOT'], "redist", "intel64")
+            if os.path.exists(dal_root_redist):
+                os.add_dll_directory(dal_root_redist)
         os.add_dll_directory(path_to_libs)
-    os.environ['PATH'] += os.pathsep + path_to_libs
+    os.environ['PATH'] = path_to_libs + os.pathsep + os.environ['PATH']
 
 try:
     import onedal._onedal_py_dpc as _backend

requirements-test.txt

@@ -1,5 +1,6 @@
 pytest==6.2.5
-scikit-learn==1.0 ; python_version >= '3.7'
+scikit-learn==1.0.2 ; python_version >= '3.7'
 scikit-learn==0.24 ; python_version == '3.6'
 pandas==1.1.5 ; python_version <= '3.6'
-pandas==1.2.2 ; python_version >= '3.7'
+pandas==1.2.2 ; python_version >= '3.7' and python_version < "3.10"
+pandas==1.4.0 ; python_version >= '3.10'