FD32: node seems to have been updated few days before Christmas break (to be confirme...

diff --git a/applications/SALOME-9.8.0-native.pyconf b/applications/SALOME-9.8.0-native.pyconf
index 6aa87537e0cf10aff810913f3205676b058be9cd..b1dea3e0d6a73d9f0652e1338818981c8980fa0f 100644 (file)
--- a/applications/SALOME-9.8.0-native.pyconf
+++ b/applications/SALOME-9.8.0-native.pyconf
@@ -201,7 +201,7 @@ __overwrite__ :
     {
         #
         __condition__ : "VARS.dist in ['UB20.04', 'CO8', 'FD32']"
-       'APPLICATION.products.ParaView' : {tag: '5.9.0', base : 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4'}
+       'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section: 'version_5_9_0_CO8_FD32_UB20_0_4'}
     }
     {
         # On DB10, ParaView fails to find xmlpatterns executable : ParaViewClient.cmake try to find it
@@ -216,30 +216,31 @@ __overwrite__ :
         # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
         # To avoid its missing (system_info pyconf key doesn't handle this use case), we embed it.
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base : 'no', section : 'version_0_9_10_no_pip'}
+        'APPLICATION.products.sphinxintl' : {tag: '0.9.10', base: 'no', section: 'version_0_9_10_no_pip'}
         'APPLICATION.products.cmake' : '3.12.1'
     }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        'APPLICATION.products.PyFMI'     : {tag:'2.5',  base:  'no', section: 'version_2_5_no_pip'}
+        'APPLICATION.products.openturns' : {tag:'1.17', base:  'no', section: 'version_1_17_FD32' }
+    }
     {
         # FD 34 qt5 package is qt5-qtbase-devel.
         __condition__ : "VARS.dist in ['FD34']"
         'APPLICATION.products.omniORB'  : '4.2.4'
         'APPLICATION.products.omniORBpy': '4.2.4'
-        'APPLICATION.products.PyFMI'    : {tag: '2.5', base: 'no', section: 'version_2_5_no_pip'}
-        'APPLICATION.products.root'     : {tag:'6.22.02', base : 'no', section : 'version_6_22_02_FD34'}
-    }
-    {
-        __condition__ : "VARS.dist in ['FD32']"
-        'APPLICATION.products.PyFMI'    : {tag:'2.5', base:  'no', section : 'version_2_5_no_pip'}
+        'APPLICATION.products.PyFMI'    : {tag: '2.5',    base: 'no', section: 'version_2_5_no_pip'  }
+        'APPLICATION.products.root'     : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34'}
     }
     {
         __condition__ : "VARS.dist in ['DB10', 'UB20.04']"
         'APPLICATION.products.cminpack': 'native'
-        'APPLICATION.products.PyFMI'    : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'}
+        'APPLICATION.products.PyFMI'    : {tag:'2.5', base: 'no', section: 'version_2_5_no_pip'}
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
         'APPLICATION.products.cminpack'    : '1.3.6'
-        'APPLICATION.products.PyFMI'       : {tag:'2.5', base : 'no', section : 'version_2_5_no_pip'}
-        'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section : 'version_0_6_1_no_pip'}
+        'APPLICATION.products.PyFMI'       : {tag:'2.5',   base: 'no',  section: 'version_2_5_no_pip'  }
+        'APPLICATION.products.statsmodels' : {tag:'0.6.1', base : 'no', section: 'version_0_6_1_no_pip'}
     }
 ]

diff --git a/products/compil_scripts/openturns-1.17.sh b/products/compil_scripts/openturns-1.17.sh
index 25a22d51f5be15b0bd0b07036306b05aea127c34..38d1e264fce10cc13fda214e392d3df52a0ec52a 100755 (executable)
--- a/products/compil_scripts/openturns-1.17.sh
+++ b/products/compil_scripts/openturns-1.17.sh
@@ -249,6 +249,16 @@ if [[ -d "$SOURCE_DIR/otfftw-0.11" ]]; then
                    exit 6
                fi
            fi
+       else
+           if [[ $DIST_NAME == "FD" && $DIST_VERSION == "32" && $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
+           fi
        fi
 
         cd  $BUILD_DIR

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index 4b09d0a76e8905bc942861d8be6c94b179a7a962..c6f0a72442f9cbc1b7bdc81422c0fe92a3975d30 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -54,6 +54,14 @@ version_1_17 :
     opt_depend : ['pandas', 'statsmodels']
 }
 
+version_1_17_FD32 :
+{
+    compil_script :  "openturns-1.17" + $VARS.scriptExtension
+    patches : ['openturns-1.17.0001.patch', 'openturns-1.17.0002.patch']
+    depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'cminpack', 'FMILibrary', 'PyFMI']
+    opt_depend : ['pandas', 'statsmodels']
+}
+
 version_1_17_win :
 {
     properties :

diff --git a/products/patches/openturns-1.17.0002.patch b/products/patches/openturns-1.17.0002.patch
new file mode 100644 (file)
index 0000000..31f89d1
--- /dev/null
+++ b/products/patches/openturns-1.17.0002.patch
@@ -0,0 +1,12 @@
+diff -Naur openturns_ref/otpod-0.6.7/setup.py  openturns_new/otpod-0.6.7/setup.py
+--- openturns_ref/otpod-0.6.7/setup.py 2022-01-04 09:49:08.874177684 +0100
++++ openturns_new/otpod-0.6.7/setup.py 2022-01-04 09:48:41.115647314 +0100
+@@ -13,7 +13,7 @@
+ 
+ install_requires=['statsmodels>=0.6.1',
+                   'numpy>=1.10.4',
+-                  'scikit-learn>=0.17',
++                  'scikit-learn==0.24.2',
+                   'matplotlib>=1.5.1',
+                   'scipy>=0.17.0',
+                   'decorator>=4.0.9']