From 1b562247aabd658c280c59303da3693db2443cde Mon Sep 17 00:00:00 2001
From: rabbit <rabbit>
Date: Mon, 20 Apr 2020 10:43:42 +0200
Subject: [PATCH] fixes by rabbit
---
CMakeLists.txt | 2 +-
.../build_environment/install_deps.sh | 0
scripts/build_vrclient_gcc_cuda.sh | 3 +-
scripts/build_vrclient_gcc_cuda_noavx2.sh | 35 +++++++++++++++++++
scripts/run_vrclient_gcc.sh | 1 +
scripts/run_vrclient_gcc_cuda.sh | 1 +
6 files changed, 40 insertions(+), 2 deletions(-)
mode change 100644 => 100755 blender/build_files/build_environment/install_deps.sh
create mode 100755 scripts/build_vrclient_gcc_cuda_noavx2.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71e3366d..7cc8b462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ if (WITH_CLIENT_CUDA)
find_package(CUDA REQUIRED)
set(WITH_CLIENT_CUDA_BINARIES ON)
set(CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 CACHE STRING "CUDA architectures to build binaries for")
- set(CUDA_CUSTOM_LIBRARIES "" CACHE FILEPATH "")
+ #set(CUDA_CUSTOM_LIBRARIES "" CACHE FILEPATH "")
endif()
if(WITH_NVPIPE)
diff --git a/blender/build_files/build_environment/install_deps.sh b/blender/build_files/build_environment/install_deps.sh
old mode 100644
new mode 100755
diff --git a/scripts/build_vrclient_gcc_cuda.sh b/scripts/build_vrclient_gcc_cuda.sh
index 08afa871..6dd4754a 100755
--- a/scripts/build_vrclient_gcc_cuda.sh
+++ b/scripts/build_vrclient_gcc_cuda.sh
@@ -19,13 +19,14 @@ make_d="${make_d} -DWITH_CLIENT_FILE=ON"
make_d="${make_d} -DWITH_CLIENT_CESNET=ON"
make_d="${make_d} -DWITH_CLIENT_CUDA=ON"
make_d="${make_d} -DCUDA_BINARIES_ARCH=sm_30"
-make_d="${make_d} -DCUDA_CUSTOM_LIBRARIES=/usr/local/cuda/lib64/libcudart.so;/usr/local/cuda/lib64/stubs/libcuda.so"
+make_d="${make_d} -DCUDA_CUSTOM_LIBRARIES=-lcudart;-lcuda"
make_d="${make_d} -DWITH_RGBA_FORMAT=OFF" # "Enable rgba format, default is yuv420"
make_d="${make_d} -DWITH_YUV_OUTPUT=OFF" # "Enable yuv output - writing to yuv file"
make_d="${make_d} -DWITH_BMP_OUTPUT=OFF" # "Enable bmp output - writing to bmp file"
make_d="${make_d} -DCMAKE_BUILD_TYPE=Release"
+#make_d="${make_d} -DCMAKE_BUILD_TYPE=Debug"
make_d="${make_d} -DCMAKE_INSTALL_PREFIX=${output}"
cmake ${make_d}
diff --git a/scripts/build_vrclient_gcc_cuda_noavx2.sh b/scripts/build_vrclient_gcc_cuda_noavx2.sh
new file mode 100755
index 00000000..d4b31e37
--- /dev/null
+++ b/scripts/build_vrclient_gcc_cuda_noavx2.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+ROOT_DIR=${PWD}
+
+lib_dir=${ROOT_DIR}/install
+output=${ROOT_DIR}/install/vrclient_gcc
+src=${ROOT_DIR}/src
+
+export CC='gcc'
+export CXX='g++'
+
+#-----------blender_client--------------
+mkdir ${ROOT_DIR}/build/vrclient_gcc
+cd ${ROOT_DIR}/build/vrclient_gcc
+
+make_d="${src}/blender-vr-interactive"
+
+make_d="${make_d} -DWITH_CLIENT_FILE=ON"
+make_d="${make_d} -DWITH_CLIENT_CESNET=ON"
+make_d="${make_d} -DWITH_CLIENT_CUDA=ON"
+make_d="${make_d} -DCUDA_BINARIES_ARCH=sm_30"
+make_d="${make_d} -DCUDA_CUSTOM_LIBRARIES=-lcudart;-lcuda"
+
+make_d="${make_d} -DWITH_RGBA_FORMAT=OFF" # "Enable rgba format, default is yuv420"
+make_d="${make_d} -DWITH_YUV_OUTPUT=OFF" # "Enable yuv output - writing to yuv file"
+make_d="${make_d} -DWITH_BMP_OUTPUT=OFF" # "Enable bmp output - writing to bmp file"
+
+#make_d="${make_d} -DCMAKE_BUILD_TYPE=Release"
+make_d="${make_d} -DCMAKE_BUILD_TYPE=Debug"
+make_d="${make_d} -DCMAKE_INSTALL_PREFIX=${output}"
+
+make_d="${make_d} -DWITH_CPU_AVX2=OFF"
+
+cmake ${make_d}
+make -j install
diff --git a/scripts/run_vrclient_gcc.sh b/scripts/run_vrclient_gcc.sh
index 2c695024..9b9add67 100755
--- a/scripts/run_vrclient_gcc.sh
+++ b/scripts/run_vrclient_gcc.sh
@@ -3,6 +3,7 @@
ROOT_DIR=${PWD}
export CLIENT_FILE_KERNEL_GLOBAL=$ROOT_DIR/src/blender-vr-interactive/data/box_1024_512_cpu.kg
+#export CLIENT_FILE_KERNEL_GLOBAL=$ROOT_DIR/src/blender-vr-interactive/data/bmw_3840_1080_gpu.kg
export DEBUG_SAMPLES=1
${ROOT_DIR}/install/vrclient_gcc/bin/vrclient
diff --git a/scripts/run_vrclient_gcc_cuda.sh b/scripts/run_vrclient_gcc_cuda.sh
index 7820749e..ec69ab86 100755
--- a/scripts/run_vrclient_gcc_cuda.sh
+++ b/scripts/run_vrclient_gcc_cuda.sh
@@ -6,6 +6,7 @@ export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/lib64/stubs:$LD_LIB
export CLIENT_FILE_KERNEL_GLOBAL=$ROOT_DIR/src/blender-vr-interactive/data/bmw_3840_1080_gpu.kg
export DEBUG_CUBIN=$ROOT_DIR/build/vrclient_gcc/cyclesphi_cuda/kernel_sm_30.cubin
export DEBUG_SAMPLES=1
+export CUDA_VISIBLE_DEVICES=0,1,2
${ROOT_DIR}/install/vrclient_gcc/bin/vrclient
--
GitLab