fix openturns on Debian 10 - revert Paraview until issue about Exodus plugin underst...

diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh
index 643db4135f1cffae1ff482b49d1344a5d44a93cf..e12a8a0c5521d31ce49137b5188188262c1d9b6c 100755 (executable)
--- 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 efda7e1802c3983bdc231ff8a8ad2b163916d4c2..15b9966ca4681ef916b132917bac7ef5bbb98af3 100755 (executable)
--- 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 5735c81cb594508d6aea9cda7372a990da3fce59..a4e321beff189a2a2ab3dd00e2dec26a34e5e6de 100644 (file)
--- 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