Remove oidn external executable (rely only on internal oidn)

Author: howetuft

build-system/luxmake/wheel.py

@@ -167,13 +167,6 @@ def make_wheel(args):
             wheeltree / "pyluxcore.libs",
             dirs_exist_ok=True,
         )
-        oidn_path = INSTALL_DIR / "pyluxcore.oidn"
-        oidn_path.mkdir(parents=True, exist_ok=True)
-        shutil.copytree(
-            INSTALL_DIR / "pyluxcore.oidn",
-            wheeltree / "pyluxcore.oidn",
-            dirs_exist_ok=True,
-        )
 
         # Pack wheel
         logger.info("Packing wheel")

build-system/luxmake/windows.py

@@ -51,10 +51,6 @@ def win_recompose(args):
         namever = parsed_filename.group("namever")
         unpacked_wheel_path = Path(tmpdir) / namever
 
-        # Rename and move oidnDenoise
-        logger.info("Renaming oidnDenoise.pyd into oidnDenoise.exe")
-        _rename(unpacked_wheel_path, "oidnDenoise.pyd", "oidnDenoise.exe")
-
         # Rename and move OpenImageDenoise_device_cpu
         logger.info(
             "Renaming OpenImageDenoise_device_cpu.pyd "

python/pyluxcoretest/pyluxcoretest.py

@@ -843,45 +843,6 @@ def convert_folder_to_windows(folder, extension):
 
         # print(path_in_str, flush=True)
 
-def ExternalOidn():
-    print("*** External denoiser test ***")
-    print(f"Looking for oidnDenoiser... ", end='')
-    denoiser_path = pyluxcore.which_oidn()
-    assert denoiser_path
-    print("Found!")
-    os.chdir(os.path.dirname(denoiser_path))
-
-    if platform.system() == "Linux":
-        cmd = ["patchelf", denoiser_path, "--print-rpath"]
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        print("oidnDenoiser rpath:", result.stdout)
-
-    print("Running external denoiser")
-    image_path = Path(__file__).parent / "memorial.pfm"
-    args = [
-        denoiser_path,
-        "-hdr",
-        image_path,
-    ]
-    denoiser_process = subprocess.Popen(
-        args,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        text=True,
-        env={"LD_DEBUG": "libs"},
-    )
-    with denoiser_process.stdout as d_out:
-        if d_out:
-            print("Denoiser output:")
-            for line in d_out:
-                print(line, end='')
-    denoiser_process.wait()
-    returncode = denoiser_process.returncode
-    print("Denoiser return code:", returncode)
-    assert returncode is not None and returncode == 0
-    print()
-
-
 def main():
     """Entry point."""
     print("STARTING LUXCORETEST", flush=True)
@@ -913,7 +874,6 @@ def main():
         ImagePipelineEdit()
         # SaveResumeRenderingS()
         # SaveResumeRenderingM()
-        ExternalOidn()
 
         print("Copying results", flush=True)
 

src/pyluxcore/CMakeLists.txt

@@ -82,50 +82,50 @@ if(APPLE)
   endif()
 endif()
 
-# OIDN
-# oidnDenoise
-add_executable(oidn-denoise IMPORTED)
-set_property(TARGET oidn-denoise PROPERTY IMPORTED_LOCATION "${LUX_OIDN_DENOISE_PATH}")
-
-if(WIN32)
-  # Windows lacks rpath system, so we have to put oidnDenoise in the same
-  # folder as the dlls...
-  set(OIDN_DESTINATION "pyluxcore.libs")
-else()
-  # For Macos, reminder: don't put it in pyluxcore/.dylibs, it would prevent
-  # other deps' relocation
-  set(OIDN_DESTINATION "pyluxcore.oidn")
-endif(WIN32)
+## OIDN
+## oidnDenoise
+#add_executable(oidn-denoise IMPORTED)
+#set_property(TARGET oidn-denoise PROPERTY IMPORTED_LOCATION "${LUX_OIDN_DENOISE_PATH}")
+
+#if(WIN32)
+  ## Windows lacks rpath system, so we have to put oidnDenoise in the same
+  ## folder as the dlls...
+  #set(OIDN_DESTINATION "pyluxcore.libs")
+#else()
+  ## For Macos, reminder: don't put it in pyluxcore/.dylibs, it would prevent
+  ## other deps' relocation
+  #set(OIDN_DESTINATION "pyluxcore.oidn")
+#endif(WIN32)
 
 if(LINUX)
-  set_property(
-    TARGET oidn-denoise
-    PROPERTY INSTALL_RPATH "\\\${ORIGIN}/../pyluxcore.libs"
-  )
+  #set_property(
+    #TARGET oidn-denoise
+    #PROPERTY INSTALL_RPATH "\\\${ORIGIN}/../pyluxcore.libs"
+  #)
   install(
     PROGRAMS "${LUX_OIDN_DEVICE_CPU}"
     DESTINATION "pyluxcore.libs"
     COMPONENT pyluxcore
   )
 endif(LINUX)
 
-if(APPLE)
-  set_target_properties(
-    oidn-denoise PROPERTIES
-    INSTALL_RPATH "\\\${ORIGIN}/../pyluxcore/.pylibs"
-    BUILD_RPATH ""
-  )
-endif(APPLE)
-
-INSTALL(
-  IMPORTED_RUNTIME_ARTIFACTS oidn-denoise
-  DESTINATION ${OIDN_DESTINATION}
-  PERMISSIONS
-    OWNER_WRITE OWNER_READ OWNER_EXECUTE
-    GROUP_READ GROUP_EXECUTE
-    WORLD_READ WORLD_EXECUTE
-  COMPONENT pyluxcore
-)
+#if(APPLE)
+  #set_target_properties(
+    #oidn-denoise PROPERTIES
+    #INSTALL_RPATH "\\\${ORIGIN}/../pyluxcore/.pylibs"
+    #BUILD_RPATH ""
+  #)
+#endif(APPLE)
+
+#INSTALL(
+  #IMPORTED_RUNTIME_ARTIFACTS oidn-denoise
+  #DESTINATION ${OIDN_DESTINATION}
+  #PERMISSIONS
+    #OWNER_WRITE OWNER_READ OWNER_EXECUTE
+    #GROUP_READ GROUP_EXECUTE
+    #WORLD_READ WORLD_EXECUTE
+  #COMPONENT pyluxcore
+#)
 
 
 if(WIN32)
@@ -139,24 +139,24 @@ if(WIN32)
     COMPONENT pyluxcore
   )
 
-  # Delvewheel doesn't handle executables, however we need to delocate oidnDenoise.
-  # Therefore we had to let Delvewheel believe oidnDenoise is a lib, and now
-  # we have to make it an executable again...
-  message(STATUS "oidnDenoise suffix back to pyd")
-  INSTALL(
-    CODE
-    "
-    MESSAGE(STATUS
-        \"Renaming '$<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.exe' \
-        into '$<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.pyd'\"
-    )
-    FILE(RENAME
-        $<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.exe
-        $<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.pyd
-    )
-    "
-    COMPONENT pyluxcore
-  )
+  ## Delvewheel doesn't handle executables, however we need to delocate oidnDenoise.
+  ## Therefore we had to let Delvewheel believe oidnDenoise is a lib, and now
+  ## we have to make it an executable again...
+  #message(STATUS "oidnDenoise suffix back to pyd")
+  #INSTALL(
+    #CODE
+    #"
+    #MESSAGE(STATUS
+        #\"Renaming '$<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.exe' \
+        #into '$<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.pyd'\"
+    #)
+    #FILE(RENAME
+        #$<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.exe
+        #$<INSTALL_PREFIX>/pyluxcore.libs/oidnDenoise.pyd
+    #)
+    #"
+    #COMPONENT pyluxcore
+  #)
 
 endif(WIN32)