From d345488fe4c5adafb3155773ecb283d74b1b14ff Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 1 Apr 2022 16:11:12 +0200 Subject: [PATCH] OCCT V7_5_3p2 and Openturns 1.18 Windows (note that one needs DILL 0.3.4) --- applications/SALOME-master-MPI.pyconf | 4 +- applications/SALOME-master-windows.pyconf | 15 ++-- applications/SALOME-master.pyconf | 6 +- products/CAS.pyconf | 98 +++++++++++++++++++++-- products/dill.pyconf | 35 ++++++++ products/env_scripts/dill.py | 10 +++ products/openturns.pyconf | 2 +- 7 files changed, 152 insertions(+), 18 deletions(-) create mode 100644 products/dill.pyconf create mode 100644 products/env_scripts/dill.py diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 9407044..0c8070c 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -32,7 +32,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.71.0' - CAS : 'V7_5_3p1' + CAS : 'V7_5_3p2' C3PO: 'v2.0' certifi : '2018.8.24' cgns : {tag : '4.2.0', hpc : 'yes'} @@ -84,7 +84,7 @@ APPLICATION : omniORBpy : '4.2.2' opencv : '3.2.0' openmpi : '3.1.6' - openturns: '1.17' + openturns: '1.18' openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 366d747..a839cd6 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -23,12 +23,15 @@ APPLICATION : SET_usr_docs_VARS : "1" # required for PyEditor build CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' } - launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"} + 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%" HOME : "%userprofile%" - SALOME_ACTOR_DELEGATE_TO_VTK : '1' } products : { @@ -36,7 +39,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.67.0' - CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1_win'} + CAS : {tag: 'V7_5_3p2', section: 'version_V7_5_3p2_win'} certifi : '2019.6.16' cgns : '4.2.0' chardet : '3.0.4' @@ -47,6 +50,7 @@ APPLICATION : cycler : '0.10.0' Cython : '0.29.12' dateutil : '2.8.0' + dill : '0.3.4' docutils : '0.14' doxygen : '1.8.3.1' eigen : '3.3.4' @@ -82,7 +86,7 @@ APPLICATION : omniORBpy : '4.2.3' opencv : '3.2.0' openVKL: '0.11.0' - openturns: '1.17' + openturns: '1.18' ospray : '2.4.0' packaging : '19.0' ParaView : '5.9.0' @@ -94,7 +98,6 @@ APPLICATION : Pygments : '2.4.2' pyparsing : '2.4.0' PyQt : '5.15.3' - # PyQtChart : '5.15.4' pyreadline : '2.1' Python : '3.6.5' pytz : '2019.1' @@ -164,7 +167,7 @@ APPLICATION : 'ADAO' 'PARAVISADDONS' 'TESTBASE': {tag: 'master'} - 'CEATESTBASE' : {tag: 'SSL'} + 'CEATESTBASE' : {tag: 'SalomeV9'} } profile : { diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 96c5295..6caf164 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -24,12 +24,10 @@ APPLICATION : launch : { PYTHONIOENCODING:"UTF_8", - SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH", - ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR' + 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_ACTOR_DELEGATE_TO_VTK : '1' } products : { @@ -37,7 +35,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.7.0' boost : '1.71.0' - CAS : 'V7_5_3p1' + CAS : 'V7_5_3p2' C3PO: 'v2.0' certifi : '2018.8.24' cgns : '4.2.0' diff --git a/products/CAS.pyconf b/products/CAS.pyconf index f9f135c..45271af 100755 --- a/products/CAS.pyconf +++ b/products/CAS.pyconf @@ -37,11 +37,11 @@ default : } } -version_V7_5_0 : +version_V7_5_3p2 : { name : "CAS" build_source : "cmake" - cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR" + cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" get_source : "git" #get_source : "archive" git_info: @@ -51,9 +51,6 @@ version_V7_5_0 : } environ : { - # OP 19/04/2017 Artifact 8482 : Ajout des variables CAS dans la - # section environ pour conserver - # la generalite du script CAS.py CSF_ShadersDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Shaders" CSF_UnitsLexicon : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Lexi_Expr.dat" CSF_UnitsDefinition : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat" @@ -76,6 +73,58 @@ version_V7_5_0 : } } +version_V7_5_3p2_win : +{ + name : "CAS" + build_source : "script" + compil_script : "CAS_7.5.bat" + get_source : "git" + git_info: + { + repo : "http://git.dev.opencascade.org/repos/occt.git" + repo_dev : $repo + } + environ : + { + CSF_OCCTBinPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "bin" + CSF_OCCTLibPath : $install_dir + $VARS.sep + "win64" + $VARS.sep + "vc14" + $VARS.sep + "lib" + CSF_OCCTIncludePath : $install_dir + $VARS.sep + "inc" + CSF_OCCTResourcePath : $install_dir + $VARS.sep + "src" + CSF_OCCTDataPath : $install_dir + $VARS.sep + "data" + CSF_OCCTSamplesPath : $install_dir + $VARS.sep + "samples" + CSF_OCCTTestsPath : $install_dir + $VARS.sep + "tests" + CSF_OCCTDocPath : $install_dir + $VARS.sep + "doc" + CSF_SHMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "SHMessage" + CSF_MDTVTexturesDirectory: $install_dir + $VARS.sep + "src" + $VARS.sep + "Textures" + CSF_ShadersDirectory : $install_dir + $VARS.sep + "src" + $VARS.sep + "Shaders" + CSF_XSMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSMessage" + CSF_TObjMessage : $install_dir + $VARS.sep + "src" + $VARS.sep + "TObj" + CSF_StandardDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_PluginDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_XCAFDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_TObjDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_StandardLiteDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + CSF_IGESDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSTEPResource" + CSF_STEPDefaults : $install_dir + $VARS.sep + "src" + $VARS.sep + "XSTEPResource" + CSF_XmlOcafResource : $install_dir + $VARS.sep + "src" + $VARS.sep + "XmlOcafResource" + CSF_MIGRATION_TYPES : $install_dir + $VARS.sep + "src" + $VARS.sep + "StdResource" + $VARS.sep + "MigrationSheet.txt" + CSF_UnitsDefinition : $install_dir + $VARS.sep + "src" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat" + MMGT_CLEAR : "1" + MMGT_REENTRANT : "1" + CSF_LANGUAGE : "us" + + env_script : "CAS.py" + } + depend : ['freetype', 'freeimage', 'tbb'] + build_depend : ["cmake", "doxygen"] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + properties: + { + incremental : "no" + } +} + version_V7_5_3p1 : { name : "CAS" @@ -164,6 +213,45 @@ version_V7_5_3p1_win : } } +version_V7_5_0 : +{ + name : "CAS" + build_source : "cmake" + cmake_options : "-DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF -DUSE_FREETYPE=ON -D3RDPARTY_FREETYPE_DIR=$FREETYPEDIR -DUSE_FREEIMAGE=ON -D3RDPARTY_FREEIMAGE_DIR=$FREEIMAGEDIR" + get_source : "git" + #get_source : "archive" + git_info: + { + repo : "http://git.dev.opencascade.org/repos/occt.git" + repo_dev : $repo + } + environ : + { + # OP 19/04/2017 Artifact 8482 : Ajout des variables CAS dans la + # section environ pour conserver + # la generalite du script CAS.py + CSF_ShadersDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Shaders" + CSF_UnitsLexicon : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Lexi_Expr.dat" + CSF_UnitsDefinition : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "UnitsAPI" + $VARS.sep + "Units.dat" + CSF_SHMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "SHMessage" + CSF_XSMessage : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "XSMessage" + CSF_MDTVTexturesDirectory : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "Textures" + MMGT_REENTRANT : "1" + CSF_StandardDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource" + CSF_PluginDefaults : $install_dir + $VARS.sep + "share" + $VARS.sep + "opencascade" + $VARS.sep + "resources" + $VARS.sep + "StdResource" + env_script : $name + ".py" + } + depend : ['freetype', 'freeimage'] + build_depend : ["cmake", "doxygen"] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + install_dir : 'base' + properties: + { + incremental : "no" + } +} + version_V7_5_0_win : { name : "CAS" diff --git a/products/dill.pyconf b/products/dill.pyconf new file mode 100644 index 0000000..5845d2e --- /dev/null +++ b/products/dill.pyconf @@ -0,0 +1,35 @@ +default : +{ + name : "dill" + build_source : "script" + compil_script : $name + $VARS.scriptExtension + get_source : "archive" + environ : + { + env_script : $name + ".py" + } + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen'] + opt_depend: [] + patches : [] + source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name + build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name + install_dir : 'base' + properties : + { + single_install_dir : "no" + incremental : "yes" + pip : "yes" + } +} + +default_win : +{ + compil_script : 'pip_install' + $VARS.scriptExtension + properties : + { + single_install_dir : "no" + incremental : "yes" + pip : "yes" + } + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'pthreads'] +} diff --git a/products/env_scripts/dill.py b/products/env_scripts/dill.py new file mode 100644 index 0000000..c723c16 --- /dev/null +++ b/products/env_scripts/dill.py @@ -0,0 +1,10 @@ +#!/usr/bin/env python +import os.path + +def set_env(env, prereq_dir, version): + env.set('DILL_ROOT_DIR', prereq_dir) + env.set('OT_VERSION',version) + pyver = 'python' + env.get('PYTHON_VERSION') + env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages')) +def set_nativ_env(env): + pass diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 2091e42..92df255 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -58,7 +58,7 @@ version_1_18_win : incremental : "yes" pip : "yes" } - depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'pthreads'] + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'pthreads', 'dill', 'psutil'] opt_depend : [] patches : [] } -- 2.39.2