From: Nabil Ghodbane Date: Wed, 7 Sep 2022 07:23:00 +0000 (+0200) Subject: spns #29880: SALOME 9.9.0 UB22: backport patches X-Git-Tag: V9_11_0~333 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=729c271b60a27d5268d9f28247b736f42fc3bd72;p=tools%2Fsat_salome.git spns #29880: SALOME 9.9.0 UB22: backport patches --- diff --git a/applications/SALOME-9.9.0-native.pyconf b/applications/SALOME-9.9.0-native.pyconf index 40647e3..098cbb2 100644 --- a/applications/SALOME-9.9.0-native.pyconf +++ b/applications/SALOME-9.9.0-native.pyconf @@ -215,17 +215,20 @@ __overwrite__ : { # __condition__ : "VARS.dist in ['UB22.04']" - 'APPLICATION.products.opencv' : '3.2.0' - 'APPLICATION.products.nlopt' : '2.5.0' - 'APPLICATION.products.cminpack': 'native' - 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip' } - 'APPLICATION.products.netcdf' : '4.6.2' - 'APPLICATION.rm_products' : ['mesa'] - 'APPLICATION.products.omniORB' : '4.2.5' - 'APPLICATION.products.omniORBpy' : '4.2.5' - 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB22_04', hpc: 'yes'} - 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_UB22_04'} - 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_UB22_04'} + 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.nlopt' : '2.5.0' + 'APPLICATION.products.cminpack' : 'native' + 'APPLICATION.products.PyFMI' : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'} + 'APPLICATION.products.netcdf' : '4.6.2' + 'APPLICATION.rm_products' : ['mesa'] + 'APPLICATION.products.omniORB' : '4.2.5' + 'APPLICATION.products.omniORBpy' : '4.2.5' + 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_UB22_04', hpc: 'yes'} + 'APPLICATION.products.root' : {tag: '6.22.02', base: 'no', section: 'version_6_22_02_UB22_04'} + 'APPLICATION.products.medfile' : {tag: '4.1.1', base: 'no', section: 'version_4_1_1_UB22_04'} + 'APPLICATION.products.MEDCOUPLING' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI_UB22_04', hpc: 'yes'} + 'APPLICATION.products.HEXABLOCK' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_UB22_04', hpc: 'no'} + 'APPLICATION.products.SHAPER' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_UB22_04', hpc: 'no'} } { # DB10: diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf index 6e4b204..6161a1b 100644 --- a/products/HEXABLOCK.pyconf +++ b/products/HEXABLOCK.pyconf @@ -43,6 +43,7 @@ default : is_SALOME_module : "yes" has_unit_tests } + patches: [] } default_MPI : @@ -97,3 +98,7 @@ version_V9_9_0_MPI : ] } +version_V9_9_0_UB22_04 : +{ + patches: ['SPNS-29880-HEXABLOCK_V9_9_0.patch'] +} diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index afe6559..15036d2 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -214,6 +214,33 @@ version_V9_9_0_MPI: patches: [] } +version_V9_9_0_MPI_UB22_04: +{ + cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PTSCOTCH=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSCOTCH_ROOT_DIR=${SCOTCH_ROOT_DIR} -DPTSCOTCH_ROOT_DIR=${PTSCOTCH_ROOT_DIR} -DPTSCOTCH_INCLUDE_DIRS=${PTSCOTCH_INCLUDE_DIR}" + depend : [ + "boost", + "cppunit", + "Python", + "hdf5", + "medfile", + "scotch", + "docutils", + "libxml2", + "Sphinx", + "sphinxintl", + "setuptools", + "six", + "pytz", + "numpy", + "scipy", + "lapack", + "CONFIGURATION", + "openmpi" + ] + opt_depend : ["ParMetis", "metis"] + patches: ['SPNS-29880-MEDCOUPLING-V9_9_0.patch'] +} + version_V9_9_0_MPI_STD: { cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}" diff --git a/products/SHAPER.pyconf b/products/SHAPER.pyconf index 2840cab..1f8145b 100644 --- a/products/SHAPER.pyconf +++ b/products/SHAPER.pyconf @@ -53,6 +53,10 @@ default_win : cmake_options : " -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe " } +version_V9_9_0_UB22_04: +{ + patches : ['SPNS-29880-SHAPER-V9_9_0.patch'] +} version_9_5_0_to_9_8_0 : { patches : ["patch_shaper_cursor_cross.diff"] diff --git a/products/patches/SPNS-29880-HEXABLOCK_V9_9_0.patch b/products/patches/SPNS-29880-HEXABLOCK_V9_9_0.patch new file mode 100644 index 0000000..ab31a76 --- /dev/null +++ b/products/patches/SPNS-29880-HEXABLOCK_V9_9_0.patch @@ -0,0 +1,15 @@ +diff --git a/doc/conf.py.in b/doc/conf.py.in +index ba7daa4..f958234 100644 +--- a/doc/conf.py.in ++++ b/doc/conf.py.in +@@ -201,8 +201,8 @@ htmlhelp_basename = 'HexaBlockdoc' + # Grouping the document tree into LaTeX files. List of tuples + # (source start file, target name, title, author, document class [howto/manual]). + latex_documents = [ +- ('index', 'HexaBlock.tex', ur'HexaBlock Documentation', +- ur'CS', 'manual'), ++ ('index', 'HexaBlock.tex', 'HexaBlock Documentation', ++ 'CS', 'manual'), + ] + + # The name of an image file (relative to this directory) to place at the top of diff --git a/products/patches/SPNS-29880-MEDCOUPLING-V9_9_0.patch b/products/patches/SPNS-29880-MEDCOUPLING-V9_9_0.patch new file mode 100644 index 0000000..4d986aa --- /dev/null +++ b/products/patches/SPNS-29880-MEDCOUPLING-V9_9_0.patch @@ -0,0 +1,30 @@ +diff --git a/doc/tutorial/conf.py.in b/doc/tutorial/conf.py.in +index 1f16fab3..fc6efeb8 100644 +--- a/doc/tutorial/conf.py.in ++++ b/doc/tutorial/conf.py.in +@@ -183,8 +183,8 @@ htmlhelp_basename = 'MEDCouplingTutorial' + # Grouping the document tree into LaTeX files. List of tuples + # (source start file, target name, title, author, document class [howto/manual]). + latex_documents = [ +- ('index', 'MEDCouplingTutorial.tex', ur'MEDCoupling tutorial', +- ur'A. Geay, A. Bruneton', 'manual'), ++ ('index', 'MEDCouplingTutorial.tex', 'MEDCoupling tutorial', ++ 'A. Geay, A. Bruneton', 'manual'), + ] + + # The name of an image file (relative to this directory) to place at the top of +diff --git a/doc/user/conf.py.in b/doc/user/conf.py.in +index 412d8866..74819303 100644 +--- a/doc/user/conf.py.in ++++ b/doc/user/conf.py.in +@@ -185,8 +185,8 @@ htmlhelp_basename = 'MEDCouplingUsersGuide' + # Grouping the document tree into LaTeX files. List of tuples + # (source start file, target name, title, author, document class [howto/manual]). + latex_documents = [ +- ('index', 'MEDCouplingUserGuide.tex', ur"MEDCoupling User's Guide", +- ur'A. Geay, A. Bruneton', 'manual'), ++ ('index', 'MEDCouplingUserGuide.tex', "MEDCoupling User's Guide", ++ 'A. Geay, A. Bruneton', 'manual'), + ] + + # The name of an image file (relative to this directory) to place at the top of diff --git a/products/patches/SPNS-29880-SHAPER-V9_9_0.patch b/products/patches/SPNS-29880-SHAPER-V9_9_0.patch new file mode 100644 index 0000000..a464203 --- /dev/null +++ b/products/patches/SPNS-29880-SHAPER-V9_9_0.patch @@ -0,0 +1,13 @@ +diff --git a/src/ModelHighAPI/ModelHighAPI_Tools.cpp b/src/ModelHighAPI/ModelHighAPI_Tools.cpp +index 65f536b..87f24f8 100644 +--- a/src/ModelHighAPI/ModelHighAPI_Tools.cpp ++++ b/src/ModelHighAPI/ModelHighAPI_Tools.cpp +@@ -559,7 +559,7 @@ static bool checkDump(SessionPtr theSession, + // execute the dumped + PyGILState_STATE gstate = PyGILState_Ensure(); /* acquire python thread */ + static char aReadMode[] = "r"; +- FILE* PyFileObject = _Py_fopen(theFilename, aReadMode); ++ FILE* PyFileObject = fopen(theFilename, aReadMode); + PyRun_SimpleFileEx(PyFileObject, theFilename, 1); + PyGILState_Release(gstate); /* release python thread */ +