Version 7.8.0. ortage swig 4.1.0. Options cmake MACHINE_TYPES, FORMAT_MLI et FORMAT_MLI2. Suppression cibles cmake archive et export. Détection du répertoire d'installation du binding python identique à celle de spack_organizer.

Charles PIGNEROL · Charles PIGNEROL · commit 38399d9f1b41 · 2023-07-21T15:01:30.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.14)
+cmake_minimum_required (VERSION 3.20)
 
 project (Lima CXX C Fortran)
 
@@ -8,8 +8,16 @@ include (cmake/common.cmake)
 
 set (Lima_VERSION ${LIMA_VERSION})
 
-set (CMAKE_VERBOSE_MAKEFILE ON)
+option (VERBOSE_MAKEFILE ON)
 option (BUILD_SHARED_LIBS "Creation de bibliotheques dynamiques (defaut : ON)" ON)
 
+# Divers dépendances optionnelles :
+option (MACHINE_TYPES "Définition des types numériques simples." ON)
+
+# Les formats de fichiers optionnellement supportés :
+option (FORMAT_MLI "Format obsolète déconseillé en externe. Requiert HDF145." ON)
+option (FORMAT_MLI2 "Format remplaçant le format MLI recommandé partout. Requiert HDF 5 v >= 1.10.0." ON)
+
 add_subdirectory (src)
 enable_testing ( )
+
diff --git a/cmake/FindHdf145.cmake b/cmake/FindHdf145.cmake
@@ -0,0 +1,77 @@
+#
+# Surcouche CEA/DAM : ajout des targets (en fin de fichier)
+#
+# Version du 12/08/22
+#
+
+#
+# The module defines the following variables:
+#  HDF145_FOUND - the system has HDF145
+#  HDF145_INCLUDE_DIR - where to find HDF145/hdf5.h
+#  HDF145_INCLUDE_DIRS - HDF145 includes
+#  HDF145_LIBRARY - where to find the HDF145 library
+#  HDF145CPP_LIBRARY - where to find the HDF145 C++ API library
+#  HDF145_LIBRARIES - additional libraries
+#  HDF145_MAJOR_VERSION - major version
+#  HDF145_MINOR_VERSION - minor version
+#  HDF145_PATCH_VERSION - patch version
+#  HDF145_VERSION_STRING - version (ex. 5.2.1)
+#  HDF145_ROOT_DIR - root dir
+
+find_path (HDF145_INCLUDE_DIR NAMES HDF145/hdf5.h PATH_SUFFIXES HDF145)
+
+if (HDF145_INCLUDE_DIR)
+	set (HDF145_FOUND TRUE)
+	if (NOT ZLIB_FOUND) 
+		find_package (ZLIB REQUIRED)
+	endif (NOT ZLIB_FOUND)
+#	message( "HDF145_INCLUDE_DIR: '${HDF145_INCLUDE_DIR}'" )
+	string (REGEX REPLACE "(.*)/include.*" "\\1" HDF145_ROOT_DIR ${HDF145_INCLUDE_DIR})
+#	message( "HDF145_ROOT_DIR: '${HDF145_ROOT_DIR}'" )
+	find_library (HDF145_LIBRARY NAMES hdf145 PATHS ${HDF145_ROOT_DIR} PATH_SUFFIXES lib lib64)
+	find_library (HDF145CPP_LIBRARY NAMES hdf145_cpp PATHS ${HDF145_ROOT_DIR} PATH_SUFFIXES lib lib64)
+#	message( "HDF145_LIBRARY: '${HDF145_LIBRARY}'" " HDF145CPP_LIBRARY: '${HDF145CPP_LIBRARY}'")
+
+
+set (HDF145_INCLUDE_DIRS ${HDF145_INCLUDE_DIR})
+
+# version
+set (HDF145_MAJOR_VERSION "1")
+set (HDF145_MINOR_VERSION "3")
+set (HDF145_PATCH_VERSION "0")
+set (HDF145_VERSION_STRING "1.3.0")
+
+set (HDF145_LIBRARIES ${HDF145CPP_LIBRARY} ${HDF145_LIBRARY})
+
+mark_as_advanced (
+  HDF145_LIBRARY
+  HDF145CPP_LIBRARY
+  HDF145_LIBRARIES
+  HDF145_INCLUDE_DIR
+  HDF145_INCLUDE_DIRS
+  HDF145_MAJOR_VERSION
+  HDF145_MINOR_VERSION
+  HDF145_PATCH_VERSION
+  HDF145_VERSION_STRING
+  HDF145_ROOT_DIR
+)
+
+if (NOT TARGET HDF145::hdf145_cpp)
+	set (HDF145_TARGET "HDF145::hdf145")
+	set (HDF145CPP_TARGET "HDF145::hdf145_cpp")
+
+	add_library (${HDF145_TARGET} SHARED IMPORTED)
+	add_library (${HDF145CPP_TARGET} SHARED IMPORTED)
+	set_target_properties (HDF145::hdf145 PROPERTIES
+		INTERFACE_INCLUDE_DIRECTORIES ${HDF145_INCLUDE_DIR}
+		IMPORTED_LOCATION ${HDF145_LIBRARY}
+		INTERFACE_LINK_LIBRARIES "${HDF145_LIBRARY};ZLIB::ZLIB"
+	)
+	set_target_properties (HDF145::hdf145_cpp PROPERTIES
+		INTERFACE_INCLUDE_DIRECTORIES ${HDF145_INCLUDE_DIR}
+		IMPORTED_LOCATION ${HDF145CPP_LIBRARY}
+		INTERFACE_LINK_LIBRARIES "${HDF145CPP_LIBRARY};HDF145::hdf145"
+	)
+endif (NOT TARGET HDF145::hdf145_cpp)
+
+endif (HDF145_INCLUDE_DIR)
diff --git a/cmake/python_binding.cmake b/cmake/python_binding.cmake
@@ -1,21 +1,69 @@
+# Version 0.5 (21/6/23, support Python 2/Python 3, répertoire d'installation des modules python fourni par le python utilisé)
+
+# Par défaut on utilise Python 2
+
 include (GNUInstallDirs)
 find_package (SWIG 3 REQUIRED)
 
-include (${SWIG_USE_FILE})
 
 #find_package (Python REQUIRED COMPONENTS Interpreter Development)	# Rem : Python3 a la priorité => inutilisé car empêche l'accès à Python2
-if (NOT USE_PYTHON_3)
+if (USE_PYTHON_3)
+	message (STATUS "========================================= UTILISATION DE PYTHON 3 =========================================")
+	find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
+	set (Python_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
+	set (Python_EXECUTABLE ${Python3_EXECUTABLE})
+	set (Python_VERSION ${Python3_VERSION})
+	set (Python_LIBRARIES ${Python3_LIBRARIES})
+	set (Python_LIBRARY_DIRS ${Python3_LIBRARY_DIRS})
+	set (PYTHON_MAJOR_VERSION 3)
+elseif (USE_PYTHON_2)
+	message (STATUS "========================================= UTILISATION DE PYTHON 2 =========================================")
 	find_package (Python2 REQUIRED COMPONENTS Interpreter Development)
-	set (PYTHON_BINDING_DIR ${CMAKE_INSTALL_LIBDIR}/python${Python2_VERSION_MAJOR}.${Python2_VERSION_MINOR}/site-packages/)
 	set (Python_INCLUDE_DIRS ${Python2_INCLUDE_DIRS})
+	set (Python_EXECUTABLE ${Python2_EXECUTABLE})
+	set (Python_VERSION ${Python2_VERSION})
+	set (Python_LIBRARIES ${Python2_LIBRARIES})
+	set (Python_LIBRARY_DIRS ${Python2_LIBRARY_DIRS})
 	set (PYTHON_MAJOR_VERSION 2)
 else ( )
-	find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
-	set (PYTHON_BINDING_DIR ${CMAKE_INSTALL_LIBDIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/)
-	set (Python_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
-	set (PYTHON_MAJOR_VERSION 3)
-endif (NOT USE_PYTHON_3)
+	message (STATUS "========================================= VERSION DE PYTHON NON DEFINIE =========================================")
+	message (FATAL_ERROR "==> UTILISEZ -DUSE_PYTHON_2 OU -DUSE_PYTHON_3 A LA LIGNE DE COMMANDE")
+endif (USE_PYTHON_3)
+
+
+# Recherche du répertoire d'installation des modules (procédure spack organizer) : 
+# get python installation path
+macro (_set_from_python outvar python_code)
+	if (NOT ${outvar})
+		execute_process (
+			COMMAND ${Python_EXECUTABLE} -c "${python_code}"
+			OUTPUT_VARIABLE ${outvar}
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		if (NOT ${outvar})
+			message (FATAL_ERROR "Failed to detect ${outvar} from command:${Python_EXECUTABLE} -c ${python_code}")
+		endif ( )
+	endif ( )
+endmacro ( )
+
+_set_from_python (_GET_PYTHON_SITEARCH "import sys; from distutils import sysconfig; sys.stdout.write (sysconfig.get_python_lib (plat_specific=True, standard_lib=False, prefix=''))")
+set (PYTHON_BINDING_DIR ${_GET_PYTHON_SITEARCH})
+set (CMAKE_PYTHON_RPATH_DIR ${CMAKE_INSTALL_PREFIX}/${_GET_PYTHON_SITEARCH})
+
+include (${SWIG_USE_FILE})
+
+message (STATUS "========================================= VARIABLES LIEES A PYTHON =========================================")
+message (STATUS "PYTHON_BINDING_DIR=${PYTHON_BINDING_DIR}")
+message (STATUS "Python_INCLUDE_DIRS=${Python_INCLUDE_DIRS}")
+message (STATUS "Python_EXECUTABLE=${Python_EXECUTABLE}")
+message (STATUS "Python_VERSION=${Python_VERSION} PYTHON_MAJOR_VERSION=${PYTHON_MAJOR_VERSION}")
+message (STATUS "Python_LIBRARIES=${Python_LIBRARIES}")
+message (STATUS "Python_LIBRARY_DIRS=${Python_LIBRARY_DIRS}")
+message (STATUS "PYTHON_BINDING_DIR=${PYTHON_BINDING_DIR}")
+message (STATUS "CMAKE_PYTHON_RPATH_DIR=${CMAKE_PYTHON_RPATH_DIR}")
+message (STATUS "============================================================================================================")
+
+
+
+
 
-# Répertoire d'installation des modules (pour le RPATH) :
-set (CMAKE_PYTHON_RPATH_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_BINDING_DIR})
 
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -3,8 +3,8 @@
 #
 
 set (LIMA_MAJOR_VERSION "7")
-set (LIMA_MINOR_VERSION "7")
-set (LIMA_RELEASE_VERSION "9")
+set (LIMA_MINOR_VERSION "8")
+set (LIMA_RELEASE_VERSION "0")
 set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})
 
 
diff --git a/installation.txt b/installation.txt
@@ -2,10 +2,10 @@
 # INSTALLATION DE LA BIBLIOTHEQUE Lima++
 #
 
-Elle requiert une version supérieure ou égale à la version 3.14.0 de cmake.
+Elle requiert une version supérieure ou égale à la version 3.14.0 de cmake. La version 3.24.2 est recommandée si le choix du python utilisé est important.
 
 
-CONFIGURATION DE BASE : lecteurs mali [mli][mli2] ideas gibi castem modulef [icemcfd] dyna2d dyna3d abaqus
+CONFIGURATION DE BASE : lecteurs mali mli mli2 ideas gibi castem modulef [icemcfd] dyna2d dyna3d abaqus
 =======================
 
 
@@ -16,8 +16,8 @@ A la ligne de commande : depuis le répertoire racine contenant les sources de L
 
 cmake -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_Fortran_COMPILER=/usr/bin/gfortran -DCMAKE_CXX_FLAGS="-std=c++11" -DCMAKE_Fortran_FLAGS="-fdefault-integer-8 -fdefault-real-8 -fdefault-double-8" \
       -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_XLMLIMA=ON -DBUILD_TESTS:BOOL=ON -DBUILD_SCRIPTING:BOOL=ON -DBUILD_SHARED_LIBS:BOOL=ON -DINT_8:BOOL=ON -DREAL_8:BOOL=ON \
-      -DSWIG_EXECUTABLE=/opt/swig/3.0.12/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0 -DHDF145_INCLUDE_DIR=/opt/hdf145/1.3.0/include -DHDF145CPP_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145_cpp.so -DHDF145_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145.so \
-      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.7.8
+      -DSWIG_EXECUTABLE=/opt/swig/4.1.1/bin/swig -DPython2_ROOT_DIR=/usr/lib/python2.7 -DHDF5_ROOT=/opt/HDF5/1.12.0 -DHDF145_INCLUDE_DIR=/opt/hdf145/1.3.0/include -DHDF145CPP_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145_cpp.so -DHDF145_LIBRARY=/opt/hdf145/1.3.0/lib/libhdf145.so \
+      -B /tmp/lima_build_dir -DCMAKE_INSTALL_PREFIX=/opt/Lima/7.7.10
 cmake --build /tmp/lima_build_dir
 cmake --install /tmp/lima_build_dir
 
@@ -33,7 +33,13 @@ cmake --install /tmp/build_lima
 REMARQUES :
 ============
 
-L'option -DBUILD_XLMLIMA=ON permet la compilation de l'utilitaire xlmlima (informations, changement de formats, préparations, comparaison).
+L'option -DMACHINE_TYPES:BOOL=OFF permet de désactiver l'utilisation de MachineTypes - définition des types numériques simples - dans les interfaces.
+
+L'option -DFORMAT_MLI:BOOL=OFF permet de désactiver le lecteur/écrivain obsolète "mli" qui repose sur la bibliothèque HDF 5 1.4.5.
+
+L'option -DFORMAT_MLI2:BOOL=ON permet de désactiver le lecteur/écrivain "mli2" qui repose sur une version supérieure ou égale à 1.10.0 de la bibliothèque HDF 5.
+
+L'option -DBUILD_XLMLIMA:BOOL=ON permet la compilation de l'utilitaire xlmlima (informations, changement de formats, préparations, comparaison).
 
 Le format mli2, qui repose sur une version supérieure ou égale à 1.10.0 de HDF5, est automatiquement réalisée si cmake trouve HDF5 avec entêtes et bibliothèques C++.
 
@@ -64,6 +70,8 @@ Pour avoir un binding python il faut en plus utiliser la directive cmake -DBUILD
 A noter que si cmake croise sur son chemin une version 3 de python celle-ci sera retenue, même si python 2 est demandé et renseigné. C'est
 pour cette raison que la directive find_package (Python VERSION) n'est pas utilisée dans les fichiers cmake.
 
+Une version récente de cmake (ex : 3.24) est recommandée afin de s'assurer que le Python utilisé correspond bien à celui demandé (Python2_ROOT_DIR ou Python3_ROOT_DIR).
+
 
 Binding python 2 :
 ------------------ 
diff --git a/src/Lima/CMakeLists.txt b/src/Lima/CMakeLists.txt
@@ -3,9 +3,16 @@ set (CURRENT_PACKAGE_MACRO_NAME "LIMA_KERNEL")
 include (${CMAKE_SOURCE_DIR}/cmake/version.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/common.cmake)
 include (${CMAKE_SOURCE_DIR}/cmake/workarounds.cmake)
-#include (${CMAKE_SOURCE_DIR}/cmake/FindHdf145.cmake)
+if (MACHINE_TYPES)
+	find_package (MachineTypes REQUIRED)
+endif (MACHINE_TYPES)
+if (FORMAT_MLI)
+	include (${CMAKE_SOURCE_DIR}/cmake/FindHdf145.cmake)
+endif (FORMAT_MLI)
 unset (HDF5_USE_STATIC_LIBRARIES)
-find_package (HDF5 COMPONENTS CXX)
+if (FORMAT_MLI2)
+	find_package (HDF5 COMPONENTS CXX REQUIRED)
+endif (FORMAT_MLI2)
 find_package (Threads)
 
 # EXPURGE_BEGINNING_TAG FIND_LOCAL_DEPENDENCIES
@@ -133,6 +140,6 @@ install (EXPORT ${CMAKE_PACKAGE_TARGETS_NAME}
 install (FILES ${CMAKE_PACKAGE_CONFIG_FILE} ${CMAKE_PACKAGE_VERSION_FILE} DESTINATION ${ConfigPackageLocation} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ)
 
 # Le fichier FindHDF5.cmake :
-#install(FILES ${CMAKE_SOURCE_DIR}/cmake/FindHdf145.cmake DESTINATION ${ConfigPackageLocation} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ)
+install(FILES ${CMAKE_SOURCE_DIR}/cmake/FindHdf145.cmake DESTINATION ${ConfigPackageLocation} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ)
 
 
diff --git a/src/LimaScripting/LimaScripting.i b/src/LimaScripting/LimaScripting.i
@@ -37,24 +37,23 @@ using namespace Lima;
   } 
 }
 
-%typemap(python, in) const string& {
+%typemap(in) const string& {
   if(!PyString_Check($1)) {
     PyErr_SetString(PyExc_TypeError, "not a string");
     return NULL;
   }
   $1 = new IN_STD string(PyString_AsString($1));
 }
 
-%typemap(python, freearg) const IN_STD string& {
+%typemap(freearg) const IN_STD string& {
   delete $1;
 }
 
-//%typemap(python, out) const string& {
 %typemap(out) const IN_STD string& {
   $result = PyString_FromString($1->c_str());
 }
 
-%typemap(python, out) IN_STD string {
+%typemap(out) IN_STD string {
   $result = PyString_FromString($1.c_str());
 }
 
diff --git a/src/Xlmlima_exe/XlmLimaComparer.cpp b/src/Xlmlima_exe/XlmLimaComparer.cpp

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`set (LIMA_MAJOR_VERSION "7")`
`6`		`-set (LIMA_MINOR_VERSION "7")`
`7`		`-set (LIMA_RELEASE_VERSION "9")`
	`6`	`+set (LIMA_MINOR_VERSION "8")`
	`7`	`+set (LIMA_RELEASE_VERSION "0")`
`8`	`8`	`set (LIMA_VERSION ${LIMA_MAJOR_VERSION}.${LIMA_MINOR_VERSION}.${LIMA_RELEASE_VERSION})`
`9`	`9`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -37,24 +37,23 @@ using namespace Lima;`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`-%typemap(python, in) const string& {`
	`40`	`+%typemap(in) const string& {`
`41`	`41`	`if(!PyString_Check($1)) {`
`42`	`42`	`PyErr_SetString(PyExc_TypeError, "not a string");`
`43`	`43`	`return NULL;`
`44`	`44`	`}`
`45`	`45`	`$1 = new IN_STD string(PyString_AsString($1));`
`46`	`46`	`}`
`47`	`47`
`48`		`-%typemap(python, freearg) const IN_STD string& {`
	`48`	`+%typemap(freearg) const IN_STD string& {`
`49`	`49`	`delete $1;`
`50`	`50`	`}`
`51`	`51`
`52`		`-//%typemap(python, out) const string& {`
`53`	`52`	`%typemap(out) const IN_STD string& {`
`54`	`53`	`$result = PyString_FromString($1->c_str());`
`55`	`54`	`}`
`56`	`55`
`57`		`-%typemap(python, out) IN_STD string {`
	`56`	`+%typemap(out) IN_STD string {`
`58`	`57`	`$result = PyString_FromString($1.c_str());`
`59`	`58`	`}`
`60`	`59`