Jacques Lucke
e6ca054590
This adds a new `ParallelMultiFunction` which wraps another multi-function and evaluates it with multiple threads. The speeds up field evaluation quite a bit (the effect is most noticeable when the number of evaluations and the field is large). There are still other single-threaded performance bottlenecks in field evaluation that will need to be solved separately. Most notably here is the process of copying the computed data into the position attribute in the Set Position node. Differential Revision: https://developer.blender.org/D12457
102 lines
2.6 KiB
CMake
102 lines
2.6 KiB
CMake
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
#
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
set(INC
|
|
.
|
|
../blenlib
|
|
../makesdna
|
|
../../../intern/guardedalloc
|
|
)
|
|
|
|
set(INC_SYS
|
|
)
|
|
|
|
set(SRC
|
|
intern/cpp_types.cc
|
|
intern/field.cc
|
|
intern/generic_vector_array.cc
|
|
intern/generic_virtual_array.cc
|
|
intern/generic_virtual_vector_array.cc
|
|
intern/multi_function.cc
|
|
intern/multi_function_builder.cc
|
|
intern/multi_function_parallel.cc
|
|
intern/multi_function_procedure.cc
|
|
intern/multi_function_procedure_builder.cc
|
|
intern/multi_function_procedure_executor.cc
|
|
|
|
FN_cpp_type.hh
|
|
FN_cpp_type_make.hh
|
|
FN_field.hh
|
|
FN_field_cpp_type.hh
|
|
FN_generic_pointer.hh
|
|
FN_generic_span.hh
|
|
FN_generic_value_map.hh
|
|
FN_generic_vector_array.hh
|
|
FN_generic_virtual_array.hh
|
|
FN_generic_virtual_vector_array.hh
|
|
FN_multi_function.hh
|
|
FN_multi_function_builder.hh
|
|
FN_multi_function_context.hh
|
|
FN_multi_function_data_type.hh
|
|
FN_multi_function_param_type.hh
|
|
FN_multi_function_params.hh
|
|
FN_multi_function_parallel.hh
|
|
FN_multi_function_procedure.hh
|
|
FN_multi_function_procedure_builder.hh
|
|
FN_multi_function_procedure_executor.hh
|
|
FN_multi_function_signature.hh
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenlib
|
|
)
|
|
|
|
if(WITH_TBB)
|
|
add_definitions(-DWITH_TBB)
|
|
if(WIN32)
|
|
# TBB includes Windows.h which will define min/max macros
|
|
# that will collide with the stl versions.
|
|
add_definitions(-DNOMINMAX)
|
|
endif()
|
|
list(APPEND INC_SYS
|
|
${TBB_INCLUDE_DIRS}
|
|
)
|
|
|
|
list(APPEND LIB
|
|
${TBB_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
|
|
|
if(WITH_GTESTS)
|
|
set(TEST_SRC
|
|
tests/FN_cpp_type_test.cc
|
|
tests/FN_field_test.cc
|
|
tests/FN_generic_span_test.cc
|
|
tests/FN_generic_vector_array_test.cc
|
|
tests/FN_multi_function_procedure_test.cc
|
|
tests/FN_multi_function_test.cc
|
|
)
|
|
set(TEST_LIB
|
|
bf_functions
|
|
)
|
|
include(GTestTesting)
|
|
blender_add_test_lib(bf_functions_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
|
|
endif()
|