From fe78fd13fd70a564805130f974ef55dadbd2f20e Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Tue, 7 Sep 2021 11:55:29 +0200
Subject: [PATCH] Move files, make regular pip installable
---
setup.py | 2 +-
src/calng/DsscCorrection.py | 4 ++--
src/calng/ShmemToZMQ.py | 2 +-
src/calng/dssc_gpu.py | 2 +-
src/{ => calng}/gpu_utils.py | 0
src/{ => calng}/shmem_utils.py | 0
src/{ => calng}/utils.py | 0
7 files changed, 5 insertions(+), 5 deletions(-)
rename src/{ => calng}/gpu_utils.py (100%)
rename src/{ => calng}/shmem_utils.py (100%)
rename src/{ => calng}/utils.py (100%)
diff --git a/setup.py b/setup.py
index dd95054b..85f6b2ad 100644
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,6 @@ setup(name='calng',
'CalibrationManager = calng.CalibrationManager:CalibrationManager'
],
},
- package_data={},
+ package_data={'': ['*.cpp']},
requires=[],
)
diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py
index 1ab09cb1..5aae2983 100644
--- a/src/calng/DsscCorrection.py
+++ b/src/calng/DsscCorrection.py
@@ -29,8 +29,8 @@ from karabo.bound import (
)
from karabo.common.states import State
-import shmem_utils
-import utils
+from . import shmem_utils
+from . import utils
from ._version import version as deviceVersion
from .dssc_gpu import DsscGpuRunner
diff --git a/src/calng/ShmemToZMQ.py b/src/calng/ShmemToZMQ.py
index c69fdd28..e1c2fc78 100644
--- a/src/calng/ShmemToZMQ.py
+++ b/src/calng/ShmemToZMQ.py
@@ -4,7 +4,7 @@ from time import time
from karabo.bound import KARABO_CLASSINFO
from PipeToZeroMQ import PipeToZeroMQ, conversion
-import shmem_utils
+from . import shmem_utils
from ._version import version as deviceVersion
diff --git a/src/calng/dssc_gpu.py b/src/calng/dssc_gpu.py
index 5efa4a4c..4e126ab3 100644
--- a/src/calng/dssc_gpu.py
+++ b/src/calng/dssc_gpu.py
@@ -5,7 +5,7 @@ import cupyx
import jinja2
import numpy as np
-import utils
+from . import utils
class DsscGpuRunner:
diff --git a/src/gpu_utils.py b/src/calng/gpu_utils.py
similarity index 100%
rename from src/gpu_utils.py
rename to src/calng/gpu_utils.py
diff --git a/src/shmem_utils.py b/src/calng/shmem_utils.py
similarity index 100%
rename from src/shmem_utils.py
rename to src/calng/shmem_utils.py
diff --git a/src/utils.py b/src/calng/utils.py
similarity index 100%
rename from src/utils.py
rename to src/calng/utils.py
--
GitLab