Skip to content
Snippets Groups Projects
Commit f30f0fa4 authored by Dominik Thoennes's avatar Dominik Thoennes
Browse files

Replaced `waLBerla_python_file_generates` with `waLBerla_generate_target_from_python` 

This new function does the actual generation using pystencils and creates a target library that can be used as a dependency as usual. One should not list the python script itself anymore in add_executable.
Convention: Use the AppName as a prefix for the generated lib!

Example Usage:

waLBerla_generate_target_from_python( NAME AppNameGeneratedLib FILE GenerateKernel.py OUT_FILES Kernel.h Kernel.cpp)

waLBerla_add_executable ( NAME AppNameGeneratedLibTest DEPENDS GeneratedLib)
parent 40498f3e
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 169 additions and 217 deletions
apps/benchmarks/CMakeLists.txt
+ 1
− 1
View file @ f30f0fa4
...@@ -14,5 +14,5 @@ add_subdirectory( PoiseuilleChannel ) ...@@ -14,5 +14,5 @@ add_subdirectory( PoiseuilleChannel )
add_subdirectory( ProbeVsExtraMessage ) add_subdirectory( ProbeVsExtraMessage )
add_subdirectory( SchaeferTurek ) add_subdirectory( SchaeferTurek )
add_subdirectory( UniformGrid ) add_subdirectory( UniformGrid )
add_subdirectory( UniformGridGPU )
add_subdirectory( UniformGridGenerated ) add_subdirectory( UniformGridGenerated )
add_subdirectory( UniformGridGPU )
apps/benchmarks/FluidParticleCoupling/CMakeLists.txt
+ 25
− 19
View file @ f30f0fa4
waLBerla_link_files_to_builddir( "*.dat" ) waLBerla_link_files_to_builddir( "*.dat" )
waLBerla_python_file_generates(GeneratedLBM.py waLBerla_generate_target_from_python(NAME FluidParticleCouplingGeneratedLBM FILE GeneratedLBM.py
GeneratedLBM.cpp GeneratedLBM.h OUT_FILES GeneratedLBM.cpp GeneratedLBM.h
) )
waLBerla_python_file_generates(GeneratedLBMWithForce.py waLBerla_generate_target_from_python(NAME FluidParticleCouplingGeneratedLBMWithForce FILE GeneratedLBMWithForce.py
GeneratedLBMWithForce.cpp GeneratedLBMWithForce.h OUT_FILES GeneratedLBMWithForce.cpp GeneratedLBMWithForce.h
) )
if( WALBERLA_BUILD_WITH_CODEGEN ) if( WALBERLA_BUILD_WITH_CODEGEN )
waLBerla_add_executable ( NAME SphereWallCollision FILES SphereWallCollision.cpp GeneratedLBM.py waLBerla_add_executable(NAME SphereWallCollision FILES SphereWallCollision.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling
mesa_pd postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
waLBerla_add_executable ( NAME SettlingSphereInBox FILES SettlingSphereInBox.cpp GeneratedLBM.py waLBerla_add_executable(NAME SettlingSphereInBox FILES SettlingSphereInBox.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling
mesa_pd postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
waLBerla_add_executable ( NAME SphereMovingWithPrescribedVelocity FILES SphereMovingWithPrescribedVelocity.cpp GeneratedLBM.py waLBerla_add_executable(NAME SphereMovingWithPrescribedVelocity FILES SphereMovingWithPrescribedVelocity.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm mesa_pd lbm_mesapd_coupling
postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
waLBerla_add_executable ( NAME LubricationForceEvaluation FILES LubricationForceEvaluation.cpp GeneratedLBM.py waLBerla_add_executable(NAME LubricationForceEvaluation FILES LubricationForceEvaluation.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
waLBerla_add_executable ( NAME DragForceSphere FILES DragForceSphere.cpp GeneratedLBMWithForce.py waLBerla_add_executable(NAME DragForceSphere FILES DragForceSphere.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
postprocessing timeloop vtk FluidParticleCouplingGeneratedLBMWithForce)
waLBerla_add_executable ( NAME ForcesOnSphereNearPlane FILES ForcesOnSphereNearPlane.cpp GeneratedLBM.py waLBerla_add_executable(NAME ForcesOnSphereNearPlane FILES ForcesOnSphereNearPlane.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
waLBerla_add_executable ( NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp GeneratedLBM.py waLBerla_add_executable(NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp
DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd postprocessing timeloop vtk ) DEPENDS blockforest boundary core domain_decomposition field lbm lbm_mesapd_coupling mesa_pd
postprocessing timeloop vtk FluidParticleCouplingGeneratedLBM)
else() else()
......
apps/benchmarks/UniformGridGPU/CMakeLists.txt
+ 42
− 40
View file @ f30f0fa4
...@@ -2,43 +2,45 @@ ...@@ -2,43 +2,45 @@
waLBerla_link_files_to_builddir( "*.prm" ) waLBerla_link_files_to_builddir( "*.prm" )
#waLBerla_link_files_to_builddir( "simulation_setup" ) #waLBerla_link_files_to_builddir( "simulation_setup" )
waLBerla_python_file_generates(UniformGridGPU.py
UniformGridGPU_LatticeModel.cpp UniformGridGPU_LatticeModel.h foreach (config srt trt mrt smagorinsky entropic smagorinsky_noopt entropic_kbc_n4
UniformGridGPU_LbKernel.cu UniformGridGPU_LbKernel.h entropic_kbc_n4_noopt mrt_noopt mrt_full mrt_full_noopt
UniformGridGPU_NoSlip.cu UniformGridGPU_NoSlip.h cumulant cumulant_d3q27
UniformGridGPU_UBB.cu UniformGridGPU_UBB.h srt_d3q27 mrt_d3q27 mrt_d3q27_noopt smagorinsky_d3q27 smagorinsky_d3q27_noopt mrt_full_d3q27 mrt_full_d3q27_noopt)
UniformGridGPU_PackInfo.cu UniformGridGPU_PackInfo.h
UniformGridGPU_MacroSetter.cpp UniformGridGPU_MacroSetter.h waLBerla_generate_target_from_python(NAME UniformGridGPUGenerated_${config}
UniformGridGPU_MacroGetter.cpp UniformGridGPU_MacroGetter.h FILE UniformGridGPU.py
UniformGridGPU_Defines.h CODEGEN_CFG ${config}
) OUT_FILES UniformGridGPU_LatticeModel.cpp UniformGridGPU_LatticeModel.h
UniformGridGPU_NoSlip.cu UniformGridGPU_NoSlip.h
foreach(config srt trt mrt smagorinsky entropic smagorinsky_noopt entropic_kbc_n4 UniformGridGPU_UBB.cu UniformGridGPU_UBB.h
entropic_kbc_n4_noopt mrt_noopt mrt_full mrt_full_noopt UniformGridGPU_PackInfo.cu UniformGridGPU_PackInfo.h
cumulant cumulant_d3q27 UniformGridGPU_MacroSetter.cpp UniformGridGPU_MacroSetter.h
srt_d3q27 mrt_d3q27 mrt_d3q27_noopt smagorinsky_d3q27 smagorinsky_d3q27_noopt mrt_full_d3q27 mrt_full_d3q27_noopt) UniformGridGPU_MacroGetter.cpp UniformGridGPU_MacroGetter.h
waLBerla_add_executable ( NAME UniformGridBenchmarkGPU_${config} UniformGridGPU_Defines.h
FILES UniformGridGPU.cpp UniformGridGPU.py )
DEPENDS blockforest boundary core cuda domain_decomposition field geometry timeloop vtk gui
CODEGEN_CFG ${config})
endforeach() waLBerla_add_executable(NAME UniformGridBenchmarkGPU_${config}
FILES UniformGridGPU.cpp
DEPENDS blockforest boundary core cuda domain_decomposition field geometry timeloop vtk gui UniformGridGPUGenerated_${config})
endforeach ()
waLBerla_python_file_generates(UniformGridGPU_AA.py
UniformGridGPU_AA_LbKernelEven.cu UniformGridGPU_AA_LbKernelEven.h foreach (config srt trt mrt smagorinsky entropic)
UniformGridGPU_AA_LbKernelOdd.cu UniformGridGPU_AA_LbKernelOdd.h
UniformGridGPU_AA_PackInfoPull.cu UniformGridGPU_AA_PackInfoPull.h waLBerla_generate_target_from_python(NAME UniformGridGPUGenerated_AA_${config}
UniformGridGPU_AA_PackInfoPush.cu UniformGridGPU_AA_PackInfoPush.h FILE UniformGridGPU_AA.py
UniformGridGPU_AA_MacroSetter.cpp UniformGridGPU_AA_MacroSetter.h CODEGEN_CFG ${config}
UniformGridGPU_AA_MacroGetter.cpp UniformGridGPU_AA_MacroGetter.h OUT_FILES UniformGridGPU_AA_PackInfoPull.cu UniformGridGPU_AA_PackInfoPull.h
UniformGridGPU_AA_Defines.h UniformGridGPU_AA_PackInfoPush.cu UniformGridGPU_AA_PackInfoPush.h
) UniformGridGPU_AA_MacroSetter.cpp UniformGridGPU_AA_MacroSetter.h
UniformGridGPU_AA_MacroGetter.cpp UniformGridGPU_AA_MacroGetter.h
foreach(config srt trt mrt smagorinsky entropic ) UniformGridGPU_AA_Defines.h
waLBerla_add_executable ( NAME UniformGridBenchmarkGPU_AA_${config} )
FILES UniformGridGPU_AA.cpp UniformGridGPU_AA.py
DEPENDS blockforest boundary core cuda domain_decomposition field geometry timeloop vtk gui
CODEGEN_CFG ${config}) waLBerla_add_executable(NAME UniformGridBenchmarkGPU_AA_${config}
endforeach() FILES UniformGridGPU_AA.cpp
DEPENDS blockforest boundary core cuda domain_decomposition field geometry timeloop vtk gui UniformGridGPUGenerated_AA_${config})
endforeach ()
apps/benchmarks/UniformGridGenerated/CMakeLists.txt
+ 13
− 11
View file @ f30f0fa4
...@@ -2,17 +2,19 @@ waLBerla_link_files_to_builddir( "*.prm" ) ...@@ -2,17 +2,19 @@ waLBerla_link_files_to_builddir( "*.prm" )
waLBerla_link_files_to_builddir( "*.py" ) waLBerla_link_files_to_builddir( "*.py" )
waLBerla_python_file_generates(UniformGridGenerated.py
GenMacroGetter.cpp GenMacroSetter.cpp
GenPackInfo.cpp GenPackInfoAAPush.cpp GenPackInfoAAPull.cpp
GenLbKernel.cpp GenLbKernelAAEven.cpp GenLbKernelAAOdd.cpp
GenMpiDtypeInfo.h GenMpiDtypeInfoAAPull.h GenMpiDtypeInfoAAPush.h
GenDefines.h)
foreach(config trt smagorinsky mrt3 mrt entropic_kbc_n4 cumulant ) foreach(config trt smagorinsky mrt3 mrt entropic_kbc_n4 cumulant )
waLBerla_generate_target_from_python(NAME UniformGridGenerated_${config}
CODEGEN_CFG ${config}
FILE UniformGridGenerated.py
OUT_FILES GenMacroGetter.cpp GenMacroGetter.h GenMacroSetter.cpp GenMacroSetter.h
GenPackInfo.cpp GenPackInfo.h GenPackInfoAAPush.cpp GenPackInfoAAPush.h GenPackInfoAAPull.cpp GenPackInfoAAPull.h
GenLbKernel.cpp GenLbKernel.h GenLbKernelAAEven.cpp GenLbKernelAAEven.h GenLbKernelAAOdd.cpp GenLbKernelAAOdd.h
GenMpiDtypeInfo.h GenMpiDtypeInfoAAPull.h GenMpiDtypeInfoAAPush.h
GenDefines.h)
waLBerla_add_executable ( NAME UniformGridBenchmarkGenerated_${config} waLBerla_add_executable ( NAME UniformGridBenchmarkGenerated_${config}
FILES UniformGridGenerated.cpp UniformGridGenerated.py FILES UniformGridGenerated.cpp
DEPENDS blockforest boundary core domain_decomposition field geometry timeloop vtk gui DEPENDS blockforest boundary core domain_decomposition field geometry timeloop vtk gui
CODEGEN_CFG ${config}) UniformGridGenerated_${config})
endforeach() endforeach()
cmake/waLBerlaFunctions.cmake
+ 6
− 70
View file @ f30f0fa4
...@@ -89,23 +89,13 @@ function ( waLBerla_add_module ) ...@@ -89,23 +89,13 @@ function ( waLBerla_add_module )
endforeach( ) endforeach( )
if ( hasSourceFiles ) if ( hasSourceFiles )
set( generatedSourceFiles )
set( generatorSourceFiles )
handle_python_codegen(sourceFiles generatedSourceFiles generatorSourceFiles codeGenRequired "default_codegen" ${sourceFiles})
if( NOT WALBERLA_BUILD_WITH_CODEGEN AND codeGenRequired)
message(STATUS "Skipping ${ARG_NAME} since pystencils code generation is not enabled")
return()
endif()
if ( CUDA_FOUND ) if ( CUDA_FOUND )
cuda_add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} ${otherFiles} ) cuda_add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${otherFiles} )
else() else()
add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} ${otherFiles} ) add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${otherFiles} )
endif( CUDA_FOUND ) endif( CUDA_FOUND )
set_source_files_properties( ${generatedSourceFiles} PROPERTIES GENERATED TRUE )
else( ) else( )
add_custom_target( ${moduleLibraryName} SOURCES ${sourceFiles} ${generatedSourceFiles} ${otherFiles} ) # dummy IDE target add_custom_target( ${moduleLibraryName} SOURCES ${sourceFiles} ${otherFiles} ) # dummy IDE target
endif( ) endif( )
waLBerla_register_dependency ( ${moduleName} ${ARG_DEPENDS} ) waLBerla_register_dependency ( ${moduleName} ${ARG_DEPENDS} )
...@@ -125,10 +115,6 @@ function ( waLBerla_add_module ) ...@@ -125,10 +115,6 @@ function ( waLBerla_add_module )
ARCHIVE DESTINATION lib ) ARCHIVE DESTINATION lib )
endif( ) endif( )
if( codeGenRequired)
target_include_directories(${ARG_NAME} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/default_codegen")
endif()
# Install rule for header # Install rule for header
install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
DESTINATION "walberla/${moduleName}" DESTINATION "walberla/${moduleName}"
...@@ -169,7 +155,6 @@ endfunction ( waLBerla_add_module ) ...@@ -169,7 +155,6 @@ endfunction ( waLBerla_add_module )
# FILES [optional] list of all source and header files belonging to that application # FILES [optional] list of all source and header files belonging to that application
# if this is not given, all source and header files in the directory are added. # if this is not given, all source and header files in the directory are added.
# Careful: when file was added or deleted, cmake has to be run again # Careful: when file was added or deleted, cmake has to be run again
# CODGEN_CFG [optional] string passed to code generation scripts
# #
# Example: # Example:
# waLBerla_compile_app ( NAME myApp DEPENDS core field lbm/boundary ) # waLBerla_compile_app ( NAME myApp DEPENDS core field lbm/boundary )
...@@ -177,7 +162,7 @@ endfunction ( waLBerla_add_module ) ...@@ -177,7 +162,7 @@ endfunction ( waLBerla_add_module )
function ( waLBerla_add_executable ) function ( waLBerla_add_executable )
set( options ) set( options )
set( oneValueArgs NAME GROUP CODEGEN_CFG) set( oneValueArgs NAME GROUP)
set( multiValueArgs FILES DEPENDS) set( multiValueArgs FILES DEPENDS)
cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
...@@ -185,10 +170,6 @@ function ( waLBerla_add_executable ) ...@@ -185,10 +170,6 @@ function ( waLBerla_add_executable )
message ( FATAL_ERROR "waLBerla_add_executable called without a NAME" ) message ( FATAL_ERROR "waLBerla_add_executable called without a NAME" )
endif() endif()
if( NOT ARG_CODEGEN_CFG)
set(ARG_CODEGEN_CFG "default_codegen")
endif()
# Skip this app, if it depends on modules that have not been built ( because they for example depend on PE) # Skip this app, if it depends on modules that have not been built ( because they for example depend on PE)
foreach ( depMod ${ARG_DEPENDS} ) foreach ( depMod ${ARG_DEPENDS} )
get_module_library_name ( depModLibraryName ${depMod} ) get_module_library_name ( depModLibraryName ${depMod} )
...@@ -220,26 +201,12 @@ function ( waLBerla_add_executable ) ...@@ -220,26 +201,12 @@ function ( waLBerla_add_executable )
endif ( ) endif ( )
endif() endif()
set( generatedSourceFiles )
set( generatorSourceFiles )
handle_python_codegen(sourceFiles generatedSourceFiles generatorSourceFiles
codeGenRequired ${ARG_CODEGEN_CFG} ${sourceFiles} )
if( NOT WALBERLA_BUILD_WITH_CODEGEN AND codeGenRequired)
if( WALBERLA_LOG_SKIPPED )
message(STATUS "Skipping ${ARG_NAME} since pystencils code generation is not enabled")
endif()
return()
endif()
if ( WALBERLA_BUILD_WITH_CUDA ) if ( WALBERLA_BUILD_WITH_CUDA )
cuda_add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} ) cuda_add_executable( ${ARG_NAME} ${sourceFiles} )
else() else()
add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} ) add_executable( ${ARG_NAME} ${sourceFiles} )
endif() endif()
set_source_files_properties( ${generatedSourceFiles} PROPERTIES GENERATED TRUE )
target_link_modules ( ${ARG_NAME} ${ARG_DEPENDS} ) target_link_modules ( ${ARG_NAME} ${ARG_DEPENDS} )
target_link_libraries( ${ARG_NAME} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${SERVICE_LIBS} ) target_link_libraries( ${ARG_NAME} ${WALBERLA_LINK_LIBRARIES_KEYWORD} ${SERVICE_LIBS} )
set_property( TARGET ${ARG_NAME} PROPERTY CXX_STANDARD 14 ) set_property( TARGET ${ARG_NAME} PROPERTY CXX_STANDARD 14 )
...@@ -251,41 +218,10 @@ function ( waLBerla_add_executable ) ...@@ -251,41 +218,10 @@ function ( waLBerla_add_executable )
set_property( TARGET ${ARG_NAME} PROPERTY FOLDER ${ARG_GROUP} ) set_property( TARGET ${ARG_NAME} PROPERTY FOLDER ${ARG_GROUP} )
endif() endif()
if( codeGenRequired )
target_include_directories(${ARG_NAME} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/${ARG_CODEGEN_CFG}")
endif()
endfunction ( waLBerla_add_executable ) endfunction ( waLBerla_add_executable )
####################################################################################################################### #######################################################################################################################
#######################################################################################################################
#
# Function to tell CMake which C/C++/CUDA files are generated by a python file
#
# Example:
# waLBerla_python_file_generates(MyPythonCodeGenScript.py Sweep1.cpp Sweep2.cu)
#
#
#######################################################################################################################
function( waLBerla_python_file_generates pythonFile )
set(generatedFiles "")
foreach(element ${ARGN})
string(REGEX REPLACE "\\.[^.]*$" "" elementWithoutExtension ${element})
list(APPEND generatedFiles ${element})
list(APPEND generatedFiles "${elementWithoutExtension}.h")
endforeach()
list(REMOVE_DUPLICATES generatedFiles)
get_filename_component(pythonFileAbsolutePath ${pythonFile} ABSOLUTE)
set( "WALBERLA_CODEGEN_INFO_${pythonFileAbsolutePath}" ${generatedFiles}
CACHE INTERNAL "Files generated by python script ${pythonFile}" FORCE)
endfunction(waLBerla_python_file_generates)
####################################################################################################################### #######################################################################################################################
# #
# Adds a waLBerla module test executable. # Adds a waLBerla module test executable.
......
cmake/waLBerlaHelperFunctions.cmake
+ 58
− 56
View file @ f30f0fa4
...@@ -15,75 +15,77 @@ function ( add_flag _VAR _FLAG ) ...@@ -15,75 +15,77 @@ function ( add_flag _VAR _FLAG )
endfunction ( add_flag ) endfunction ( add_flag )
####################################################################################################################### #######################################################################################################################
####################################################################################################################### #######################################################################################################################
# #
# Function to handle python code generation files # Function to handle python code generation files
# #
# Example Usage:
# waLBerla_generate_target_from_python(NAME GeneratedLib
# FILE pythonScript.py
# CODEGEN_CFG condgen_dir
# OUT_FILES Kernel.h Kernel.cpp
# )
# parameters: # parameters:
# sourceFilesOut: variable where source files without python files are written to # NAME: name of the target library that will be created
# generatedSourceFilesOut: variable where generated source files (with custom command) are written to # FILE: the script which generates the C/C++ code
# generatorsOut: only the python files that have been passed # OUT_FILES: list of all files that are generated by the script
# codeGenRequired: true if at least one python file was part of the sources # CODEGEN_CFG (optional) config string which is passed to the generator script
# also specifies the directory where generated source files are written to. Default ist 'default_codegen'
# #
# The list of generated files is determined via the pystencils_walberla package mechanism. # The list of generated files is determined via the pystencils_walberla package mechanism.
# The python script, when called with -l, should return a semicolon-separated list of generated files # The python script, when called with -l, should return a semicolon-separated list of generated files
# if this list changes, CMake has to be run manually again. # if this list changes, CMake has to be run manually again.
####################################################################################################################### #######################################################################################################################
function( handle_python_codegen sourceFilesOut generatedSourceFilesOut generatorsOut codeGenRequiredOut codegenCfg) function( waLBerla_generate_target_from_python )
set(result ) set( options )
set(generatedResult ) set( oneValueArgs NAME FILE CODEGEN_CFG)
set(generatorsResult ) set( multiValueArgs OUT_FILES)
set(codeGenRequired NO) cmake_parse_arguments( PYGEN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
foreach( sourceFile ${ARGN} ) if( NOT WALBERLA_BUILD_WITH_CODEGEN )
if( ${sourceFile} MATCHES ".*\\.py$" ) if( WALBERLA_LOG_SKIPPED )
set(codeGenRequired YES) message(STATUS "Skipping ${PYGEN_NAME} since pystencils code generation is not enabled")
if( WALBERLA_BUILD_WITH_CODEGEN)
get_filename_component(pythonFileAbsolutePath ${sourceFile} ABSOLUTE )
set( generatedSourceFiles ${WALBERLA_CODEGEN_INFO_${pythonFileAbsolutePath}} )
set( generatedWithAbsolutePath )
foreach( filename ${generatedSourceFiles} )
list(APPEND generatedWithAbsolutePath ${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg}/${filename})
endforeach()
list(APPEND generatedResult ${generatedWithAbsolutePath} )
list(APPEND generatorsResult ${sourceFile} )
string (REPLACE ";" "\", \"" jsonFileList "${generatedWithAbsolutePath}" )
set(pythonParameters
"\\\{\"EXPECTED_FILES\": [\"${jsonFileList}\"], \"CMAKE_VARS\" : \\\{ "
"\"WALBERLA_OPTIMIZE_FOR_LOCALHOST\": \"${WALBERLA_OPTIMIZE_FOR_LOCALHOST}\","
"\"WALBERLA_DOUBLE_ACCURACY\": \"${WALBERLA_DOUBLE_ACCURACY}\","
"\"CODEGEN_CFG\": \"${codegenCfg}\","
"\"WALBERLA_BUILD_WITH_MPI\": \"${WALBERLA_BUILD_WITH_MPI}\","
"\"WALBERLA_BUILD_WITH_CUDA\": \"${WALBERLA_BUILD_WITH_CUDA}\","
"\"WALBERLA_BUILD_WITH_OPENMP\": \"${WALBERLA_BUILD_WITH_OPENMP}\" \\\} \\\}"
)
string(REPLACE "\"" "\\\"" pythonParameters ${pythonParameters}) # even one more quoting level required
string(REPLACE "\n" "" pythonParameters ${pythonParameters}) # remove newline characters
set( WALBERLA_PYTHON_DIR ${walberla_SOURCE_DIR}/python)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg}")
add_custom_command(OUTPUT ${generatedWithAbsolutePath}
DEPENDS ${sourceFile}
COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${WALBERLA_PYTHON_DIR} ${PYTHON_EXECUTABLE} ${sourceFile} ${pythonParameters}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg}")
endif()
else()
list(APPEND result ${sourceFile})
endif() endif()
endforeach() return()
set( ${sourceFilesOut} ${result} PARENT_SCOPE ) endif()
set( ${generatedSourceFilesOut} ${generatedResult} PARENT_SCOPE )
set( ${generatorsOut} ${generatorsResult} PARENT_SCOPE )
set( ${codeGenRequiredOut} ${codeGenRequired} PARENT_SCOPE )
endfunction ( handle_python_codegen )
#######################################################################################################################
#set(sourcefile ${PYGEN_FILE})
get_filename_component(sourceFile ${PYGEN_FILE} ABSOLUTE )
if (PYGEN_CODEGEN_CFG)
set( codegenCfg ${PYGEN_CODEGEN_CFG})
else()
set( codegenCfg "default_codegen")
endif()
set( generatedSourceFiles ${PYGEN_OUT_FILES} )
set( generatedWithAbsolutePath )
foreach( filename ${generatedSourceFiles} )
list(APPEND generatedWithAbsolutePath ${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg}/${filename})
endforeach()
string (REPLACE ";" "\", \"" jsonFileList "${generatedWithAbsolutePath}" )
set(pythonParameters
"\\\{\"EXPECTED_FILES\": [\"${jsonFileList}\"], \"CMAKE_VARS\" : \\\{ "
"\"WALBERLA_OPTIMIZE_FOR_LOCALHOST\": \"${WALBERLA_OPTIMIZE_FOR_LOCALHOST}\","
"\"WALBERLA_DOUBLE_ACCURACY\": \"${WALBERLA_DOUBLE_ACCURACY}\","
"\"CODEGEN_CFG\": \"${codegenCfg}\","
"\"WALBERLA_BUILD_WITH_MPI\": \"${WALBERLA_BUILD_WITH_MPI}\","
"\"WALBERLA_BUILD_WITH_CUDA\": \"${WALBERLA_BUILD_WITH_CUDA}\","
"\"WALBERLA_BUILD_WITH_OPENMP\": \"${WALBERLA_BUILD_WITH_OPENMP}\" \\\} \\\}"
)
string(REPLACE "\"" "\\\"" pythonParameters ${pythonParameters}) # even one more quoting level required
string(REPLACE "\n" "" pythonParameters ${pythonParameters}) # remove newline characters
set( WALBERLA_PYTHON_DIR ${walberla_SOURCE_DIR}/python)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg}")
add_custom_command(OUTPUT ${generatedWithAbsolutePath}
DEPENDS ${sourceFile}
COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${WALBERLA_PYTHON_DIR} ${PYTHON_EXECUTABLE} ${sourceFile} ${pythonParameters}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg}")
add_library(${PYGEN_NAME} ${generatedWithAbsolutePath})
target_include_directories(${PYGEN_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/${codegenCfg})
endfunction()
#######################################################################################################################
####################################################################################################################### #######################################################################################################################
# #
......
python/pystencils_walberla/cmake_integration.py
+ 1
− 1
View file @ f30f0fa4
...@@ -32,7 +32,7 @@ class CodeGeneration: ...@@ -32,7 +32,7 @@ class CodeGeneration:
written = set(os.path.realpath(f) for f in self.context.files_written) written = set(os.path.realpath(f) for f in self.context.files_written)
only_in_cmake = expected - written only_in_cmake = expected - written
only_generated = written - expected only_generated = written - expected
error_message = "Generated files specified not correctly in cmake with 'waLBerla_python_file_generates'\n" error_message = "Generated files (OUT_FILES) specified not correctly in cmake with 'waLBerla_generate_target_from_python'\n"
if only_in_cmake: if only_in_cmake:
error_message += "Files only specified in CMake {}\n".format( error_message += "Files only specified in CMake {}\n".format(
[os.path.basename(p) for p in only_in_cmake]) [os.path.basename(p) for p in only_in_cmake])
......
tests/cuda/CMakeLists.txt
+ 11
− 7
View file @ f30f0fa4
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
# #
################################################################################################### ###################################################################################################
if( WALBERLA_BUILD_WITH_CUDA )
waLBerla_compile_test( FILES communication/GPUPackInfoTest.cpp DEPENDS blockforest ) waLBerla_compile_test( FILES communication/GPUPackInfoTest.cpp DEPENDS blockforest )
waLBerla_execute_test( NAME GPUPackInfoTest ) waLBerla_execute_test( NAME GPUPackInfoTest )
...@@ -20,12 +22,11 @@ waLBerla_compile_test( FILES FieldIndexing3DTest.cpp FieldIndexing3DTest.cu ) ...@@ -20,12 +22,11 @@ waLBerla_compile_test( FILES FieldIndexing3DTest.cpp FieldIndexing3DTest.cu )
waLBerla_execute_test( NAME FieldIndexing3DTest ) waLBerla_execute_test( NAME FieldIndexing3DTest )
waLBerla_python_file_generates(codegen/CudaJacobiKernel.py waLBerla_generate_target_from_python(NAME CodegenJacobiGPUGeneratedCudaJacobiKernel FILE codegen/CudaJacobiKernel.py
CudaJacobiKernel2D.cu CudaJacobiKernel2D.h OUT_FILES CudaJacobiKernel2D.cu CudaJacobiKernel2D.h
CudaJacobiKernel3D.cu CudaJacobiKernel3D.h) CudaJacobiKernel3D.cu CudaJacobiKernel3D.h)
waLBerla_compile_test( FILES codegen/CodegenJacobiGPU.cpp waLBerla_compile_test( FILES codegen/CodegenJacobiGPU.cpp
codegen/CudaJacobiKernel.py DEPENDS blockforest timeloop gui CodegenJacobiGPUGeneratedCudaJacobiKernel )
DEPENDS blockforest timeloop gui )
waLBerla_execute_test( NAME CodegenJacobiGPU ) waLBerla_execute_test( NAME CodegenJacobiGPU )
...@@ -38,5 +39,8 @@ waLBerla_compile_test( FILES CudaMPI DEPENDS blockforest timeloop gui ) ...@@ -38,5 +39,8 @@ waLBerla_compile_test( FILES CudaMPI DEPENDS blockforest timeloop gui )
waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS blockforest timeloop ) waLBerla_compile_test( FILES AlignmentTest.cpp DEPENDS blockforest timeloop )
waLBerla_python_file_generates(codegen/MicroBenchmarkGpuLbm.py MicroBenchmarkStreamKernel.cu MicroBenchmarkCopyKernel.cu) waLBerla_generate_target_from_python(NAME MicroBenchmarkGpuLbmGenerated FILE codegen/MicroBenchmarkGpuLbm.py
waLBerla_compile_test( FILES codegen/MicroBenchmarkGpuLbm.cpp codegen/MicroBenchmarkGpuLbm.py) OUT_FILES MicroBenchmarkStreamKernel.cu MicroBenchmarkCopyKernel.cu)
waLBerla_compile_test( FILES codegen/MicroBenchmarkGpuLbm.cpp DEPENDS MicroBenchmarkGpuLbmGenerated)
endif()
\ No newline at end of file
tests/field/CMakeLists.txt
+ 3
− 2
View file @ f30f0fa4
...@@ -63,8 +63,9 @@ endif( WALBERLA_BUILD_WITH_MPI ) ...@@ -63,8 +63,9 @@ endif( WALBERLA_BUILD_WITH_MPI )
# CodeGen Tests # CodeGen Tests
waLBerla_python_file_generates(codegen/JacobiKernel.py JacobiKernel2D.cpp JacobiKernel3D.cpp ) waLBerla_generate_target_from_python(NAME CodegenJacobiCPUGeneratedJacobiKernel FILE codegen/JacobiKernel.py
waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp codegen/JacobiKernel.py DEPENDS gui timeloop ) OUT_FILES JacobiKernel2D.cpp JacobiKernel2D.h JacobiKernel3D.cpp JacobiKernel3D.h )
waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS gui timeloop CodegenJacobiCPUGeneratedJacobiKernel)
waLBerla_execute_test( NAME CodegenJacobiCPU ) waLBerla_execute_test( NAME CodegenJacobiCPU )
tests/lbm/CMakeLists.txt
+ 9
− 10
View file @ f30f0fa4
...@@ -71,13 +71,12 @@ waLBerla_compile_test( FILES SuViscoelasticityTest.cpp DEPENDS field blockforest ...@@ -71,13 +71,12 @@ waLBerla_compile_test( FILES SuViscoelasticityTest.cpp DEPENDS field blockforest
waLBerla_execute_test( NAME SuViscoelasticityTest COMMAND $<TARGET_FILE:SuViscoelasticityTest> ${CMAKE_CURRENT_SOURCE_DIR}/Su.prm ) waLBerla_execute_test( NAME SuViscoelasticityTest COMMAND $<TARGET_FILE:SuViscoelasticityTest> ${CMAKE_CURRENT_SOURCE_DIR}/Su.prm )
# Code Generation # Code Generation
waLBerla_python_file_generates(codegen/LbCodeGenerationExample.py waLBerla_generate_target_from_python(NAME LbCodeGenerationExampleGenerated
LbCodeGenerationExample_LatticeModel.cpp FILE codegen/LbCodeGenerationExample.py
LbCodeGenerationExample_NoSlip.cpp OUT_FILES LbCodeGenerationExample_LatticeModel.cpp LbCodeGenerationExample_LatticeModel.h
LbCodeGenerationExample_UBB.cpp ) LbCodeGenerationExample_NoSlip.cpp LbCodeGenerationExample_NoSlip.h
waLBerla_compile_test( FILES codegen/LbCodeGenerationExample.py LbCodeGenerationExample_UBB.cpp LbCodeGenerationExample_UBB.h )
codegen/LbCodeGenerationExample.cpp) waLBerla_compile_test( FILES codegen/LbCodeGenerationExample.cpp DEPENDS LbCodeGenerationExampleGenerated)
waLBerla_python_file_generates(codegen/FluctuatingMRT.py waLBerla_generate_target_from_python(NAME FluctuatingMRTGenerated FILE codegen/FluctuatingMRT.py
FluctuatingMRT_LatticeModel.cpp ) OUT_FILES FluctuatingMRT_LatticeModel.cpp FluctuatingMRT_LatticeModel.h )
waLBerla_compile_test( FILES codegen/FluctuatingMRT.py waLBerla_compile_test( FILES codegen/FluctuatingMRT.cpp DEPENDS FluctuatingMRTGenerated)
codegen/FluctuatingMRT.cpp) \ No newline at end of file
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment