From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 17 Apr 2024 15:40:20 +0000 (+0200)
Subject: bos #41189 - remove duplicate code
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9f24dec27dc324cf9b1273ed054d5dae94d14cf9;p=tools%2Fsat_salome.git

bos #41189 - remove duplicate code
---

diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat
index fa6bcda..e842974 100644
--- a/products/compil_scripts/openturns-1.21.bat
+++ b/products/compil_scripts/openturns-1.21.bat
@@ -266,9 +266,7 @@ if NOT %ERRORLEVEL% == 0 (
     exit 3
 )
 
-tar zxf scikit-learn-0.24.2.tar.gz
-cd  scikit-learn-0.24.2
-%PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL%
+%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% scikit-learn-0.24.2.tar.gz --no-deps --no-use-pep517
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR on python setup.py
     exit 3
@@ -294,82 +292,6 @@ if NOT %ERRORLEVEL% == 0 (
     exit 3
 )
 
-echo
-echo ##########################################################################
-echo scikit-learn 0.24.2
-echo ##########################################################################
-cd %BUILD_DIR%
-mkdir scikit-learn
-cd  %BUILD_DIR%\scikit-learn
-xcopy %SOURCE_DIR%\scikit-learn-0.24.2\*   %BUILD_DIR%\scikit-learn /E /I /Q
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on xcopy
-    exit 3
-)
-
-%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% scikit-learn-0.24.2.tar.gz --no-deps --no-use-pep517
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on python setup.py
-    exit 3
-)
-
-echo
-echo ##########################################################################
-echo decorator 5.1.0
-echo ##########################################################################
-cd %BUILD_DIR%
-mkdir decorator
-cd  %BUILD_DIR%\decorator
-xcopy %SOURCE_DIR%\decorator-5.1.0\*   %BUILD_DIR%\decorator /E /I /Q
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on xcopy
-    exit 3
-)
-
-%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% decorator-5.1.0-py3-none-any.whl --no-deps
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on python setup.py
-    exit 3
-)
-
-echo
-echo ##########################################################################
-echo threadpoolctl 3.0.0
-echo ##########################################################################
-cd %BUILD_DIR%
-mkdir threadpoolctl
-cd  %BUILD_DIR%\threadpoolctl
-xcopy %SOURCE_DIR%\threadpoolctl-3.0.0\*   %BUILD_DIR%\threadpoolctl /E /I /Q
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on xcopy
-    exit 3
-)
-
-%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% threadpoolctl-3.0.0-py3-none-any.whl --no-deps
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on python setup.py
-    exit 3
-)
-
-echo
-echo ##########################################################################
-echo joblib 1.1.0
-echo ##########################################################################
-cd %BUILD_DIR%
-mkdir joblib
-cd  %BUILD_DIR%\joblib
-xcopy %SOURCE_DIR%\joblib-1.1.0\*   %BUILD_DIR%\joblib /E /I /Q
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on xcopy
-    exit 3
-)
-
-%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% joblib-1.1.0-py2.py3-none-any.whl --no-deps
-if NOT %ERRORLEVEL% == 0 (
-    echo ERROR on python setup.py
-    exit 3
-)
-
 echo ##########################################################################
 echo otpod 0.6.10
 echo ##########################################################################
@@ -410,12 +332,5 @@ if NOT %ERRORLEVEL% == 0 (
     exit 3
 )
 
-if %PYTHON_VERSION% == 3.9 (
-  copy /Y /B %PRODUCT_INSTALL%\bin\OT.dll %PRODUCT_INSTALL%\lib\site_packages\openturns\OT.dll
-  copy /Y /B %PRODUCT_INSTALL%\bin\otmoris.dll %PRODUCT_INSTALL%\lib\site_packages\openturns\otmoris.dll
-  copy /Y /B %PRODUCT_INSTALL%\bin\otrobopt.dll %PRODUCT_INSTALL%\lib\site_packages\openturns\otrobopt.dll
-  copy /Y /B %PRODUCT_INSTALL%\bin\otfftw.dll %PRODUCT_INSTALL%\lib\site_packages\openturns\otfftw.dll
-  copy /Y /B %PRODUCT_INSTALL%\bin\otsubsetinverse.dll %PRODUCT_INSTALL%\lib\site_packages\openturns\otsubsetinverse.dll
-)
 echo
 echo "########## END"