From 987af00509c6844d37b8e122a908965d1f705c56 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 1 Mar 2022 17:50:36 +0100 Subject: [PATCH] spns #26828: convergence EDF: rename openturns to OT since conflicts with OPENTURNS_SALOME.... --- applications/SALOME-master-native.pyconf | 11 +++++--- applications/SALOME-master.pyconf | 1 + products/OPENTURNS_SALOME.pyconf | 33 ++++++++++++++++++++++ products/compil_scripts/PERSALYS-v11.0.sh | 19 +++++-------- products/compil_scripts/ParaView-5.10.0.sh | 10 +++---- products/compil_scripts/ParaView-5.9.0.sh | 10 +++---- products/compil_scripts/gdal-2.4.0.sh | 5 ++-- products/env_scripts/openturns.py | 6 ++-- products/openturns.pyconf | 4 +-- products/salome_system.pyconf | 21 +++++++------- 10 files changed, 77 insertions(+), 43 deletions(-) create mode 100644 products/OPENTURNS_SALOME.pyconf diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 5d824eb..d2d7a75 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -54,7 +54,7 @@ APPLICATION : freeimage : 'native' freetype : 'native' gl2ps : 'native' - gdal : '2.4.0' + gdal : 'native' # 'native' too difficult here : need python-pip package (gmsh-sdk) besides system packages gmsh : '4.8.4' graphviz : 'native' @@ -76,7 +76,7 @@ APPLICATION : metis : 'native' mpi4py: 'native' netgen : '6.2.2101' - netcdf : '4.6.2' + netcdf : 'native' nlopt : '2.4.2' nose: 'native' numpy : 'native' @@ -155,6 +155,7 @@ APPLICATION : 'HOMARD' 'FIELDS' 'PARAVIS': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'OPENTURNS_SALOME': '9.8.0' 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -204,9 +205,11 @@ __overwrite__ : { # __condition__ : "VARS.dist in ['UB20.04']" - 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.opencv' : '3.2.0' 'APPLICATION.products.cminpack': 'native' - 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } + 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.products.gdal' : '2.4.0' } { # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 4ed09fa..92db8fa 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -152,6 +152,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' + 'OPENTURNS_SALOME' : '9.8.0' 'PARAVIS' 'JOBMANAGER' 'YACS' diff --git a/products/OPENTURNS_SALOME.pyconf b/products/OPENTURNS_SALOME.pyconf new file mode 100644 index 0000000..e303c50 --- /dev/null +++ b/products/OPENTURNS_SALOME.pyconf @@ -0,0 +1,33 @@ +default : +{ + name : "OPENTURNS" + build_source : "cmake" + cmake_options: " -DOTGUI_ROOT_DIR=$PERSALYS_ROOT_DIR" + compil_script : $name + "-" + $APPLICATION.products.OPENTURNS_SALOME + $VARS.scriptExtension + get_source : "archive" + archive_info : + { + archive_name : "OPENTURNS-" + $APPLICATION.products.OPENTURNS_SALOME + ".tar.gz" + } + environ : + { + SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "openturns" + } + depend : [ + 'KERNEL', + 'GUI', + 'PERSALYS', + 'gdal', + 'YACS' + ] + build_depend : ["cmake", "swig", "doxygen"] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + properties: + { + has_salome_gui : "yes" + is_SALOME_module : "yes" + incremental : "yes" + has_unit_tests : "yes" + } +} diff --git a/products/compil_scripts/PERSALYS-v11.0.sh b/products/compil_scripts/PERSALYS-v11.0.sh index 4789dc0..85eca3f 100755 --- a/products/compil_scripts/PERSALYS-v11.0.sh +++ b/products/compil_scripts/PERSALYS-v11.0.sh @@ -15,16 +15,13 @@ CMAKE_OPTIONS="" CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=$PRODUCT_INSTALL" CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib" CMAKE_OPTIONS+=" -DADAO_ROOT_DIR=$ADAO_ROOT_DIR" -CMAKE_OPTIONS+=" -DADAO_INTERFACE_ROOT_DIR=$ADAO_INTERFACE_ROOT_DIR" CMAKE_OPTIONS+=" -DBOOST_ROOT:PATH=$BOOST_ROOT_DIR" CMAKE_OPTIONS+=" -DGUI_ROOT_DIR=$GUI_ROOT_DIR" CMAKR_OPTIONS+=" -DSalomeGUI_DIR=$GUI_ROOT_DIR/salome_adm/cmake_files" CMAKE_OPTIONS+=" -DKERNEL_ROOT_DIR=$KERNEL_ROOT_DIR" CMAKR_OPTIONS+=" -DSalomeKERNEL_DIR=$KERNEL_ROOT_DIR/salome_adm/cmake_files" -CMAKE_OPTIONS+=" -DOpenTURNS_DIR=$OPENTURNS_ROOT_DIR" -CMAKE_OPTIONS+=" -DPY2CPP_ROOT_DIR=$PY2CPP_ROOT_DIR" +CMAKE_OPTIONS+=" -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" CMAKE_OPTIONS+=" -DPy2cpp_DIR=$PY2CPP_ROOT_DIR//lib/cmake/py2cpp" -CMAKE_OPTIONS+=" -DPYTHON_ROOT_DIR=$PYTHON_ROOT_DIR" if [ "$QWT_ROOT_DIR" != "/usr" ]; then CMAKE_OPTIONS+=" -DQWT_LIBRARY=$QWT_ROOT_DIR/lib/libqwt.so" CMAKE_OPTIONS+=" -DQWT_INCLUDE_DIR=$QWT_ROOT_DIR/include" @@ -32,30 +29,28 @@ fi CMAKE_OPTIONS+=" -DSPHINX_ROOT_DIR=$SPHINX_ROOT_DIR" CMAKE_OPTIONS+=" -DYACS_ROOT_DIR=$YACS_ROOT_DIR" CMAKR_OPTIONS+=" -DSalomeYACS_DIR=$YACS_ROOT_DIR/salome_adm/cmake_files" -CMAKE_OPTIONS+=" -DYDEFX_ROOT_DIR=$YDEFX_ROOT_DIR" CMAKE_OPTIONS+=" -Dydefx_DIR=$YDEFX_ROOT_DIR/salome_adm/cmake_files" CMAKE_OPTIONS+=" -DAdaoCppLayer_INCLUDE_DIR=$ADAO_INTERFACE_ROOT_DIR/include" CMAKE_OPTIONS+=" -DAdaoCppLayer_ROOT_DIR=$ADAO_INTERFACE_ROOT_DIR" CMAKE_OPTIONS+=" -DUSE_SALOME=ON" -CMAKE_OPTIONS+=" -DGDAL_LIBRARY=$GDALHOME/lib/libgdal.so" -CMAKE_OPTIONS+=" -DGDAL_INCLUDE_DIR=$GDALHOME/include" if [ ! -z "$TBB_ROOT" ]; then CMAKE_OPTIONS+=" -DTBB_ROOT=$TBB_ROOT_DIR" CMAKE_OPTIONS+=" -DTBB_INCLUDE_DIR=$TBB_ROOT_DIR/include" fi CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=$PYTHONBIN" -CMAKE_OPTIONS+=" -DOTGUI_PYTHON_VERSION=$PYTHON_VERSION" CMAKE_OPTIONS+=" -DPYTHON_INCLUDE_DIR=$PYTHON_INCLUDE" if [ "$PYTHON_ROOT_DIR" != "/usr" ]; then CMAKE_OPTIONS+=" -DPYTHON_LIBRARY=$PYTHON_ROOT_DIR/lib/libpython$PYTHON_VERSION.so" fi -CMAKE_OPTIONS+=" -DCAS_ROOT_DIR=$CAS_ROOT_DIR" -CMAKE_OPTIONS+=" -DSPHINX_ROOT_DIR:FILEPATH=$SPHINX_ROOT_DIR" -CMAKE_OPTIONS+=" -DSPHINX_EXECUTABLE:FILEPATH=$SPHINX_ROOT_DIR/bin/sphinx-build" + +if [ "$SPHINX_ROOT_DIR" != "/usr" ]; then + CMAKE_OPTIONS+=" -DSPHINX_ROOT_DIR:FILEPATH=$SPHINX_ROOT_DIR" + CMAKE_OPTIONS+=" -DSPHINX_EXECUTABLE:FILEPATH=$SPHINX_ROOT_DIR/bin/sphinx-build" +fi + CMAKE_OPTIONS+=" -DCMAKE_FIND_ROOT_PATH=ON" CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE:PATH=$(which swig)" -CMAKE_OPTIONS+=" -DCMAKE_PREFIX_PATH=\"$GUI_ROOT_DIR/adm_local/cmake_files;$KERNEL_ROOT_DIR/salome_adm/cmake_files;$OPENTURNS_HOME/lib/cmake/openturns;$PY2CPP_ROOT_DIR/lib/cmake/py2cpp/;$QWT_ROOT_DIR;$YACS_ROOT_DIR/adm/cmake;$YDEFX_ROOT_DIR/salome_adm/cmake_files;\"" echo echo "*** cmake" $CMAKE_OPTIONS diff --git a/products/compil_scripts/ParaView-5.10.0.sh b/products/compil_scripts/ParaView-5.10.0.sh index d5d79ae..006acc2 100755 --- a/products/compil_scripts/ParaView-5.10.0.sh +++ b/products/compil_scripts/ParaView-5.10.0.sh @@ -217,14 +217,14 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON" # Openturns: -if [ -n "$OPENTURNS_VERSION" ]; then +if [ -n "$OT_VERSION" ]; then function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - if version_ge $OPENTURNS_VERSION "1.17" ; then - echo "INFO: Adding OpenTURNS version ${OPENTURNS_VERSION} support..." + if version_ge $OT_VERSION "1.17" ; then + echo "INFO: Adding OpenTURNS version ${OT_VERSION} support..." CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_OPENTURNS=ON" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OPENTURNS_ROOT_DIR/lib/cmake/openturns" + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" else - echo "WARNING: OpenTURNS ${OPENTURNS_VERSON} is not supported with current ParaView build..." + echo "WARNING: OpenTURNS ${OT_VERSON} is not supported with current ParaView build..." fi else echo "WARNING: No OpenTURNS environment variable is found..." diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh index 687ea71..1e4e2e5 100755 --- a/products/compil_scripts/ParaView-5.9.0.sh +++ b/products/compil_scripts/ParaView-5.9.0.sh @@ -220,14 +220,14 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF" CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON" # Openturns: -if [ -n "$OPENTURNS_VERSION" ]; then +if [ -n "$OT_VERSION" ]; then function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } - if version_ge $OPENTURNS_VERSION "1.17" ; then - echo "INFO: Adding OpenTURNS version ${OPENTURNS_VERSION} support..." + if version_ge $OT_VERSION "1.17" ; then + echo "INFO: Adding OpenTURNS version ${OT_VERSION} support..." CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_ENABLE_OPENTURNS=ON" - CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OPENTURNS_ROOT_DIR/lib/cmake/openturns" + CMAKE_OPTIONS="${CMAKE_OPTIONS} -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns" else - echo "WARNING: OpenTURNS ${OPENTURNS_VERSON} is not supported with current ParaView build..." + echo "WARNING: OpenTURNS ${OT_VERSON} is not supported with current ParaView build..." fi else echo "WARNING: No OpenTURNS environment variable is found..." diff --git a/products/compil_scripts/gdal-2.4.0.sh b/products/compil_scripts/gdal-2.4.0.sh index d6ed267..bb8ed91 100755 --- a/products/compil_scripts/gdal-2.4.0.sh +++ b/products/compil_scripts/gdal-2.4.0.sh @@ -16,10 +16,11 @@ CONFIGURE_FLAGS+=" --with-geos=yes" CONFIGURE_FLAGS+=" --with-sqlite3=yes" CONFIGURE_FLAGS+=" --with-threads" CONFIGURE_FLAGS+=" --with-python=${PYTHONBIN}" -CONFIGURE_FLAGS+=" --with-xml2=${LIBXML_ROOT_DIR}" CONFIGURE_FLAGS+=" --with-hdf5=${HDF5_ROOT_DIR}" CONFIGURE_FLAGS+=" --with-netcdf=${NETCDF_ROOT_DIR}" - +if [ ! -z "$LIBXML_ROOT_DIR" ]; then + CONFIGURE_FLAGS+=" --with-xml2=${LIBXML_ROOT_DIR}" +fi echo echo "*** configure $CONFIGURE_FLAGS LDFLAGS=\"-L${HDF5HOME}/lib/ -lhdf5 -lhdf5_hl -L${NETCDF_ROOT_DIR}/lib -lnetcdf\" HDF5_CFLAGS=\"-I${HDF5HOME}/include -L${HDF5HOME}/lib/ -lhdf5 -lhdf5_hl\" LIBS=\"-L${HDF5HOME}/lib/ -lhdf5 -lhdf5_hl -L${NETCDF_INSTALL_DIR}/lib -lnetcdf\" HDF5_LIBS=\"-L${HDF5HOME}/lib/ -lhdf5 -lhdf5_hl \" HDF5_INCLUDE=\"-I${HDF5HOME}/include\"" diff --git a/products/env_scripts/openturns.py b/products/env_scripts/openturns.py index f6ffe02..1153431 100644 --- a/products/env_scripts/openturns.py +++ b/products/env_scripts/openturns.py @@ -2,9 +2,9 @@ import os.path def set_env(env, prereq_dir, version): - env.set('OPENTURNS_ROOT_DIR', prereq_dir) - env.set('OPENTURNS_HOME', prereq_dir) - env.set('OPENTURNS_VERSION',version) + env.set('OT_ROOT_DIR', prereq_dir) + env.set('OT_HOME', prereq_dir) + env.set('OT_VERSION',version) env.prepend('PATH', os.path.join(prereq_dir,'bin')) env.prepend('LD_LIBRARY_PATH',os.path.join(prereq_dir, 'lib')) pyver = 'python' + env.get('PYTHON_VERSION') diff --git a/products/openturns.pyconf b/products/openturns.pyconf index c6f0a72..4cff406 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -1,12 +1,12 @@ default : { - name : "openturns" + name : "OT" build_source : "script" compil_script : $name + $VARS.scriptExtension get_source : "archive" environ : { - env_script : $name + ".py" + env_script : "openturns.py" } depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib'] build_depend : ["cmake", "swig"] diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf index 42bc504..988707e 100644 --- a/products/salome_system.pyconf +++ b/products/salome_system.pyconf @@ -40,8 +40,8 @@ default : } "CO8" : { - rpm : ["lz4", "openmpi", "gsl", "libgeotiff", "giflib", "geos", "sqlite"] - rpm_dev : ["perl-interpreter", "qt5-devel", "openmpi-devel", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel"] + rpm : ["lz4", "openmpi", "gsl", "libgeotiff", "giflib", "geos", "sqlite", "netcdf"] + rpm_dev : ["perl-interpreter", "qt5-devel", "openmpi-devel", "gsl-devel", "libpng-devel", "libtiff-devel", "libgeotiff-devel", "giflib-devel", "geos-devel", "netcdf-devel"] } "FD30" : { @@ -50,13 +50,13 @@ default : } "FD32" : { - rpm : ["lz4", "gsl", "openmpi"] - rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel"] + rpm : ["lz4", "gsl", "openmpi", "netcdf", "gdal"] + rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel", "netcdf-devel"] } "FD34" : { - rpm : ["lz4-libs", "gsl", "openmpi"] - rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel"] + rpm : ["lz4-libs", "gsl", "openmpi", "netcdf", "gdal"] + rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel", "netcdf-devel", "gdal-devel"] } "DB08" : { @@ -72,18 +72,19 @@ default : "DB10" : { apt : ["libopenexr23", "libwebp6", "libgfortran5", "libilmbase23", "libevent-2.1-6", "libpng16-16", "libgcc-8-dev", - "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp1", "libopenblas-base", "libscotch-6.0", "openmpi-bin"] + "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp1", "libopenblas-base", "libscotch-6.0", "openmpi-bin", + "libnetcdf13", "libgdal20"] apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev", - "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev"] + "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev"] } "DB11" : { apt : ["libopenexr25", "libwebp6", "libgfortran5", "libilmbase25", "libevent-2.1-7", "libpng16-16", "libgcc-10-dev", - "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp24", "openmpi-bin"] + "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp24", "openmpi-bin", "libnetcdf13", "libgdal20"] apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev", "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev", - "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev"] + "libpng-dev", "libtiff5-dev", "libgeotiff-dev", "libjpeg-dev", "libgif-dev", "libgeos-dev", "libsqlite3-dev", "libnetcdf-dev", "libgdal-dev"] } "UB16.04" : { -- 2.39.2