bos #42837: shape recognition in MEDCOUPLING

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 3f7000e29f35eea278cb7e8a4b135cf0ec8b3084..fd424e4c11a9dfb4b4b68d48842c0ef1db2caf21 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -2,7 +2,7 @@ default :
 {
     name : "MEDCOUPLING"
     build_source : "cmake"
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON"
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_SHAPERECOGN=ON"
     get_source : "git"
     git_info:
     {
@@ -48,7 +48,7 @@ default :
 
 default_win :
 {
-    cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF '
+    cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF -DMEDCOUPLING_ENABLE_SHAPERECOGN=ON '
     depend : [
               "boost",
               "Python",
@@ -64,14 +64,15 @@ default_win :
               "six",
               "pytz",
               "numpy",
-              "CONFIGURATION"
-             ]
+              "CONFIGURATION",
+              "openblas"
+            ]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
 default_MPI :
 {
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PTSCOTCH=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSCOTCH_ROOT_DIR=${SCOTCH_ROOT_DIR} -DPTSCOTCH_ROOT_DIR=${PTSCOTCH_ROOT_DIR} -DPTSCOTCH_INCLUDE_DIRS=${PTSCOTCH_INCLUDE_DIR}"
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PTSCOTCH=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSCOTCH_ROOT_DIR=${SCOTCH_ROOT_DIR} -DPTSCOTCH_ROOT_DIR=${PTSCOTCH_ROOT_DIR} -DPTSCOTCH_INCLUDE_DIRS=${PTSCOTCH_INCLUDE_DIR}  -DMEDCOUPLING_ENABLE_SHAPERECOGN=ON"
     depend : [
               "boost",
               "cppunit",
@@ -97,7 +98,7 @@ default_MPI :
 
 default_MPI_STD:
 {
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}  -DMEDCOUPLING_ENABLE_SHAPERECOGN=ON"
     depend : [
               "boost",
               "cppunit",

diff --git a/products/compil_scripts/openblas-0.3.23.bat b/products/compil_scripts/openblas-0.3.23.bat
index dbe6fb65b03ddb5ca0341be3b22559ada9d43107..01a05992c1874a89e675f3cc7b463d2a5216c464 100644 (file)
--- a/products/compil_scripts/openblas-0.3.23.bat
+++ b/products/compil_scripts/openblas-0.3.23.bat
@@ -28,6 +28,7 @@ mkdir %BUILD_DIR%
 
 SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 

diff --git a/products/env_scripts/lapack.py b/products/env_scripts/lapack.py
index 26ecc76d3985306563055901cd63d90e8cedf794..c15608ee926e3fc82f49f2ecf11a52c2eb95e55a 100644 (file)
--- a/products/env_scripts/lapack.py
+++ b/products/env_scripts/lapack.py
@@ -17,9 +17,19 @@ def set_env(env, prereq_dir, version):
     env.set('BLAS', os.path.join(prereq_dir, 'lib'))
     env.set('LAPACK', os.path.join(prereq_dir, 'lib'))
     env.set('ATLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0'))
+    env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include'))
+    env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib'))
+    env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
   else:
     env.prepend('PATH', os.path.join(prereq_dir, 'bin'))
-
+    env.set('BLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACK', os.path.join(prereq_dir, 'lib'))
+    env.set('ATLAS', os.path.join(prereq_dir, 'lib'))
+    env.set('LAPACKE_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'lapacke-3.8.0'))
+    env.set('LAPACKE_INCDIR', os.path.join(prereq_dir,'include'))
+    env.set('LAPACKE_LIBDIR', os.path.join(prereq_dir,'lib'))
+    env.set('CBLAS_ROOT_DIR', os.path.join(prereq_dir,'lib', 'cmake', 'cblas-3.8.0'))
 def set_nativ_env(env):
     env.set('LAPACKHOME', '/usr')
     env.set('LAPACK_ROOT_DIR', '/')

diff --git a/products/lapack.pyconf b/products/lapack.pyconf
index 232046004393fa61bd91f58d2ff0cbd1b47e5431..5c8e445fb0e98a903bd55801386c7d57eecd2458 100644 (file)
--- a/products/lapack.pyconf
+++ b/products/lapack.pyconf
@@ -8,8 +8,8 @@ default :
     {
         rpm : ["lapack"]
         rpm_dev : ["lapack-devel"]
-        apt : ["liblapack3"]
-        apt_dev : ["liblapack-dev"]
+        apt : ["liblapack3", "liblapacke"]
+        apt_dev : ["liblapack-dev", "liblapacke-dev"]
     }
     environ :
     {