From 71ddfd0236c17b396df1846f75da84b017016016 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 9 May 2023 15:25:04 +0200 Subject: [PATCH] support FD38 --- applications/SALOME-master-native.pyconf | 20 ++++++++- products/ParaView.pyconf | 46 +++++++++++++++++++++ products/PyFMI.pyconf | 12 ++++++ products/Python.pyconf | 5 +++ products/boost.pyconf | 6 +++ products/compil_scripts/PERSALYS-v14.0.1.sh | 2 + products/compil_scripts/opencv.sh | 2 +- products/compil_scripts/openturns-1.20.1.sh | 5 ++- products/medfile.pyconf | 8 ++++ products/opencv.pyconf | 5 +++ products/openturns.pyconf | 8 ++++ products/root.pyconf | 6 +++ 12 files changed, 122 insertions(+), 3 deletions(-) diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 228011e..9a9e792 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -11,7 +11,7 @@ APPLICATION : debug : 'no' base : 'no' python3 : 'yes' - platform : ["FD32", "FD34", "FD36", "FD37", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"] + platform : ["FD32", "FD34", "FD36", "FD37", "FD38", "CO8", "DB10", "DB11", "UB20.04", "UB22.04"] environ : { build : @@ -318,4 +318,22 @@ __overwrite__ : 'APPLICATION.products.CONFIGURATION' : {tag:'master', base: 'no', section: 'default' } 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'default', hpc: 'no' } } + + { + __condition__ : "VARS.dist in ['FD38']" + 'APPLICATION.rm_products' : ['root', 'URANIE', 'mesa'] + 'APPLICATION.products.cmake' : 'native' + 'APPLICATION.products.opencv' : {tag: '3.2.0', base: 'no', section: 'version_3_2_0_FD38' } + 'APPLICATION.products.omniORB' : '4.2.5' + 'APPLICATION.products.omniORBpy' : '4.2.5' + 'APPLICATION.products.qwt' : '6.1.6' + 'APPLICATION.products.nlopt' : '2.6.0' + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.products.numpy' : {tag: '1.22.2', base: 'no', section: 'version_1_22_2' } + 'APPLICATION.products.PyFMI' : {tag: '2.6', base: 'no', section: 'version_2_6_FD38' } + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_FD38' } + 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes'} + 'APPLICATION.products.CONFIGURATION' : {tag:'master', base: 'no', section: 'default' } + 'APPLICATION.products.SHAPER' : {tag:'master', base: 'no', section: 'default', hpc: 'no' } + } ] diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index e09057f..374cce3 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -209,6 +209,27 @@ version_5_11_1_MPI_CO8 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } +version_5_11_1_MPI_FD38 : +{ + compil_script : 'ParaView-5.11.1.sh' + archive_info : {archive_name : "ParaView-5.11.1.tar.gz"} + patches : [] + depend : [ + 'Python', + 'hdf5', + 'qt', + 'PyQt', + 'sip', + 'boost', + 'libxml2', + 'freetype', + 'matplotlib', + 'cgns', + 'Pygments' + ] + opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] +} + version_5_11_1_MPI_FD37 : { compil_script : 'ParaView-5.11.1.sh' @@ -428,6 +449,31 @@ version_5_11_0_MPI_CO8 : opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] } +version_5_11_0_MPI_FD38 : +{ + compil_script : 'ParaView-5.11.0.sh' + archive_info : {archive_name : "ParaView-5.11.0.tar.gz"} + patches : ['paraview-5.11.0.p001-FindCGNS.patch', + 'paraview-5.11.0.p002-FindMPI.patch', + 'paraview-5.11.0.p006-GIL.patch', + 'paraview-5.11.0.p007-mpi4py-FD37.patch' + ] + depend : [ + 'Python', + 'hdf5', + 'qt', + 'PyQt', + 'sip', + 'boost', + 'libxml2', + 'freetype', + 'matplotlib', + 'cgns', + 'Pygments' + ] + opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst'] +} + version_5_11_0_MPI_FD37 : { compil_script : 'ParaView-5.11.0.sh' diff --git a/products/PyFMI.pyconf b/products/PyFMI.pyconf index 60c94de..47d5874 100644 --- a/products/PyFMI.pyconf +++ b/products/PyFMI.pyconf @@ -47,6 +47,18 @@ version_2_6_UB22_04: pip : "no" } } + +version_2_6_FD38: +{ + patches: ['pyfmi-2.6-python-3.1x.01.patch'] + compil_script : "PyFMI-2.6.sh" + properties: + { + incremental : "yes" + pip : "no" + } +} + version_2_6_FD37: { patches: ['pyfmi-2.6-python-3.1x.01.patch'] diff --git a/products/Python.pyconf b/products/Python.pyconf index 05b774c..6391bc4 100755 --- a/products/Python.pyconf +++ b/products/Python.pyconf @@ -50,6 +50,11 @@ version_3_6_5_UB22_04: patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889 } +version_3_6_5_FD38: +{ + patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889 +} + version_3_6_5_FD37: { patches: ["python_3.6.5-allocation.patch"] # https://github.com/pyenv/pyenv/issues/1889 diff --git a/products/boost.pyconf b/products/boost.pyconf index ef40ee2..980a86e 100644 --- a/products/boost.pyconf +++ b/products/boost.pyconf @@ -45,6 +45,12 @@ version_1_71_0_UB22_04 : patches : ['boost-1.71-pthread-gcc-11.patch'] } +version_1_71_0_FD38 : +{ + compil_script : "boost-1.71.0.sh" + patches : ['boost-1.71-pthread-gcc-11.patch'] +} + version_1_71_0_FD37 : { compil_script : "boost-1.71.0.sh" diff --git a/products/compil_scripts/PERSALYS-v14.0.1.sh b/products/compil_scripts/PERSALYS-v14.0.1.sh index afec42f..a64aa95 100755 --- a/products/compil_scripts/PERSALYS-v14.0.1.sh +++ b/products/compil_scripts/PERSALYS-v14.0.1.sh @@ -45,6 +45,8 @@ elif [ "$DIST_NAME$DIST_VERSION" == "FD36" ]; then CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # elif [ "$DIST_NAME$DIST_VERSION" == "FD37" ]; then CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # +elif [ "$DIST_NAME$DIST_VERSION" == "FD38" ]; then + CMAKE_OPTIONS+=" -DUSE_SPHINX=OFF" # else CMAKE_OPTIONS+=" -DUSE_SPHINX=ON" fi diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh index 9ec9546..7fcb436 100755 --- a/products/compil_scripts/opencv.sh +++ b/products/compil_scripts/opencv.sh @@ -35,7 +35,7 @@ if version_ge $VERSION "3."; then CMAKE_OPTIONS+=" -DCMAKE_C_FLAGS=-fPIC" LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in - FD34|FD35|FD36|FD37|UB22*) + FD34|FD35|FD36|FD37|FD38|UB22*) CMAKE_OPTIONS+=" -DCMAKE_CXX_FLAGS=\"-std=c++14\"" CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14" ;; diff --git a/products/compil_scripts/openturns-1.20.1.sh b/products/compil_scripts/openturns-1.20.1.sh index e9bd988..5b96c5a 100755 --- a/products/compil_scripts/openturns-1.20.1.sh +++ b/products/compil_scripts/openturns-1.20.1.sh @@ -35,7 +35,7 @@ fi # https://github.com/persalys/persalys/issues/745 LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" case $LINUX_DISTRIBUTION in - UB22*|CO8*|CO9*|FD36|FD37) + UB22*|CO8*|CO9*|FD36|FD37|FD38) echo "WARNING: switching OFF TBB support" CMAKE_OPTIONS+=" -DUSE_TBB=OFF" ;; @@ -410,6 +410,9 @@ if [[ -d "$SOURCE_DIR/otfftw-0.12" ]]; then FD37) SITE_PATCH=$SOURCE_DIR/addons/site-patch.py ;; + FD38) + SITE_PATCH=$SOURCE_DIR/addons/site-patch.py + ;; CO8*) SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py ;; diff --git a/products/medfile.pyconf b/products/medfile.pyconf index dd2a63a..316001a 100644 --- a/products/medfile.pyconf +++ b/products/medfile.pyconf @@ -60,6 +60,14 @@ version_4_1_1_UB22_04 : patches: ['SPNS-29880-medfile.patch'] } +version_4_1_1_FD38 : +{ + compil_script : 'med-4.1.1.sh' + test_build : "make check" + build_depend : ['swig'] + patches: ['SPNS-29880-medfile.patch'] +} + version_4_1_1_FD37 : { compil_script : 'med-4.1.1.sh' diff --git a/products/opencv.pyconf b/products/opencv.pyconf index eb4ef6e..0ce44c5 100644 --- a/products/opencv.pyconf +++ b/products/opencv.pyconf @@ -41,6 +41,11 @@ version_3_2_0 : patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "opencv-3.2.0-python2-cmake.patch"] } +version_3_2_0_FD38 : +{ + patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"] +} + version_3_2_0_FD37 : { patches : ["opencv-3.2.0-ccache.patch", "SPNS-29988-opencv-3.2.0-persistence.patch", "SPNS-29988-opencv-3.2.0-cv2.patch"] diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 4cb1c48..4a973ac 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -104,6 +104,14 @@ version_1_20_1_CO7 : opt_depend : ['pandas', 'statsmodels'] } +version_1_20_1_FD38 : +{ + compil_script : "openturns-1.20.1" + $VARS.scriptExtension + patches : [] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI'] + opt_depend : ['pandas', 'statsmodels'] +} + version_1_20_1_FD37 : { compil_script : "openturns-1.20.1" + $VARS.scriptExtension diff --git a/products/root.pyconf b/products/root.pyconf index 3cb09c8..fb21134 100644 --- a/products/root.pyconf +++ b/products/root.pyconf @@ -97,6 +97,12 @@ version_6_22_02_FD36: patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] } +version_6_22_02_FD38: +{ + get_source : "archive" + patches : ['root-6.22.02.patch', 'root-6.22.02-gcc-11.0.patch'] +} + version_6_22_02_FD37: { get_source : "archive" -- 2.39.2