diff --git a/Dynamic-Backward-Attention-Transformer b/Dynamic-Backward-Attention-Transformer index 48c68cea9d69056240527c8716551e3d452a8833..ace4a01ed0c3f2f304d5c9b76a552240f5a1fdc7 160000 --- a/Dynamic-Backward-Attention-Transformer +++ b/Dynamic-Backward-Attention-Transformer @@ -1 +1 @@ -Subproject commit 48c68cea9d69056240527c8716551e3d452a8833 +Subproject commit ace4a01ed0c3f2f304d5c9b76a552240f5a1fdc7 diff --git a/scripts/combined.bat b/scripts/combined.bat index f01456937a617e64a7e086b39e6870cb6ce155f1..6965380bd7bc41bb9cc347f73939f4f7e329c01c 100644 --- a/scripts/combined.bat +++ b/scripts/combined.bat @@ -45,7 +45,7 @@ if not exist "%checkpointFile%" ( :: Shift the image if the option is selected if /I "%shiftImage%"=="y" ( echo Shifting the input image... - call "%condaDir%\condabin\activate.bat" base + call "%condaDir%\condabin\activate.bat" %materialEnv% python "%scriptDir%shifter.py" "%inputFilePath%" "%shiftedImage%" call "%condaDir%\condabin\deactivate.bat" set "processFilePath=%shiftedImage%" @@ -73,7 +73,7 @@ if %depthVar%==1 ( :: Splitting 360 Image echo Splitting 360 image... pushd "%materialRecogDir%" -call "%condaDir%\condabin\activate.bat" base +call "%condaDir%\condabin\activate.bat" %materialEnv% python split_img.py "%processFilePath%" call "%condaDir%\condabin\deactivate.bat" popd @@ -94,7 +94,7 @@ popd :: Combining Material Recognition output pushd "%materialRecogDir%" echo Combining material recognition output... -call "%condaDir%\condabin\activate.bat" base +call "%condaDir%\condabin\activate.bat" %materialEnv% python "%materialRecogDir%\combine_img.py" call "%condaDir%\condabin\deactivate.bat" popd @@ -111,7 +111,7 @@ popd :: Run mesh splitting echo Running mesh splitting... pushd "%edgeNetDir%" -call "%condaDir%\condabin\activate.bat" base +call "%condaDir%\condabin\activate.bat" %materialEnv% python "%edgeNetDir%\replace.py" call "%condaDir%\condabin\deactivate.bat" popd