Automatically detect blender version for benchmark script on windows
This commit is contained in:
63
run.bat
63
run.bat
@@ -1,26 +1,37 @@
|
|||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
rem set SCRIPTPATH_SLASH=%~dp0
|
rem set SCRIPTPATH_SLASH=%~dp0
|
||||||
rem set SCRIPTPATH=%SCRIPTPATH_SLASH:~0,-1%
|
rem set SCRIPTPATH=%SCRIPTPATH_SLASH:~0,-1%
|
||||||
set SCRIPTPATH=
|
set SCRIPTPATH=
|
||||||
set BOOTSTRAP_VERSION=0.1
|
set BOOTSTRAP_VERSION=0.1
|
||||||
set BLENDER_VERSION=2.78
|
set BLENDER_VERSION=
|
||||||
|
|
||||||
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set BITNESS=32 || set BITNESS=64
|
reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set BITNESS=32 || set BITNESS=64
|
||||||
|
|
||||||
echo Cycles Benchmark Suite bootstrap v%BOOTSTRAP_VERSION%
|
echo Cycles Benchmark Suite bootstrap v%BOOTSTRAP_VERSION%
|
||||||
echo Detected OS: Windows %BITNESS%bit
|
echo Detected OS: Windows %BITNESS%bit
|
||||||
|
|
||||||
set BLENDER_DIR=%SCRIPTPATH%blender\windows%BITNESS%
|
for /l %%x in (9, -1, 0) do (
|
||||||
set BLENDER_BIN=%BLENDER_DIR%\blender.exe
|
for /l %%y in (99, -1, 10) do (
|
||||||
set SCENES_DIR=%SCRIPTPATH%scenes
|
if EXIST %SCRIPTPATH%blender\windows%BITNESS%\%%x.%%y (
|
||||||
set PYTHON=%BLENDER_DIR%\%BLENDER_VERSION%\python\bin\python.exe
|
set BLENDER_VERSION=%%x.%%y
|
||||||
set BENCHMARK=%SCRIPTPATH%benchmark\main.py
|
goto GOT_VERSION
|
||||||
set CONFIGURE_SCRIPT=%SCRIPTPATH%benchmark\configure.py
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
echo %BLENDER_DIR%
|
|
||||||
echo Using Python from %PYTHON%
|
:GOT_VERSION
|
||||||
echo Running benchmark script %BENCHMARK%
|
|
||||||
|
set BLENDER_DIR=%SCRIPTPATH%blender\windows%BITNESS%
|
||||||
%PYTHON% %BENCHMARK% --blender "%BLENDER_BIN%" --scenes-dir "%SCENES_DIR%" --configure-script "%CONFIGURE_SCRIPT%" %*
|
set BLENDER_BIN=%BLENDER_DIR%\blender.exe
|
||||||
|
set SCENES_DIR=%SCRIPTPATH%scenes
|
||||||
|
set PYTHON=%BLENDER_DIR%\%BLENDER_VERSION%\python\bin\python.exe
|
||||||
|
set BENCHMARK=%SCRIPTPATH%benchmark\main.py
|
||||||
|
set CONFIGURE_SCRIPT=%SCRIPTPATH%benchmark\configure.py
|
||||||
|
|
||||||
|
|
||||||
|
echo %BLENDER_DIR%
|
||||||
|
echo Using Python from %PYTHON%
|
||||||
|
echo Running benchmark script %BENCHMARK%
|
||||||
|
|
||||||
|
%PYTHON% %BENCHMARK% --blender "%BLENDER_BIN%" --scenes-dir "%SCENES_DIR%" --configure-script "%CONFIGURE_SCRIPT%" %*
|
||||||
|
Reference in New Issue
Block a user