diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
| commit | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (patch) | |
| tree | 8d7c3a99896415392035ba350a606d350b6d5e37 /build_files | |
| parent | 5d3f679013bbbb9f0c7aae47b5653c54266cf7ca (diff) | |
| parent | 7ff3cd26932cbc93068eea4dc7438442216e4ee1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 23 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 2 |
2 files changed, 12 insertions, 13 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 1318cd26294..f2f8edc614d 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -107,25 +107,24 @@ if 'cmake' in builder: elif builder.endswith('i686_cmake'): bits = 32 chroot_name = 'buildbot_' + deb_name + '_i686' - cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' - targets = ['player', 'blender', 'cuda'] + targets = ['player', 'blender'] cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) - # Prepare CMake options needed to configure cuda binaries compilation. - cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF')) - cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61") - if build_cubins or 'cuda' in targets: - if bits == 32: - cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=OFF") - else: + # Prepare CMake options needed to configure cuda binaries compilation, 64bit only. + if bits == 64: + cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF')) + cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61") + if build_cubins or 'cuda' in targets: cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON") - # Only modify common cmake options if cuda doesn't require separate target. - if 'cuda' not in targets: - cmake_options += cuda_cmake_options + # Only modify common cmake options if cuda doesn't require separate target. + if 'cuda' not in targets: + cmake_options += cuda_cmake_options + else: + cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF") cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir)) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 1d1793e0aba..26267fd314a 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -54,7 +54,7 @@ set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) set(WITH_PLAYER ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE) -set(CYCLES_CUDA_BINARIES_ARCH sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE) +set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE) # platform dependent options if(UNIX AND NOT APPLE) |