From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 17 Mar 2022 12:31:34 +0000 (+0100)
Subject: fix openturns on Debian 10 -  revert Paraview until issue about Exodus plugin underst... 
X-Git-Tag: V9_9_0~134
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e930a7d2a19346be02199d1d7713bd512ec96073;p=tools%2Fsat_salome.git

fix openturns on Debian 10 -  revert Paraview until issue about Exodus plugin understood - fix Medfile windows bug introduced
---

diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh
index 643db41..e12a8a0 100755
--- a/products/compil_scripts/ParaView-5.9.0.sh
+++ b/products/compil_scripts/ParaView-5.9.0.sh
@@ -247,19 +247,19 @@ if [ -n "$GDAL_ROOT_DIR" ]; then
 	CMAKE_OPTIONS+=" -DGDAL_LIBRARY=$GDAL_ROOT_DIR/lib/libgdal.so"
 	CMAKE_OPTIONS+=" -DGDAL_INCLUDE_DIR=$GDAL_ROOT_DIR/include"
     fi
-    CMAKE_OPTIONS+=" -DPARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=ON"
-    CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_GeographicalMap:BOOL=ON"
+#    CMAKE_OPTIONS+=" -DPARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=ON"
+#    CMAKE_OPTIONS+=" -DPARAVIEW_PLUGIN_ENABLE_GeographicalMap:BOOL=ON"
 fi
 
 # NETCDF see bos #26944
-if [ -n "$NETCDF_ROOT_DIR" ]; then
-    echo "INFO: switching ON NETCDF"
-    CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON"
-    if [ "NETCDF_ROOT_DIR" != "/usr" ]; then
-        CMAKE_OPTIONS+=" -DNETCDF_ROOT_DIR=$NETCDF_ROOT_DIR"
-    fi
-    CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersParallelGeometry=YES"
-fi
+# if [ -n "$NETCDF_ROOT_DIR" ]; then
+#     echo "INFO: switching ON NETCDF"
+#     CMAKE_OPTIONS+=" -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON"
+#     if [ "NETCDF_ROOT_DIR" != "/usr" ]; then
+#         CMAKE_OPTIONS+=" -DNETCDF_ROOT_DIR=$NETCDF_ROOT_DIR"
+#     fi
+#     CMAKE_OPTIONS+=" -DVTK_MODULE_ENABLE_VTK_FiltersParallelGeometry=YES"
+# fi
 
 echo
 echo "*** cmake" ${CMAKE_OPTIONS}
diff --git a/products/compil_scripts/openturns-1.17.sh b/products/compil_scripts/openturns-1.17.sh
index efda7e1..15b9966 100755
--- a/products/compil_scripts/openturns-1.17.sh
+++ b/products/compil_scripts/openturns-1.17.sh
@@ -150,7 +150,6 @@ if [[ -d "$SOURCE_DIR/otfftw-0.11" ]]; then
             echo "WARNING: skipping $k.."
             continue
         fi
-
         cd  $BUILD_DIR
         mkdir ${BUILD_DIR}/$k
         cd ${BUILD_DIR}/$k 
@@ -208,6 +207,31 @@ if [[ -d "$SOURCE_DIR/otfftw-0.11" ]]; then
         echo
         echo "*** C O M P O N E N T : $k-${OTP[$k]} "
 	
+	if [[ $DIST_NAME == "DB" && $DIST_VERSION == "10" && $APPLICATION_NAME =~ native && $k == "otfmi" ]]; then
+	    echo "INFO: install dill-0.3.4"
+	    ${PYTHONBIN} -m pip install $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
+	fi
+	if [[ $DIST_NAME == "DB" && $DIST_VERSION == "10" && $APPLICATION_NAME =~ native && $k == "otpod" ]]; then
+	    echo "INFO: install scikit-learn-0.24.2"
+	    ${PYTHONBIN} -m pip install $SOURCE_DIR/scikit-learn-0.24.2/scikit-learn-0.24.2.tar.gz --no-deps  --prefix=$PRODUCT_INSTALL
+	    if [ $? -ne 0 ]
+	    then
+		echo "FATAL: could not install scikit-0.24.2"
+		exit 6
+	    fi
+	    echo "INFO: install threadpoolctl-3.0.0"
+	    ${PYTHONBIN} -m pip install $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
+	    fi
+	fi
         if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $APPLICATION_NAME =~ native && $k == "otpod" ]]; then
             echo "*** skipping: since system Cython too old"
             continue
diff --git a/products/medfile.pyconf b/products/medfile.pyconf
index 5735c81..a4e321b 100644
--- a/products/medfile.pyconf
+++ b/products/medfile.pyconf
@@ -41,7 +41,8 @@ version_4_1_1 :
 
 version_4_1_1_win :
 {
-  patches : ['med-4.1.0_win_3x_files_support.patch']
+    compil_script :  "medCMake.bat"
+    patches : ['med-4.1.0_win_3x_files_support.patch']
 }
 
 # needed in order to screen with windows version - see below