Python - fixes for Linux

Author: RichardGe

python/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 project(PyRPR) 
 cmake_minimum_required(VERSION 3.18...3.22)
-find_package(Python 3.9 COMPONENTS Interpreter Development.Module REQUIRED)
+find_package(Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
 
 if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)

python/test/test_script_gltf.py

@@ -10,18 +10,23 @@
 import os
 
 binFolder = ""
+pluginFile = ""
 if sys.platform == "linux":
     binFolder = "binUbuntu20"
+    pluginFile = "libNorthstar64.so"
 elif sys.platform == "win32":
     binFolder = "binWin64"
+    pluginFile = "Northstar64.dll"
 else:
     binFolder = "binMacOS"
+    pluginFile = "libNorthstar64.dylib"
 
 
 # add the RPR Python library folder in order to import the rpr,rprs,rprgltf modules.
 if sys.platform == "win32":
     sys.path.insert(1, '../../python/build/Release')
-
+else:
+	sys.path.insert(1, '../../python/build')
 
 # we need to add the RPR DLLs
 if sys.platform == "win32":
@@ -48,7 +53,7 @@ def RPRCHECK(retCode):
 
 
 
-plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/" + binFolder + "/Northstar64.dll")))
+plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/" + binFolder+"/"+pluginFile)))
 if ( plugin_id == -1 ):
     print(f"RPR ERROR: plugin not found.")
     exit()
@@ -64,6 +69,10 @@ def RPRCHECK(retCode):
 print("RPR context creating...");
 flagsCtx = 0
 flagsCtx |= int(rpr.CreationFlags.ENABLE_GPU0)
+
+# with Northstar, add this flag to render with OpenCL instead of HIP :
+#flagsCtx |= int(rpr.CreationFlags.ENABLE_OPENCL)
+
 newCtx = rpr.Context()
 ctxInfo1 = rpr.PyMalloc("../../hipbin")
 pluginLists__myarray =    np.array([plugin_id], dtype=np.int32)  

python/test/test_script_rpr.py

@@ -10,18 +10,23 @@
 import os
 
 binFolder = ""
+pluginFile = ""
 if sys.platform == "linux":
     binFolder = "binUbuntu20"
+    pluginFile = "libNorthstar64.so"
 elif sys.platform == "win32":
     binFolder = "binWin64"
+    pluginFile = "Northstar64.dll"
 else:
     binFolder = "binMacOS"
+    pluginFile = "libNorthstar64.dylib"
 
 
 # add the RPR Python library folder in order to import the rpr,rprs,rprgltf modules.
 if sys.platform == "win32":
     sys.path.insert(1, '../../python/build/Release')
-
+else:
+	sys.path.insert(1, '../../python/build')
 
 # we need to add the RPR DLLs
 if sys.platform == "win32":
@@ -47,7 +52,7 @@ def RPRCHECK(retCode):
 
 
 
-plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/"+binFolder+"/Northstar64.dll")))
+plugin_id = rpr.RegisterPlugin((str("../../RadeonProRender/"+binFolder+"/"+pluginFile)))
 if ( plugin_id == -1 ):
     print(f"RPR ERROR: plugin not found.")
     exit()
@@ -63,6 +68,10 @@ def RPRCHECK(retCode):
 print("RPR context creating...");
 flagsCtx = 0
 flagsCtx |= int(rpr.CreationFlags.ENABLE_GPU0)
+
+# with Northstar, add this flag to render with OpenCL instead of HIP :
+#flagsCtx |= int(rpr.CreationFlags.ENABLE_OPENCL)
+
 newCtx = rpr.Context()
 ctxInfo1 = rpr.PyMalloc("../../hipbin")
 pluginLists__myarray =    np.array([plugin_id], dtype=np.int32)  

readme.md

@@ -87,12 +87,18 @@ Build the RPR binding libraries:
 > cmake -Dnanobind_DIR=nanobind/cmake ..
 > cmake --build . --config Release
 ```
-Those builds will be generated inside python/build/Release/ they are needed by the python script running RPR in order to execute the:
+Those builds will be generated inside python/build/ they are needed by the python script running RPR in order to execute the:
 ```
 import rpr
 import rprs
 import rprgltf
 ```
+Note that if you have several pythons installed on your system, you may need to define `Python_EXECUTABLE` in the first cmake instruction. Example:
+```
+cmake -Dnanobind_DIR=nanobind/cmake -DPython_EXECUTABLE=/usr/bin/python3 ..
+```
+The name of the compatible python version can be found in the name of the generated file. for example `rpr.cpython-38-x86_64-linux-gnu.so` means it's for python 3.8.
+
 
 Run some test scripts:
 ```