From 2f5d50edf83fe09d854761440107c76b7ba522c0 Mon Sep 17 00:00:00 2001 From: fszontagh <51741446+fszontagh@users.noreply.github.com> Date: Sat, 09 Mar 2024 12:55:03 +0000 Subject: [PATCH] add amd support - test --- autobuild.bat | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/autobuild.bat b/autobuild.bat index 4669311..281d27e 100644 --- a/autobuild.bat +++ b/autobuild.bat @@ -10,7 +10,9 @@ set avx2_dir=%basedirname%_avx2 set avx512_dir=%basedirname%_avx512 set CUDA_dir=%basedirname%_CUDA +set ROCM_dir=%basedirname%_ROCM set ISCC="C:\Program Files (x86)\Inno Setup 6\iscc.exe" +set ROCM="C:\ROCm\5.7\bin" :start @ECHO OFF @@ -81,9 +83,12 @@ %ISCC% /O"%installers_dir%/%date%" sd.gui.wx.iss -REM %ISCC% /O"%installers_dir%/%date%" sd.gui.wx_avx2.iss -REM %ISCC% /O"%installers_dir%/%date%" sd.gui.wx_avx512.iss -REM %ISCC% /O"%installers_dir%/%date%" sd.gui.wx_avx_CUDA.iss +set SD_GUI_VARIATION=rocm +set SD_GUI_VERSION=%SD_GUI_VERSION% +echo SD GUI version: %SD_GUI_VERSION% +echo SD GUI variation: %SD_GUI_VARIATION% + +%ISCC% /O"%installers_dir%/%date%" sd.gui.wx.iss pause goto start @@ -126,6 +131,13 @@ git clone https://github.com/fszontagh/sd.cpp.gui.wx.git %CUDA_dir% + +if exist %ROCM_dir%\ ( + rmdir /s /q %ROCM_dir% +) + +git clone https://github.com/fszontagh/sd.cpp.gui.wx.git %ROCM_dir% + cd %avx_dir% git fetch --all git reset --hard origin/main @@ -139,6 +151,10 @@ git reset --hard origin/main git pull cd %CUDA_dir% +git fetch --all +git reset --hard origin/main +git pull +cd %ROCM_dir% git fetch --all git reset --hard origin/main git pull @@ -189,6 +205,24 @@ ) cmake -B build/ -S . -DCMAKE_TOOLCHAIN_FILE=%vcpkg_root_dir%/scripts/buildsystems/vcpkg.cmake -DSD_CUBLAS=ON cmake --build build/ --config Release + +cd %startdir% + +cd %ROCM_dir% + +set CC=%ROCM%\clang.exe +set CXX=%ROCM%\clang++.exe + +IF EXIST external\stable-diffusion\ ( + rmdir /s /q external\stable-diffusion +) +IF EXIST build\ ( + rmdir /s /q build +) + +cmake -B build/ -S . -G "Ninja" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSD_HIPBLAS=ON -DCMAKE_BUILD_TYPE=Release +cmake --build build/ --config Release + cd %startdir% goto :start -- Gitblit v1.9.3