Skip to content
Snippets Groups Projects
Commit c65c8d79 authored by Sebastian Achilles's avatar Sebastian Achilles
Browse files

Merge branch '2022' into '2022' 

fix toolchain for ParaViewData and VTKData

See merge request hps-public/easybuild-repository!1277
parents 6e847909 edb96139
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b-EGL.eb
+ 20
− 13
View file @ c65c8d79
...@@ -11,7 +11,8 @@ toolchain = {'name': 'gpsmkl', 'version': '2021b'} ...@@ -11,7 +11,8 @@ toolchain = {'name': 'gpsmkl', 'version': '2021b'}
toolchainopts = {'pic': True, 'usempi': True} toolchainopts = {'pic': True, 'usempi': True}
local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile=' local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
source_urls = [('http://www.paraview.org/paraview-downloads/%s' % local_dwnlsfx_src)] source_urls = [('http://www.paraview.org/paraview-downloads/%s' %
local_dwnlsfx_src)]
sources = [("ParaView-v%(version)s.tar.gz")] sources = [("ParaView-v%(version)s.tar.gz")]
checksums = ['59ca46a929a52d8abec107b72e19447cba3d8e64871b6fbc8e99b0f3b167db46'] checksums = ['59ca46a929a52d8abec107b72e19447cba3d8e64871b6fbc8e99b0f3b167db46']
...@@ -48,8 +49,8 @@ dependencies = [ ...@@ -48,8 +49,8 @@ dependencies = [
('Qt5', '5.15.2'), ('Qt5', '5.15.2'),
('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')), ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
('OpenGL', '2021b'), ('OpenGL', '2021b'),
('ParaViewData', '5.10.0', '', SYSTEM), ('ParaViewData', '5.10.0'),
('VTKData', '9.1.0', '', SYSTEM), ('VTKData', '9.1.0'),
] ]
separate_build_dir = True separate_build_dir = True
...@@ -95,7 +96,8 @@ configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python " ...@@ -95,7 +96,8 @@ configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
configopts += '-DVTK_PYTHON_VERSION=3 ' configopts += '-DVTK_PYTHON_VERSION=3 '
configopts += '-DVTK_NO_PYTHON_THREADS=OFF ' configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF ' # visibility depends on VTK_NO_PYTHON_THREADS=OFF # visibility depends on VTK_NO_PYTHON_THREADS=OFF
configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF '
# If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL, # If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL,
# ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk. # ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk.
...@@ -171,7 +173,8 @@ configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 " ...@@ -171,7 +173,8 @@ configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 "
# EGL (off-screen rendering with OpenGL, but without the need for X) # EGL (off-screen rendering with OpenGL, but without the need for X)
# call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test # call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test
configopts += '-DVTK_OPENGL_HAS_EGL=ON ' configopts += '-DVTK_OPENGL_HAS_EGL=ON '
configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF ' # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '
configopts += '-DVTK_USE_X=OFF ' configopts += '-DVTK_USE_X=OFF '
configopts += '-DVTK_DEFAULT_EGL_DEVICE_INDEX=0 ' configopts += '-DVTK_DEFAULT_EGL_DEVICE_INDEX=0 '
# configopts += '-DEGL_INCLUDE_DIR=${EBROOTOPENGL}/include/EGL/ ' # https://www.khronos.org/registry/EGL/ # configopts += '-DEGL_INCLUDE_DIR=${EBROOTOPENGL}/include/EGL/ ' # https://www.khronos.org/registry/EGL/
...@@ -233,7 +236,8 @@ configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT ' ...@@ -233,7 +236,8 @@ configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT '
# https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md # https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
# configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 ' # download inactivity, 0 = no timeout # configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 ' # download inactivity, 0 = no timeout
# configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 ' # download abs. time, 0 = no timeout # configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 ' # download abs. time, 0 = no timeout
configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON ' # Exclude test data download from default 'all' target. # Exclude test data download from default 'all' target.
configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON '
# Local directory holding ExternalData objects in the layout %(algo)/%(hash). # Local directory holding ExternalData objects in the layout %(algo)/%(hash).
configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData ' configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData '
configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData ' configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData '
...@@ -260,7 +264,8 @@ configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON ' ...@@ -260,7 +264,8 @@ configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON ' configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
# --- ParaView Extra-Reader --- # # --- ParaView Extra-Reader --- #
configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF ' # nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h # nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h
configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF '
configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON ' configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON '
# configopts += '-DPARAVIEW_ENABLE_FIDES=ON ' # req. ADIOS2 as dependency # configopts += '-DPARAVIEW_ENABLE_FIDES=ON ' # req. ADIOS2 as dependency
# configopts += '-DPARAVIEW_ENABLE_GDAL=ON ' # req. GDAL as dependency # configopts += '-DPARAVIEW_ENABLE_GDAL=ON ' # req. GDAL as dependency
...@@ -277,7 +282,8 @@ configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES ' ...@@ -277,7 +282,8 @@ configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503
# configopts += '-DVISIT_BUILD_READER_Nek5000=ON ' # MR still open # configopts += '-DVISIT_BUILD_READER_Nek5000=ON ' # MR still open
postinstallcmds = ['python -m compileall %(installdir)s/lib64/python3.6/site-packages/'] postinstallcmds = [
'python -m compileall %(installdir)s/lib64/python3.6/site-packages/']
# 'cp -a %(builddir)s/ParaView-v%(version)s/ %(installdir)s/src', # copy source from build dir to install dir # 'cp -a %(builddir)s/ParaView-v%(version)s/ %(installdir)s/src', # copy source from build dir to install dir
# '', # move debug info to separate files: # '', # move debug info to separate files:
# http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target # http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target
...@@ -299,7 +305,8 @@ modextravars = { ...@@ -299,7 +305,8 @@ modextravars = {
# https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47 # https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47
# https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html # https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html
# more ospray definitions: https://www.ospray.org/documentation.html#environment-variables # more ospray definitions: https://www.ospray.org/documentation.html#environment-variables
'KNOB_MAX_WORKER_THREADS': '65535', # max. threads used by OpenSWR (limited by number of hardware threads) # max. threads used by OpenSWR (limited by number of hardware threads)
'KNOB_MAX_WORKER_THREADS': '65535',
# details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14 # details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14
# more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst # more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst
} }
......
Golden_Repo/p/ParaView/ParaView-5.10.1-gpsmkl-2021b.eb
+ 24
− 15
View file @ c65c8d79
...@@ -10,7 +10,8 @@ toolchain = {'name': 'gpsmkl', 'version': '2021b'} ...@@ -10,7 +10,8 @@ toolchain = {'name': 'gpsmkl', 'version': '2021b'}
toolchainopts = {'pic': True, 'usempi': True} toolchainopts = {'pic': True, 'usempi': True}
local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile=' local_dwnlsfx_src = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=Sources&downloadFile='
source_urls = [('http://www.paraview.org/paraview-downloads/%s' % local_dwnlsfx_src)] source_urls = [('http://www.paraview.org/paraview-downloads/%s' %
local_dwnlsfx_src)]
sources = [("ParaView-v%(version)s.tar.gz")] sources = [("ParaView-v%(version)s.tar.gz")]
checksums = ['59ca46a929a52d8abec107b72e19447cba3d8e64871b6fbc8e99b0f3b167db46'] checksums = ['59ca46a929a52d8abec107b72e19447cba3d8e64871b6fbc8e99b0f3b167db46']
...@@ -47,8 +48,8 @@ dependencies = [ ...@@ -47,8 +48,8 @@ dependencies = [
('Qt5', '5.15.2'), ('Qt5', '5.15.2'),
('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')), ('SciPy-Stack', '2021b', '', ('gcccoremkl', '11.2.0-2021.4.0')),
('OpenGL', '2021b'), ('OpenGL', '2021b'),
('ParaViewData', '5.10.0', '', SYSTEM), ('ParaViewData', '5.10.0'),
('VTKData', '9.1.0', '', SYSTEM), ('VTKData', '9.1.0'),
] ]
separate_build_dir = True separate_build_dir = True
...@@ -90,7 +91,8 @@ configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python " ...@@ -90,7 +91,8 @@ configopts += "-DPython3_EXECUTABLE=$EBROOTPYTHON/bin/python "
configopts += '-DVTK_PYTHON_VERSION=3 ' configopts += '-DVTK_PYTHON_VERSION=3 '
configopts += '-DVTK_NO_PYTHON_THREADS=OFF ' configopts += '-DVTK_NO_PYTHON_THREADS=OFF '
configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF ' # visibility depends on VTK_NO_PYTHON_THREADS=OFF # visibility depends on VTK_NO_PYTHON_THREADS=OFF
configopts += '-DVTK_PYTHON_FULL_THREADSAFE=OFF '
# If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL, # If you pass VTK_PYTHON_FULL_THREADSAFE to true, then each and every call to python will be protected with GIL,
# ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk. # ensuring that you can have eg. other python interpreter in your application and still use python wrapping in vtk.
...@@ -161,7 +163,8 @@ configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 " ...@@ -161,7 +163,8 @@ configopts += "-DOPENGL_egl_LIBRARY=${EBROOTOPENGL}/lib/libEGL.so.1 "
configopts += '-DVTK_USE_X=ON ' # OFF:headless rendering configopts += '-DVTK_USE_X=ON ' # OFF:headless rendering
# already considered by Qt (https://gitlab.kitware.com/lorensen/vtk/commit/b29f6db3f746d84f830c81e4212e48db192e4dbb) # already considered by Qt (https://gitlab.kitware.com/lorensen/vtk/commit/b29f6db3f746d84f830c81e4212e48db192e4dbb)
configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=OFF ' configopts += '-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=OFF '
configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF ' # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D # http://www.paraview.org/Wiki/ParaView_And_Mesa_3D
configopts += '-DVTK_OPENGL_HAS_OSMESA=OFF '
# EGL (off-screen rendering with OpenGL, but without the need for X) # EGL (off-screen rendering with OpenGL, but without the need for X)
# call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test # call pvserver with –egl-device-index=0 or 1 and –disable-xdisplay-test
...@@ -227,9 +230,12 @@ configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT ' ...@@ -227,9 +230,12 @@ configopts += '-DPARAVIEW_BUILD_VTK_TESTING=WANT '
# https://cmake.org/cmake/help/latest/module/ExternalData.html # https://cmake.org/cmake/help/latest/module/ExternalData.html
# https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md # https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
configopts += '-DCTEST_TEST_TIMEOUT=10800 ' configopts += '-DCTEST_TEST_TIMEOUT=10800 '
configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 ' # download inactivity, 0 = no timeout # download inactivity, 0 = no timeout
configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 ' # download abs. time, 0 = no timeout configopts += '-DExternalData_TIMEOUT_INACTIVITY=10 '
configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON ' # Exclude test data download from default 'all' target. # download abs. time, 0 = no timeout
configopts += '-DExternalData_TIMEOUT_ABSOLUTE=60 '
# Exclude test data download from default 'all' target.
configopts += '-DPARAVIEW_DATA_EXCLUDE_FROM_ALL=ON '
# Local directory holding ExternalData objects in the layout %(algo)/%(hash). # Local directory holding ExternalData objects in the layout %(algo)/%(hash).
configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData ' configopts += '-DPARAVIEW_DATA_STORE=${EBROOTPARAVIEWDATA}/.ExternalData '
configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData ' configopts += '-DVTK_DATA_STORE=${EBROOTVTKDATA}/.ExternalData '
...@@ -256,7 +262,8 @@ configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON ' ...@@ -256,7 +262,8 @@ configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON '
configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON ' configopts += '-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON '
# --- ParaView Extra-Reader --- # # --- ParaView Extra-Reader --- #
configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF ' # nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h # nlohmann-bug in Plugins/ParFlow/IO/vtkVectorJSON.h
configopts += '-DPARAVIEW_PLUGIN_ENABLE_ParFlow=OFF '
configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON ' configopts += '-DPARAVIEW_ENABLE_MOTIONFX=ON '
# configopts += '-DPARAVIEW_ENABLE_FIDES=ON ' # req. ADIOS2 as dependency # configopts += '-DPARAVIEW_ENABLE_FIDES=ON ' # req. ADIOS2 as dependency
# configopts += '-DPARAVIEW_ENABLE_GDAL=ON ' # req. GDAL as dependency # configopts += '-DPARAVIEW_ENABLE_GDAL=ON ' # req. GDAL as dependency
...@@ -273,7 +280,8 @@ configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES ' ...@@ -273,7 +280,8 @@ configopts += '-DVTK_MODULE_ENABLE_ParaView_IOVisItBridge=YES '
# https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503 # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7503
# configopts += '-DVISIT_BUILD_READER_Nek5000=ON ' # MR still open # configopts += '-DVISIT_BUILD_READER_Nek5000=ON ' # MR still open
postinstallcmds = ['python -m compileall %(installdir)s/lib64/python3.6/site-packages/'] postinstallcmds = [
'python -m compileall %(installdir)s/lib64/python3.6/site-packages/']
# 'cp -a %(builddir)s/ParaView-v%(version)s/ %(installdir)s/src', # copy source from build dir to install dir # 'cp -a %(builddir)s/ParaView-v%(version)s/ %(installdir)s/src', # copy source from build dir to install dir
# '', # move debug info to separate files: # '', # move debug info to separate files:
# http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target # http://stackoverflow.com/questions/866721/how-to-generate-gcc-debug-symbol-outside-the-build-target
...@@ -295,7 +303,8 @@ modextravars = { ...@@ -295,7 +303,8 @@ modextravars = {
# https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47 # https://github.com/ospray/ospcommon/blob/master/ospcommon/tasking/detail/tasking_system_init.cpp#L47
# https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html # https://www.threadingbuildingblocks.org/docs/doxygen/a00150.html
# more ospray definitions: https://www.ospray.org/documentation.html#environment-variables # more ospray definitions: https://www.ospray.org/documentation.html#environment-variables
'KNOB_MAX_WORKER_THREADS': '65535', # max. threads used by OpenSWR (limited by number of hardware threads) # max. threads used by OpenSWR (limited by number of hardware threads)
'KNOB_MAX_WORKER_THREADS': '65535',
# details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14 # details in https://gitlab.version.fz-juelich.de/vis/vis-software/issues/14
# more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst # more knob defs: https://github.com/mesa3d/mesa/blob/master/src/gallium/docs/source/drivers/openswr/knobs.rst
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment