mabiderun

python3kgae · Sep 5, 2022 · 5783014 · 5783014
1 parent e37f399
commit 5783014
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -85,7 +85,7 @@ jobs:
         cuda: 11.7.1
         visual_studio: "Visual Studio 16 2019"
       shell: powershell
-      run:
+      run: |
         .\misc\ci\win\install_cuda_windows.ps1
         ls $env:CUDA_PATH\
         ls $env:CUDA_PATH\bin

diff --git a/misc/ci/package.py b/misc/ci/package.py
@@ -12,6 +12,11 @@
 
 if sys.platform == 'win32':
     shutil.copytree(os.path.join('misc', 'ci', 'win'), outpath)
+    extra_lib_dir = os.path.join('projects', 'FBX', 'dem-bones-bin', 'files', 'Windows')
+    if os.path.isdir(extra_lib_dir):
+        for dirname, dirnames, filenames in os.walk(extra_lib_dir):
+            for name in filenames:
+                shutil.copyfile(os.path.join(dirname, name), os.path.join(outpath, name))
     shutil.move(os.path.join(binpath, 'zenoedit.exe'), os.path.join(outpath, 'zenoedit.exe'))
     for target in os.listdir(binpath):
         if target.endswith('.dll'):
@@ -33,6 +38,11 @@
     print('finished with', outpath + '.zip')
 elif sys.platform == 'linux':
     shutil.copytree(os.path.join('misc', 'ci', 'nix'), outpath)
+    extra_lib_dir = os.path.join('projects', 'FBX', 'dem-bones-bin', 'files', 'Linux')
+    if os.path.isdir(extra_lib_dir):
+        for dirname, dirnames, filenames in os.walk(extra_lib_dir):
+            for name in filenames:
+                shutil.copyfile(os.path.join(dirname, name), os.path.join(outpath, name))
     subprocess.check_call([
         'wget',
         'https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage',

diff --git a/misc/ci/win/libomp140.x86_64.dll b/misc/ci/win/libomp140.x86_64.dll
diff --git a/projects/FBX/dem-bones-bin b/projects/FBX/dem-bones-bin
diff --git a/projects/Python/CMakeLists.txt b/projects/Python/CMakeLists.txt
@@ -5,8 +5,10 @@ endif()
 file(GLOB_RECURSE sources CONFIGURE_DEPENDS *.cpp *.h)
 target_sources(zeno PRIVATE ${sources})
 
-set(ZENO_PYTHON_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Lib)
+set(ZENO_PYTHON_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Lib)
 set(ZENO_PYTHON_HOME_DIR ${CMAKE_CURRENT_BINARY_DIR}/CPython)
+set(ZENO_PYTHON_LIB_DIR ${ZENO_PYTHON_HOME_DIR}/lib)
+set(ZENO_PYTHON_BIN_DIR ${ZENO_PYTHON_HOME_DIR}/bin)
 if (WIN32)
     set(ZENO_PYTHON_DLL_FILE zeno.dll)
 elseif (APPLE)
@@ -16,8 +18,9 @@ else()
 endif()
 configure_file(zeno_Python_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/confinc/zeno_Python_config.h @ONLY)
 target_include_directories(zeno PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/confinc)
+zeno_add_asset_dir(${ZENO_PYTHON_MODULE_DIR})
 zeno_add_asset_dir(${ZENO_PYTHON_LIB_DIR})
-zeno_add_asset_dir(${ZENO_PYTHON_HOME_DIR})
+zeno_add_asset_dir(${ZENO_PYTHON_BIN_DIR})
 
 set(BUILD_LIBPYTHON_SHARED OFF CACHE BOOL "ZENOCIHOUPYTHON" FORCE)
 set(BUILD_EXTENSIONS_AS_BUILTIN ON CACHE BOOL "ZENOCIHOUPYTHON" FORCE)

diff --git a/projects/Python/PythonNodes.cpp b/projects/Python/PythonNodes.cpp
@@ -30,7 +30,7 @@ static int defPythonInit = getSession().eventCallbacks->hookEvent("init", [] {
     ws.resize(std::mbstowcs(ws.data(), s.data(), s.size())); // Shrink to fit.
     Py_SetPythonHome(ws.c_str());
     Py_Initialize();
-    std::string libpath = getAssetDir(ZENO_PYTHON_LIB_DIR);
+    std::string libpath = getAssetDir(ZENO_PYTHON_MODULE_DIR);
     std::string dllfile = ZENO_PYTHON_DLL_FILE;
     if (PyRun_SimpleString(("__import__('sys').path.insert(0, '" + libpath + "'); import ze; ze.initDLLPath('" + dllfile + "')").c_str()) < 0) {
         log_warn("Failed to initialize Python module");

diff --git a/projects/Python/zeno_Python_config.h.in b/projects/Python/zeno_Python_config.h.in
@@ -1,5 +1,7 @@
 #pragma once
 
-#define ZENO_PYTHON_LIB_DIR "@ZENO_PYTHON_LIB_DIR@"
+#define ZENO_PYTHON_MODULE_DIR "@ZENO_PYTHON_MODULE_DIR@"
 #define ZENO_PYTHON_HOME_DIR "@ZENO_PYTHON_HOME_DIR@"
+#define ZENO_PYTHON_LIB_DIR "@ZENO_PYTHON_LIB_DIR@"
+#define ZENO_PYTHON_BIN_DIR "@ZENO_PYTHON_LIB_DIR@"
 #define ZENO_PYTHON_DLL_FILE "@ZENO_PYTHON_DLL_FILE@"
+ −		files/Windows/libomp140.x86_64.dll
+ −		files/Windows/nvrtc64_100_0.dll