fix serialization, prepare release

Author: robertsulej

CHANGELOG.rst

@@ -1,7 +1,8 @@
 Release history
 ===============
 
-v0.18.0 - 2024-03-09
+`v0.18.0` - 2024-03-09
+----------------------
 
 Added
 ~~~~~

plotoptix/__init__.py

@@ -1,5 +1,5 @@
 """
-3D ray tracing package for Python. Based on NVIDIA OptiX 7 framework,
+3D ray tracing package for Python based on NVIDIA OptiX 7 framework,
 wrapped in RnD.SharpOptiX C#/C++/CUDA libraries by R&D Team.
 
 https://github.com/rnd-team-dev/plotoptix/blob/master/LICENSE.txt
@@ -12,8 +12,8 @@
 
 __author__  = "Robert Sulej, R&D Team <dev@rnd.team>"
 __status__  = "beta"
-__version__ = "0.18.0"
-__date__    = "28 January 2024"
+__version__ = "0.18.1"
+__date__    = "10 March 2024"
 
 import logging
 

plotoptix/bin/RnD.SharpOptiX.dll

@@ -6,8 +6,8 @@
 
 __author__  = "Robert Sulej, R&D Team <dev@rnd.team>"
 __status__  = "beta"
-__version__ = "0.4.0"
-__date__    = "05 July 2019"
+__version__ = "0.18.1"
+__date__    = "10 March 2024"
 
 import logging
 

plotoptix/install/__init__.py

@@ -8,10 +8,7 @@
 
 def main():
     if len(sys.argv) > 1:
-        if sys.argv[1] == "denoiser":
-            from plotoptix.install.denoiser import install_denoiser
-            result = install_denoiser()
-        elif sys.argv[1] == "examples":
+        if sys.argv[1] == "examples":
             from plotoptix.install.project import install_project
             result = install_project("examples.zip", "1Bdq7SnvI3fA12_-LoaF31h-d5E67T_32")
         elif sys.argv[1] == "moon":

plotoptix/install/__main__.py

@@ -2274,7 +2274,7 @@ def _init_scene_metadata(self) -> bool:
         self.geometry_names = {}   # geometry handle to name dictionary
         if "Geometry" in meta:
             for key, value in meta["Geometry"].items():
-                self.geometry_data[key] = GeometryMeta(key, value["Handle"], value["Size"], Geometry[value["Type"]])
+                self.geometry_data[key] = GeometryMeta(key, value["Handle"], value["Size"], Geometry(value["Type"]))
                 self.geometry_names[value["Handle"]] = key
         else: return False
 
@@ -5962,7 +5962,7 @@ def load_mesh_obj(self, file_name: str, mesh_name: Optional[str] = None, parent:
             if len(s) > 2:
                 meta = json.loads(s)
                 for key, value in meta.items():
-                    self.geometry_data[key] = GeometryMeta(key, value["Handle"], value["Size"], Geometry[value["Type"]])
+                    self.geometry_data[key] = GeometryMeta(key, value["Handle"], value["Size"], Geometry(value["Type"]))
                     self.geometry_names[value["Handle"]] = key
                     self._logger.info("...loaded: %s %s (%d vertices)", key, value["Size"], value["Type"])
             else:
@@ -6017,7 +6017,7 @@ def load_multiple_mesh_obj(self, file_name: str, mat: dict, default: str = "diff
             if len(s) > 2:
                 meta = json.loads(s)
                 for key, value in meta.items():
-                    self.geometry_data[key] = GeometryMeta(key, value["Handle"], value["Size"], Geometry[value["Type"]])
+                    self.geometry_data[key] = GeometryMeta(key, value["Handle"], value["Size"], Geometry(value["Type"]))
                     self.geometry_names[value["Handle"]] = key
                     self._logger.info("...loaded: %s %s (%d vertices)", key, value["Type"], value["Size"])
             else:

plotoptix/npoptix.py

@@ -147,8 +147,38 @@ def get_tag(self):
     bdist_wheel = None
 
 
+windows_files = [
+    "bin/avcodec-58.dll",
+    "bin/avformat-58.dll",
+    "bin/avutil-56.dll",
+    "bin/OpenImageDenoise.dll",
+    "bin/OpenImageDenoise_core.dll",
+    "bin/OpenImageDenoise_device_cuda.dll",
+    "bin/rndSharpEncoder.dll",
+    "bin/rndSharpOptiX7.dll"
+]
+linux_files = [
+    "bin/librndSharpOptiX7.so",
+    "bin/librndSharpEncoder.so",
+    "bin/libOpenImageDenoise.so",
+    "bin/libOpenImageDenoise_core.so.2.2.1",
+    "bin/libOpenImageDenoise_device_cuda.so.2.2.1"
+]
+common_files = [
+    "bin/BitMiracle.LibTiff.NET.dll",
+    "bin/BitMiracle.LibTiff.NET.xml",
+    "bin/Newtonsoft.Json.dll",
+    "bin/Newtonsoft.Json.xml",
+    "bin/RnD.SharpEncoder.dll",
+    "bin/RnD.SharpOptiX.dll",
+    "bin/RnD.SharpOptiX.dll.config",
+    "bin/cuda/*.ir"
+]
+platform_specific_files = windows_files if platform.system() == "Windows" else linux_files
+
+
 setup(name='plotoptix',
-      version='0.18.0',
+      version='0.18.1',
       url='https://rnd.team/plotoptix',
       project_urls={
           'Documentation': 'https://plotoptix.rnd.team',
@@ -191,13 +221,9 @@ def get_tag(self):
           'requests>=2.25'
       ],
       long_description=open('README.rst').read(),
-      include_package_data=True,
-      exclude_package_data={
-          '': [
-              'README.rst',
-              'README.md'
-              ]
-          },
+      include_package_data=False,
+      package_data={ "plotoptix": platform_specific_files + common_files },
+      exclude_package_data={ '': ['README.rst', 'README.md'] },
       test_suite='nose2.collector.collector',
       tests_require=['nose2>=0.9'],
       zip_safe=False)