Merge pull request #99 from minrk/5.6.2_h47493a

5.6.2
conda-forge · Dec 12, 2023 · 2ca0931 · 2ca0931
2 parents 3aa0d28 + c69deab
commit 2ca0931
Show file tree

Hide file tree

Showing 14 changed files with 100 additions and 263 deletions.
diff --git a/recipe/CMakeLists.txt b/recipe/CMakeLists.txt
@@ -10,7 +10,7 @@
 #    Oct 2018     Joseph Weston     Modify for use with MUMPS 5.1.x
 ###############################################################################
 
-cmake_minimum_required(VERSION 3.6.0)
+cmake_minimum_required(VERSION 3.14.0)
 
 
 ###############################################################################
@@ -63,7 +63,9 @@ endif()
 # OBJS_COMMON_MOD
 set(
   COMMON_MOD
+  src/mumps_pivnul_mod.F
   src/ana_omp_m.F
+  src/ana_blk_m.F
   src/ana_orderings_wrappers_m.F
   src/double_linked_list.F
   src/fac_asm_build_sort_index_m.F
@@ -85,6 +87,7 @@ set(
 # OBJS_COMMON_OTHER
 set(
   COMMON_OTHER
+  src/ana_blk.F
   src/ana_orderings.F
   src/ana_set_ordering.F
   src/ana_AMDMF.F
@@ -94,6 +97,7 @@ set(
   src/mumps_type2_blocking.F
   src/mumps_version.F
   src/mumps_print_defined.F
+  src/mumps_addr.c
   src/mumps_common.c
   src/mumps_pord.c
   src/mumps_metis.c
@@ -102,7 +106,6 @@ set(
   src/mumps_scotch.c
   src/mumps_scotch64.c
   src/mumps_scotch_int.c
-  src/mumps_size.c
   src/mumps_io.c
   src/mumps_io_basic.c
   src/mumps_io_thread.c
@@ -112,6 +115,7 @@ set(
   src/mumps_save_restore_C.c
   src/mumps_config_file_C.c
   src/mumps_thread_affinity.c
+  src/mumps_register_thread.c
   src/tools_common.F
   src/sol_common.F
 )
@@ -166,10 +170,12 @@ set(
   src/${ARITH}fac_front_LDLT_type1.F
   src/${ARITH}fac_front_LDLT_type2.F
   src/${ARITH}fac_front_type2_aux.F
+  src/${ARITH}fac_sispointers_m.F
   src/${ARITH}fac_lr.F
   src/${ARITH}fac_mem_dynamic.F
   src/${ARITH}fac_omp_m.F
   src/${ARITH}fac_par_m.F
+  src/${ARITH}fac_sol_l0omp_m.F
   src/${ARITH}lr_core.F
   src/${ARITH}lr_stats.F
   src/${ARITH}lr_type.F
@@ -185,7 +191,9 @@ set(
   src/${ARITH}mumps_struc_def.F
   src/${ARITH}omp_tps_m.F
   src/${ARITH}sol_lr.F
+  src/${ARITH}sol_omp_m.F
   src/${ARITH}static_ptr_m.F
+  src/${ARITH}mumps_mpi3_mod.F
 )
 
 # OBJS_OTHER
@@ -269,14 +277,14 @@ target_compile_definitions(${ARITHLIB} PRIVATE -DMUMPS_CALL=__declspec\(dllexpor
 add_executable(${ARITH}simpletest ${EXAMPLE})
 target_link_libraries(${ARITHLIB} mumps_common pord ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
 target_link_libraries(${ARITH}simpletest ${ARITHLIB} mumps_common pord ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-install(TARGETS ${ARITHLIB} DESTINATION bin)
+install(TARGETS ${ARITHLIB})
 install(FILES include/${ARITH}mumps_struc.h include/${ARITH}mumps_root.h include/${ARITH}mumps_c.h DESTINATION include)
 
 endforeach(ARITH)
 set(EXAMPLE examples/c_example.c)
 add_executable(c_example ${EXAMPLE})
 target_link_libraries(c_example dmumps mumps_common pord ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-install(TARGETS mumps_common pord DESTINATION lib)
+install(TARGETS mumps_common pord)
 install(FILES include/mumps_c_types.h include/mumps_compat.h DESTINATION include)
 if(NOT WITH_MPI)
   install(FILES libseq/mpif.h DESTINATION include/mumps_seq)

diff --git a/recipe/Makefile.conda.PAR b/recipe/Makefile.conda.PAR
@@ -56,10 +56,11 @@ CDEFS   = -DAdd_
 
 #Begin Optimized options
 OPTF    = -O  -DALLOW_NON_INIT
-OPTL    = -O
+# Makefile doesn't accept LDFLAGS in C linking, pass via OPTL
+OPTL    = -O $(LDFLAGS)
 OPTC    = -O
 #End Optimized options
 
 INCS = $(INCPAR)
-LIBS = $(LIBPAR)
+LIBS = $(LIBPAR) $(LIBBLAS)
 LIBSEQNEEDED =
diff --git a/recipe/Makefile.conda.SEQ b/recipe/Makefile.conda.SEQ
@@ -58,9 +58,10 @@ CDEFS   = -DAdd_
 
 #Begin Optimized options
 OPTF    = -O  -DALLOW_NON_INIT
-OPTL    = -O
+# Makefile doesn't accept LDFLAGS in C linking, pass via OPTL
+OPTL    = -O $(LDFLAGS)
 OPTC    = -O
 #End Optimized options
 INCS = $(INCSEQ)
-LIBS = $(LIBSEQ)
+LIBS = $(LIBSEQ) $(LIBBLAS)
 LIBSEQNEEDED = libseqneeded
diff --git a/recipe/bld-seq.bat b/recipe/bld-seq.bat
@@ -4,6 +4,8 @@ set src=%cd%
 
 cd work
 copy %RECIPE_DIR%\CMakeLists.txt %src%\CMakeLists.txt
+:: select 64b
+copy %src%\src\mumps_int_def64_h.in %src%\src\mumps_int_def.h
 
 mkdir build
 cd build

diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh
@@ -20,15 +20,17 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
 fi
 
 if [[ "$(uname)" == "Darwin" ]]; then
-  export SONAME="-Wl,-install_name,@rpath/"
+  export SONAME="-install_name,@rpath/"
   export LDFLAGS="${LDFLAGS} -headerpad_max_install_names"
 else
-  export SONAME="-Wl,-soname,"
+  export SONAME="-soname"
 fi
 
 export CC=mpicc
 export FC=mpifort
 
-make all
+export LIBEXT_SHARED=${SHLIB_EXT}
+
+make allshared
 
 cp -av lib/*${SHLIB_EXT} ${PREFIX}/lib
diff --git a/recipe/build-seq.sh b/recipe/build-seq.sh
@@ -21,21 +21,24 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
 fi
 
 if [[ "$(uname)" == "Darwin" ]]; then
-  export SONAME="-Wl,-install_name,@rpath/"
+  export SONAME="-install_name,@rpath/"
   export LDFLAGS="${LDFLAGS} -headerpad_max_install_names"
 else
-  export SONAME="-Wl,-soname,"
+  export SONAME="-soname"
 fi
 
-make all PLAT=_seq
+export LIBEXT_SHARED=${SHLIB_EXT}
+
+make allshared PLAT=_seq
 
 mkdir -p "${PREFIX}/lib"
 mkdir -p "${PREFIX}/include/mumps_seq"
 
+ls lib
 cd lib
-# resolve -lmpiseq and -lmpiseq_seq to libmpiseq_seq-5.1.2.dylib
-ln -sf libmpiseq_seq-${PKG_VERSION}${SHLIB_EXT} libmpiseq${SHLIB_EXT}
-ln -sf libmpiseq_seq-${PKG_VERSION}${SHLIB_EXT} libmpiseq_seq${SHLIB_EXT}
+# resolve -lmpiseq to libmpiseq_seq.dylib
+test -f libmpiseq_seq${SHLIB_EXT}
+ln -s libmpiseq_seq${SHLIB_EXT} libmpiseq${SHLIB_EXT}
 test -f libmpiseq${SHLIB_EXT}
 cd ..
 

diff --git a/recipe/examples-mpilibs.patch b/recipe/examples-mpilibs.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "mumps" %}
-{% set version = "5.2.1" %}
-{% set sha256 = "d988fc34dfc8f5eee0533e361052a972aa69cc39ab193e7f987178d24981744a" %}
+{% set version = "5.6.2" %}
+{% set sha256 = "13a2c1aff2bd1aa92fe84b7b35d88f43434019963ca09ef7e8c90821a8f1d59a" %}
 
 package:
   name: mumps
@@ -11,15 +11,14 @@ source:
   url: https://graal.ens-lyon.fr/MUMPS/MUMPS_{{ version }}.tar.gz
   sha256: {{ sha256 }}
   patches:
-    - shared-pord.patch
-    - shared-mumps.patch
-    - shared-libseq.patch
-    - examples-mpilibs.patch
+    - sonamecomma.patch  # [osx]
+    - soname_mpiseq_pord_mac.patch  # [osx]
+    - soname_mpiseq_pord.patch  # [linux]
     - flang-support.patch
     - mumps_support_only_metis_5_1_1.patch
- 
+
 build:
-  number: 14
+  number: 0
   skip: true  # [win and vc<14]
 
 requirements:
@@ -79,26 +78,21 @@ outputs:
           'mumps_common',
           'pord',
         ] %}
-        - test -f "${PREFIX}/lib/lib{{ lib }}_seq-{{ version }}${SHLIB_EXT}"
         - test -f "${PREFIX}/lib/lib{{ lib }}_seq${SHLIB_EXT}"
-        - test -h "${PREFIX}/lib/lib{{ lib }}_seq${SHLIB_EXT}"
         {% endfor %}
-        - test -f "${PREFIX}/lib/libmpiseq_seq-{{ version }}${SHLIB_EXT}"
         - test -f "${PREFIX}/lib/libmpiseq_seq${SHLIB_EXT}"
-        - test -h "${PREFIX}/lib/libmpiseq_seq${SHLIB_EXT}"
         - test -f "${PREFIX}/lib/libmpiseq${SHLIB_EXT}"
-        - test -h "${PREFIX}/lib/libmpiseq${SHLIB_EXT}"
         - test -f "${PREFIX}/include/mumps_seq/mpi.h"
         - test -f "${PREFIX}/include/mumps_seq/mpif.h"
         {% else %}
         - if not exist "%LIBRARY_PREFIX%\bin\smumps.dll" exit 1
-        - if not exist "%LIBRARY_PREFIX%\bin\smumps.lib" exit 1
+        - if not exist "%LIBRARY_PREFIX%\lib\smumps.lib" exit 1
         - if not exist "%LIBRARY_PREFIX%\bin\dmumps.dll" exit 1
-        - if not exist "%LIBRARY_PREFIX%\bin\dmumps.lib" exit 1
+        - if not exist "%LIBRARY_PREFIX%\lib\dmumps.lib" exit 1
         - if not exist "%LIBRARY_PREFIX%\bin\cmumps.dll" exit 1
-        - if not exist "%LIBRARY_PREFIX%\bin\cmumps.lib" exit 1
+        - if not exist "%LIBRARY_PREFIX%\lib\cmumps.lib" exit 1
         - if not exist "%LIBRARY_PREFIX%\bin\zmumps.dll" exit 1
-        - if not exist "%LIBRARY_PREFIX%\bin\zmumps.lib" exit 1
+        - if not exist "%LIBRARY_PREFIX%\lib\zmumps.lib" exit 1
         - if not exist "%LIBRARY_PREFIX%\lib\mumps_common.lib" exit 1
         - if not exist "%LIBRARY_PREFIX%\lib\pord.lib" exit 1
         - if not exist "%LIBRARY_PREFIX%\include\dmumps_struc.h" exit 1
@@ -147,8 +141,6 @@ outputs:
           'mumps_common',
           'pord',
         ] %}
-        - test -f "${PREFIX}/lib/lib{{ lib }}-{{ version }}${SHLIB_EXT}"
-        - test -h "${PREFIX}/lib/lib{{ lib }}${SHLIB_EXT}"
         - test -f "${PREFIX}/lib/lib{{ lib }}${SHLIB_EXT}"
         {% endfor %}
         - test ! -f "${PREFIX}/lib/libmpiseq*"

diff --git a/recipe/shared-libseq.patch b/recipe/shared-libseq.patch