diff --git a/packaging/rpm/xpra.spec b/packaging/rpm/xpra.spec index 0fa2f2c2c1..4ac39893ba 100644 --- a/packaging/rpm/xpra.spec +++ b/packaging/rpm/xpra.spec @@ -435,7 +435,6 @@ rm -rf $RPM_BUILD_ROOT %{python3_sitearch}/xpra/codecs/icon_util.py %{python3_sitearch}/xpra/codecs/image_wrapper.py %{python3_sitearch}/xpra/codecs/loader.py -%{python3_sitearch}/xpra/codecs/nv_util.py %{python3_sitearch}/xpra/codecs/rgb_transform.py %{python3_sitearch}/xpra/codecs/video_helper.py %{python3_sitearch}/xpra/dbus @@ -453,7 +452,6 @@ rm -rf $RPM_BUILD_ROOT %files codecs %{python3_sitearch}/xpra/codecs/csc_* -%{python3_sitearch}/xpra/codecs/cuda_common %{python3_sitearch}/xpra/codecs/dec_avcodec2 %{python3_sitearch}/xpra/codecs/drm %{python3_sitearch}/xpra/codecs/enc_* diff --git a/xpra/client/window_backing_base.py b/xpra/client/window_backing_base.py index 313c84f382..efeb38722b 100644 --- a/xpra/client/window_backing_base.py +++ b/xpra/client/window_backing_base.py @@ -377,7 +377,7 @@ def assign_cuda_context(self, opengl=False): dev = get_default_device() assert dev #make this an opengl compatible context: - from xpra.codecs.cuda_common.cuda_context import cuda_device_context + from xpra.codecs.nv_common.cuda_context import cuda_device_context self.cuda_context = cuda_device_context(dev.device_id, dev.device, opengl) #create the context now as this is the part that takes time: self.cuda_context.make_context() diff --git a/xpra/codecs/cuda_common/__init__.py b/xpra/codecs/nv_common/__init__.py similarity index 100% rename from xpra/codecs/cuda_common/__init__.py rename to xpra/codecs/nv_common/__init__.py diff --git a/xpra/codecs/cuda_common/cuda_context.py b/xpra/codecs/nv_common/cuda_context.py similarity index 100% rename from xpra/codecs/cuda_common/cuda_context.py rename to xpra/codecs/nv_common/cuda_context.py diff --git a/xpra/codecs/nv_util.py b/xpra/codecs/nv_common/nv_util.py similarity index 100% rename from xpra/codecs/nv_util.py rename to xpra/codecs/nv_common/nv_util.py diff --git a/xpra/codecs/nvenc/encoder.pyx b/xpra/codecs/nvenc/encoder.pyx index 8c626bc42a..651cfc193d 100644 --- a/xpra/codecs/nvenc/encoder.pyx +++ b/xpra/codecs/nvenc/encoder.pyx @@ -15,10 +15,11 @@ from threading import Lock from xpra.os_util import WIN32, LINUX, strtobytes from xpra.make_thread import start_thread from xpra.util import AtomicInteger, engs, csv, pver, envint, envbool, first_time, typedict -from xpra.codecs.cuda_common.cuda_context import ( +from xpra.codecs.nv_common.cuda_context import ( init_all_devices, get_devices, get_device_name, get_cuda_info, get_pycuda_info, reset_state, get_CUDA_function, record_device_failure, record_device_success, CUDA_ERRORS_INFO, + cuda_device_context, load_device, ) from xpra.codecs.codec_constants import video_spec, TransientCodecException from xpra.codecs.image_wrapper import ImageWrapper @@ -2958,8 +2959,6 @@ def init_module(): raise Exception("unsupported version of NVENC: %#x" % NVENCAPI_VERSION) log("NVENC encoder API version %s", ".".join([str(x) for x in PRETTY_VERSION])) - from xpra.codecs.cuda_common.cuda_context import cuda_device_context, load_device - cdef Encoder test_encoder #cdef uint32_t max_version #cdef NVENCSTATUS r = NvEncodeAPIGetMaxSupportedVersion(&max_version) diff --git a/xpra/codecs/nvfbc/fbc_capture_linux.pyx b/xpra/codecs/nvfbc/fbc_capture_linux.pyx index 5120c49a96..5c60613efb 100644 --- a/xpra/codecs/nvfbc/fbc_capture_linux.pyx +++ b/xpra/codecs/nvfbc/fbc_capture_linux.pyx @@ -22,7 +22,7 @@ log = Logger("encoder", "nvfbc") #because importing CUDAImageWrapper will have imported pycuda with the lock try: from pycuda import driver - from xpra.codecs.cuda_common.cuda_context import CUDA_ERRORS_INFO, select_device, device_info + from xpra.codecs.nv_common.cuda_context import CUDA_ERRORS_INFO, select_device, device_info except ImportError: raise except: diff --git a/xpra/codecs/nvfbc/fbc_capture_win.pyx b/xpra/codecs/nvfbc/fbc_capture_win.pyx index f364f53a01..f6bfc80679 100644 --- a/xpra/codecs/nvfbc/fbc_capture_win.pyx +++ b/xpra/codecs/nvfbc/fbc_capture_win.pyx @@ -24,7 +24,7 @@ log = Logger("encoder", "nvfbc") #because importing CUDAImageWrapper will have imported pycuda with the lock try: from pycuda import driver - from xpra.codecs.cuda_common.cuda_context import CUDA_ERRORS_INFO, select_device, device_info + from xpra.codecs.nv_common.cuda_context import CUDA_ERRORS_INFO, select_device, device_info except ImportError: raise except Exception as e: diff --git a/xpra/codecs/nvjpeg/decoder.pyx b/xpra/codecs/nvjpeg/decoder.pyx index 8679d81e76..831e680968 100644 --- a/xpra/codecs/nvjpeg/decoder.pyx +++ b/xpra/codecs/nvjpeg/decoder.pyx @@ -25,7 +25,7 @@ from xpra.codecs.nvjpeg.common import ( errcheck, NVJPEG_Exception, ERR_STR, CSS_STR, ) -from xpra.codecs.cuda_common.cuda_context import select_device, cuda_device_context +from xpra.codecs.nv_common.cuda_context import select_device, cuda_device_context from xpra.codecs.image_wrapper import ImageWrapper from xpra.log import Logger log = Logger("encoder", "nvjpeg") diff --git a/xpra/codecs/nvjpeg/encoder.pyx b/xpra/codecs/nvjpeg/encoder.pyx index 997aa2fe0e..396f6919ee 100644 --- a/xpra/codecs/nvjpeg/encoder.pyx +++ b/xpra/codecs/nvjpeg/encoder.pyx @@ -23,7 +23,7 @@ from xpra.codecs.nvjpeg.common import ( CSS_STR, ENCODING_STR, NVJPEG_INPUT_STR, ) from xpra.codecs.codec_debug import may_save_image -from xpra.codecs.cuda_common.cuda_context import get_CUDA_function, select_device, cuda_device_context +from xpra.codecs.nv_common.cuda_context import get_CUDA_function, select_device, cuda_device_context from xpra.net.compression import Compressed from xpra.util import typedict diff --git a/xpra/server/source/encodings_mixin.py b/xpra/server/source/encodings_mixin.py index 6b56e01d37..632adc43c6 100644 --- a/xpra/server/source/encodings_mixin.py +++ b/xpra/server/source/encodings_mixin.py @@ -366,7 +366,7 @@ def parse_encoding_caps(self, c): or ("jpeg" in common_encodings and has_codec("enc_nvjpeg")): cudalog = Logger("cuda") try: - from xpra.codecs.cuda_common.cuda_context import get_device_context + from xpra.codecs.nv_common.cuda_context import get_device_context self.cuda_device_context = get_device_context(self.encoding_options) cudalog("cuda_device_context=%s", self.cuda_device_context) except Exception as e: