Merge pull request #830 from IntelPython/fix-ci-for-0.12

Fix ci for 0.12

Author: oleksandr-pavlyk

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
     -   id: black
         exclude: "versioneer.py|dpctl/_version.py"

dpctl/tests/test_sycl_event.py

@@ -196,15 +196,15 @@ def test_sycl_timer():
     except dpctl.SyclQueueCreationError:
         pytest.skip("Queue creation of default device failed")
     timer = dpctl.SyclTimer()
-    m1 = dpctl_mem.MemoryUSMDevice(256 * 1024, queue=q)
-    m2 = dpctl_mem.MemoryUSMDevice(256 * 1024, queue=q)
+    m1 = dpctl_mem.MemoryUSMDevice(1024 * 1024, queue=q)
+    m2 = dpctl_mem.MemoryUSMDevice(1024 * 1024, queue=q)
     with timer(q):
         # device task
         m1.copy_from_device(m2)
-        # host task
-        [x**2 for x in range(1024)]
+        # host operation
+        [x**2 for x in range(128 * 1024)]
     host_dt, device_dt = timer.dt
-    assert host_dt > device_dt
+    assert host_dt > device_dt or (host_dt > 0 and device_dt >= 0)
     q_no_profiling = dpctl.SyclQueue()
     assert q_no_profiling.has_enable_profiling is False
     with pytest.raises(ValueError):

setup.py

@@ -85,6 +85,16 @@ def copy_file(self, src, dst, preserve_mode=True):
         _patched_copy_file(src, dst, preserve_mode=preserve_mode)
         return (dst, 1)
 
+    def build_package_data(self):
+        """Copy data files into build directory"""
+        for package, src_dir, build_dir, filenames in self.data_files:
+            for filename in filenames:
+                target = os.path.join(build_dir, filename)
+                self.mkpath(os.path.dirname(target))
+                srcfile = os.path.join(src_dir, filename)
+                outf, copied = self.copy_file(srcfile, target)
+                srcfile = os.path.abspath(srcfile)
+
 
 class InstallCmd(_skbuild_install):
     def run(self):
@@ -93,13 +103,19 @@ def run(self):
             this_dir = os.path.dirname(os.path.abspath(__file__))
             dpctl_build_dir = os.path.join(this_dir, self.build_lib, "dpctl")
             dpctl_install_dir = os.path.join(self.install_libbase, "dpctl")
-            for fn in glob.glob(
-                os.path.join(dpctl_install_dir, "*DPCTLSyclInterface.so*")
-            ):
-                os.remove(fn)
+            sofiles = glob.glob(
+                os.path.join(dpctl_build_dir, "*DPCTLSyclInterface.so*")
+            )
+            # insert actual file at the beginning of the list
+            pos = [i for i, fn in enumerate(sofiles) if not os.path.islink(fn)]
+            if pos:
+                hard_file = sofiles.pop(pos[0])
+                sofiles.insert(0, hard_file)
+            for fn in sofiles:
                 base_fn = os.path.basename(fn)
                 src_file = os.path.join(dpctl_build_dir, base_fn)
                 dst_file = os.path.join(dpctl_install_dir, base_fn)
+                os.remove(dst_file)
                 _patched_copy_file(src_file, dst_file)
         return ret