From 20ca4650d2734b2476a3a08bc588f97f2646ccad Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 16 Oct 2020 11:37:48 +0200 Subject: [PATCH] Windows: use 64 bits IDS as default for both MEDCOUPLING-master and SALOME-master - add pyreadline to MEDCOUPLING --- applications/MEDCOUPLING-master-windows.pyconf | 14 +++++++++++--- applications/SALOME-master-windows.pyconf | 4 ++-- products/GUI.pyconf | 3 ++- products/KERNEL.pyconf | 4 +++- products/MEDCOUPLING.pyconf | 14 ++++++++++++-- products/compil_scripts/ParaView.bat | 9 ++++++++- products/compil_scripts/medCMake.bat | 10 +++++++--- products/env_scripts/ParaView.py | 3 +-- 8 files changed, 46 insertions(+), 15 deletions(-) diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf index 731f3c6..c9a42bd 100644 --- a/applications/MEDCOUPLING-master-windows.pyconf +++ b/applications/MEDCOUPLING-master-windows.pyconf @@ -12,9 +12,16 @@ APPLICATION : python3 : 'yes' environ : { - build : {CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"} - launch : {PYTHONIOENCODING:"UTF_8"} - SALOME_HAS_GLOBAL_ENV: "1" + build : + { + CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" + SALOME_HAS_GLOBAL_ENV: "1" + SALOME_USE_64BIT_IDS : '1' + } + launch : + { + PYTHONIOENCODING:"UTF_8" + } } products : { @@ -50,6 +57,7 @@ APPLICATION : pockets : '0.7.2' Pygments : '2.4.2' pyparsing : '2.4.0' + pyreadline : '2.1' Python : '3.6.5' pytz : '2019.1' requests : '2.22.0' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 7b4344b..f955f7d 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -18,14 +18,14 @@ APPLICATION : { CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION" RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED" + SALOME_HAS_GLOBAL_ENV : "1" + SET_usr_docs_VARS : "1" # required for PyEditor build } launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} SALOME_trace : "local" # local/file:.../with_logger SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER" # specify the first modules to display in gui SALOME_TMP_DIR : "%appdata%" - SALOME_HAS_GLOBAL_ENV : "1" HOME : "%userprofile%" - SET_usr_docs_VARS : "1" # required for PyEditor build } products : { diff --git a/products/GUI.pyconf b/products/GUI.pyconf index ed1328b..641279b 100644 --- a/products/GUI.pyconf +++ b/products/GUI.pyconf @@ -66,7 +66,8 @@ default_win : "sphinxcontrib_websupport", "sphinxcontrib_applehelp", "sphinxcontrib_serializinghtml", - "sphinxcontrib_napoleon" + "sphinxcontrib_napoleon", + "graphviz" ] opt_depend : ["sphinx_rtd_theme"] build_depend : ["cmake", "swig", "doxygen", "cppunit"] diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index 7f23197..98a6b78 100644 --- a/products/KERNEL.pyconf +++ b/products/KERNEL.pyconf @@ -60,7 +60,8 @@ default_win : "setuptools", "Pygments", "pytz", - "LIBBATCH" + "LIBBATCH", + "graphviz" ] build_depend : ["cmake", "swig", "doxygen", "cppunit"] } @@ -143,6 +144,7 @@ ALAMOS_SALOME_9_win : "omniORB", "omniORBpy", "docutils", + "graphviz", "libxml2", "Sphinx", "sphinxintl", diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf index 69be477..2364970 100644 --- a/products/MEDCOUPLING.pyconf +++ b/products/MEDCOUPLING.pyconf @@ -44,7 +44,7 @@ default : default_win : { - cmake_options : ' -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF ' + cmake_options : ' -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF ' depend : [ "boost", "Python", @@ -52,6 +52,7 @@ default_win : "medfile", "metis", "docutils", + "graphviz", "libxml2", "Sphinx", "sphinxintl", @@ -60,7 +61,8 @@ default_win : "pytz", "numpy", "CONFIGURATION" - ] + ] + build_depend : ["cmake", "swig", "doxygen", "cppunit"] } default_int64: @@ -69,6 +71,14 @@ default_int64: } +version_V9_5_0 : +{ +} +version_V9_5_0_win : +{ + cmake_options : ' -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF ' +} + version_7_8_2_to_8_4_0 : { depend : [ diff --git a/products/compil_scripts/ParaView.bat b/products/compil_scripts/ParaView.bat index 1efac77..52c56d0 100644 --- a/products/compil_scripts/ParaView.bat +++ b/products/compil_scripts/ParaView.bat @@ -50,7 +50,14 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_FULL_THREADSAFE:BOOL=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_VERSION:STRING=3 REM VTK general settings -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_USE_64BIT_IDS:BOOL=OFF + +REM Use 64 bits IDS on request +if DEFINED SALOME_USE_64BIT_IDS ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_USE_64BIT_IDS:BOOL=ON +) else ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_USE_64BIT_IDS:BOOL=OFF +) + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_INSTALL_LIBRARY_DIR=lib/paraview-%PVLIBVERSION% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_INSTALL_ARCHIVE_DIR=lib/paraview-%PVLIBVERSION% set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_PYTHON_SITE_PACKAGES_SUFFIX=site-packages diff --git a/products/compil_scripts/medCMake.bat b/products/compil_scripts/medCMake.bat index 4338f96..640260e 100755 --- a/products/compil_scripts/medCMake.bat +++ b/products/compil_scripts/medCMake.bat @@ -25,16 +25,20 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_STATIC_LIBS:BOOL=OFF SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_BUILD_SHARED_LIBS:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ROOT_DIR:STRING=%HDF5_ROOT_DIR% +if DEFINED SALOME_USE_64BIT_IDS ( + SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMED_MEDINT_TYPE:STRING="long long" +) + if DEFINED SAT_HPC ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=ON ) else ( - SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF + SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF ) if defined CMAKE_GENERATOR ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% + SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% ) else ( - set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" + SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" ) cd %BUILD_DIR% diff --git a/products/env_scripts/ParaView.py b/products/env_scripts/ParaView.py index b8554c2..ee4520a 100644 --- a/products/env_scripts/ParaView.py +++ b/products/env_scripts/ParaView.py @@ -45,10 +45,9 @@ def set_paraview_env(env, version): paralib = os.path.join(root, 'lib', 'paraview-' + version) env.prepend('PATH', paralib) env.prepend('PV_PLUGIN_PATH', paralib) - env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages')) - env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages')) env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages', 'paraview')) env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages', 'vtk')) + env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages')) else: paralib = os.path.join(root, lib_dir, 'paraview-' + version) env.prepend('PV_PLUGIN_PATH', paralib) -- 2.39.2