From: Guytri KASTANE Date: Wed, 23 Oct 2024 11:32:04 +0000 (+0200) Subject: bos #43318: updated configuration files for embedded salome and added python packages... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e86ea8a4fbc7b215f4cfc6e9c5e7d171c4c382b3;p=tools%2Fsat_salome.git bos #43318: updated configuration files for embedded salome and added python packages checking for native salome --- diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index dadc1cd..490a1a3 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -273,6 +273,7 @@ __overwrite__ : 'APPLICATION.products.assimulo' : '3.5.2' 'APPLICATION.products.netcdf' : '4.6.2' 'APPLICATION.products.opencv' : '3.2.0' + 'APPLICATION.products.FMILibrary' : '2.4.1' 'APPLICATION.products.PyFMI' : '2.13.1' 'APPLICATION.products.petsc' : '3.20.5' 'APPLICATION.products.swig' : '4.0.2' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 148f8de..c7d5b85 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -109,7 +109,7 @@ APPLICATION : omniORBpy : '4.2.5' opencv : '3.2.0' openmpi : '4.0.3' - openturns: '1.22' + openturns: '1.23' openVKL: '0.11.0' ospray : '2.4.0' packaging : '23.2' @@ -255,13 +255,13 @@ __overwrite__ : { __condition__ : "VARS.dist in ['CO7']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] - 'APPLICATION.products.openturns' : {tag:'1.22', base:'no', section:'version_1_22_CO7'} + 'APPLICATION.products.openturns' : {tag:'1.23', base:'no', section:'version_1_23_CO7'} } { __condition__ : "VARS.dist in ['CO8']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq'] 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_CO8' } # spns #29324 - 'APPLICATION.products.openturns' : {tag:'1.22', base:'no', section:'version_1_22_CO8'} + 'APPLICATION.products.openturns' : {tag:'1.23', base:'no', section:'version_1_23_CO8'} 'APPLICATION.products.ParaView' : {tag: '5.11.0', base: 'no', section: 'version_5_11_0_MPI_CO8', hpc: 'yes'} } { @@ -271,7 +271,7 @@ __overwrite__ : } { __condition__ : "VARS.dist in ['DB09']" - 'APPLICATION.products.openturns' : {tag:'1.22', base:'no', section:'version_1_22_DB09'} + 'APPLICATION.products.openturns' : {tag:'1.23', base:'no', section:'version_1_23_DB09'} } { __condition__ : "VARS.dist in ['UB18.04']" diff --git a/products/compil_scripts/openturns-1.23.sh b/products/compil_scripts/openturns-1.23.sh index d3c0572..3e151b9 100755 --- a/products/compil_scripts/openturns-1.23.sh +++ b/products/compil_scripts/openturns-1.23.sh @@ -340,66 +340,86 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then if [ "$SAT_Python_IS_NATIVE" == "1" ]; then if [ $k == "otfmi" ]; then echo "INFO: install dill-0.3.4" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/dill-0.3.4/dill-0.3.4-py2.py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL - if [ $? -ne 0 ] - then - echo "FATAL: could not install dill-0.3.4" - exit 6 + if ! ${PYTHONBIN} -c "import dill"; then + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/dill-0.3.4/dill-0.3.4-py2.py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL + if [ $? -ne 0 ] + then + echo "FATAL: could not install dill-0.3.4" + exit 6 + fi + else + echo "WARNING: dill is already installed" fi echo "INFO: install pythonfmu-0.6.3" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/pythonfmu-0.6.3/pythonfmu-0.6.3-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL - if [ $? -ne 0 ] - then - echo "FATAL: could not install pythonfmu-0.6.3" - exit 6 + if ! ${PYTOHNBIN} -c "import pythonfmu"; then + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/pythonfmu-0.6.3/pythonfmu-0.6.3-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL + if [ $? -ne 0 ] + then + echo "FATAL: could not install pythonfmu-0.6.3" + exit 6 + fi + else + echo "WARNING: pythonfmu is already innstalled" fi elif [ $k == "otpod" ]; then if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $SAT_Cython_IS_NATIVE == "1" ]]; then echo "*** skipping: since system Cython too old" continue fi - if [ "${LINUX_DISTRIBUTION}" != "DB10" ]; then - echo "INFO: install scikit-learn-1.2.2" - if [ "${PYTHON_VERSION}" == "3.12" ]; then - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit-learn-1.2.2.tar.gz --no-deps --prefix=$PRODUCT_INSTALL --no-build-isolation --no-use-pep517 + if ! ${PYTHONBIN} -c "import sklearn"; then + if [ "${LINUX_DISTRIBUTION}" != "DB10" ]; then + echo "INFO: install scikit-learn-1.2.2" + if [ "${PYTHON_VERSION}" == "3.12" ]; then + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit-learn-1.2.2.tar.gz --no-deps --prefix=$PRODUCT_INSTALL --no-build-isolation --no-use-pep517 + if [ $? -ne 0 ] + then + echo "FATAL: could not install scikit-1.2.2" + exit 6 + fi + else + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit_learn-1.2.2-cp${PYTHON_VERSION//./}-cp${PYTHON_VERSION//./}-manylinux_2_17_x86_64.manylinux2014_x86_64.whl --no-deps --prefix=$PRODUCT_INSTALL + fi if [ $? -ne 0 ] then echo "FATAL: could not install scikit-1.2.2" exit 6 fi - else - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.2.2/scikit_learn-1.2.2-cp${PYTHON_VERSION//./}-cp${PYTHON_VERSION//./}-manylinux_2_17_x86_64.manylinux2014_x86_64.whl --no-deps --prefix=$PRODUCT_INSTALL - fi + else + echo "INFO: install scikit-learn-1.0" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.0/scikit-learn-1.0.tar.gz --no-deps --prefix=$PRODUCT_INSTALL --no-build-isolation --no-use-pep517 + if [ $? -ne 0 ] + then + echo "FATAL: could not install scikit-1.0" + exit 6 + fi + fi + else + echo "WARNING: sklearn is already installed" + fi + echo "INFO: install threadpoolctl-3.0.0" + if ! ${PPYTHONBIN} -c "import threadpoolctl"; then + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/threadpoolctl-3.0.0/threadpoolctl-3.0.0-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL if [ $? -ne 0 ] then - echo "FATAL: could not install scikit-1.2.2" + echo "FATAL: could not install threadpoolctl 3.0.0" exit 6 fi else - echo "INFO: install scikit-learn-1.0" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/scikit-learn-1.0/scikit-learn-1.0.tar.gz --no-deps --prefix=$PRODUCT_INSTALL --no-build-isolation --no-use-pep517 + echo "WARNING: threadpoolctl is already installed" + fi + elif [ $k == "otwrapy" ]; then + echo "INFO: install tqdm-4.66.5" + if ! ${PYTHONBIN} -c "import tqdm"; then + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/tqdm-4.66.5/tqdm-4.66.5-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL if [ $? -ne 0 ] then - echo "FATAL: could not install scikit-1.0" - exit 6 + echo "FATAL: could not install tqdm 4.66.5" + exit 6 fi - fi - echo "INFO: install threadpoolctl-3.0.0" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/threadpoolctl-3.0.0/threadpoolctl-3.0.0-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL - if [ $? -ne 0 ] - then - echo "FATAL: could not install threadpoolctl 3.0.0" - exit 6 + else + echo "WARNING: tqdm is already installed" fi - elif [ $k == "otwrapy" ]; then - echo "INFO: install tqdm-4.66.5" - ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/tqdm-4.66.5/tqdm-4.66.5-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL - if [ $? -ne 0 ] - then - echo "FATAL: could not install tqdm 4.66.5" - exit 6 - fi - fi + fi echo "INFO: check presence of $PRODUCT_INSTALL/local" if [ -d "$PRODUCT_INSTALL/local" ]; then echo "INFO: $PRODUCT_INSTALL/local is present - reearrange ..." @@ -426,6 +446,13 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then echo "FATAL: could not install dill-0.3.4" exit 5 fi + echo "INFO: install pythonfmu-0.6.3" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/pythonfmu-0.6.3/pythonfmu-0.6.3-py3-none-any.whl --no-deps + if [ $? -ne 0 ] + then + echo "FATAL: could not install pythonfmu-0.6.3" + exit 6 + fi elif [[ $k == "otpod" ]]; then echo "INFO: install threadpoolctl-3.0.0" ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/threadpoolctl-3.0.0/threadpoolctl-3.0.0-py3-none-any.whl --no-deps @@ -465,6 +492,14 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then exit 6 fi fi + elif [ $k == "otwrapy" ]; then + echo "INFO: install tqdm-4.66.5" + ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/tqdm-4.66.5/tqdm-4.66.5-py3-none-any.whl --no-deps --prefix=$PRODUCT_INSTALL + if [ $? -ne 0 ] + then + echo "FATAL: could not install tqdm 4.66.5" + exit 6 + fi fi fi diff --git a/products/openturns.pyconf b/products/openturns.pyconf index 463bbb6..e7a8eb2 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -44,6 +44,27 @@ version_1_23 : opt_depend : ['pandas', 'statsmodels', 'patsy'] } +version_1_23_CO7 : +{ + compil_script : "openturns-1.23.sh" + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + +version_1_23_CO8 : +{ + compil_script : "openturns-1.23.sh" + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + +version_1_23_DB09 : +{ + compil_script : "openturns-1.23.sh" + depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI', 'boost'] + opt_depend : ['pandas', 'statsmodels', 'patsy'] +} + version_1_22 : { compil_script : "openturns-1.22.sh" diff --git a/products/patches/openturns-1.23.0001.patch b/products/patches/openturns-1.23.0001.patch new file mode 100644 index 0000000..f2c765a --- /dev/null +++ b/products/patches/openturns-1.23.0001.patch @@ -0,0 +1,14 @@ +diff -Naur -Naur openturns/openturns-1.23/CMakeLists.txt openturns_dev/openturns-1.23/CMakeLists.txt +--- openturns/openturns-1.23/CMakeLists.txt 2024-04-03 11:52:49.000000000 +0000 ++++ openturns_dev/openturns-1.23/CMakeLists.txt 2024-04-05 08:17:28.143471039 +0000 +@@ -129,6 +129,10 @@ + find_package (LAPACK REQUIRED) + endif () + list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${LAPACK_LIBRARIES}) ++IF (DEFINED CBLAS_LIBRARIES) ++ MESSAGE(STATUS "CBLAS_LIBRARIES is defined... adding to the list of libraries ${CBLAS_LIBRARIES}") ++ LIST (APPEND OPENTURNS_PRIVATE_LIBRARIES ${CBLAS_LIBRARIES}) ++ENDIF() + + if (USE_SPECTRA) + find_package (Spectra 1.0 CONFIG)