phynexis-deps/arpack-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installation tests: compile and run icb_parpack_cpp.

Browse Source
This commit is contained in:
Franck HOUSSEN
2023-08-12 18:02:03 +02:00
parent f4b2f31a64
commit 2239bf22e6
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/tstCMakeInstall.sh.in
+28 -1
View File
@@ -48,6 +48,7 @@ cp "@PROJECT_SOURCE_DIR@/PARPACK/EXAMPLES/MPI/pdndrv3.f" .
cp "@PROJECT_SOURCE_DIR@/TESTS/icb_arpack_c.c" .
cp "@PROJECT_SOURCE_DIR@/TESTS/icb_arpack_cpp.cpp" .
cp "@PROJECT_SOURCE_DIR@/PARPACK/TESTS/MPI/icb_parpack_c.c" .
cp "@PROJECT_SOURCE_DIR@/PARPACK/TESTS/MPI/icb_parpack_cpp.cpp" .
echo "cmake_minimum_required(VERSION 3.0)" > CMakeLists.txt
echo "" >> CMakeLists.txt
@@ -55,7 +56,7 @@ echo "project(tstCMakeInstall Fortran C CXX)" >> CMake
echo "" >> CMakeLists.txt
echo "find_package(BLAS REQUIRED)" >> CMakeLists.txt
echo "find_package(LAPACK REQUIRED)" >> CMakeLists.txt
echo "find_package(MPI REQUIRED COMPONENTS Fortran C)" >> CMakeLists.txt
echo "find_package(MPI REQUIRED COMPONENTS Fortran C CXX)" >> CMakeLists.txt
echo "find_package(arpackng REQUIRED)" >> CMakeLists.txt
echo "" >> CMakeLists.txt
echo "add_executable(dnbdr1 dnband.f dnbdr1.f)" >> CMakeLists.txt
@@ -105,6 +106,18 @@ echo "target_include_directories(icb_parpack_c INTERFACE ARPACK::ARPACK)" >> C
echo "target_link_libraries(icb_parpack_c ARPACK::ARPACK)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_c INTERFACE PARPACK::PARPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_c PARPACK::PARPACK)" >> CMakeLists.txt
echo "" >> CMakeLists.txt
echo "add_executable(icb_parpack_cpp icb_parpack_cpp.cpp)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp INTERFACE BLAS::BLAS)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp BLAS::BLAS)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp INTERFACE LAPACK::LAPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp LAPACK::LAPACK)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp INTERFACE MPI::MPI_CXX)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp MPI::MPI_CXX)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp INTERFACE ARPACK::ARPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp ARPACK::ARPACK)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp INTERFACE PARPACK::PARPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp PARPACK::PARPACK)" >> CMakeLists.txt
echo "" >> CMakeLists.txt
echo "find_package(PkgConfig REQUIRED)" >> CMakeLists.txt
echo "pkg_check_modules(ARPACK IMPORTED_TARGET REQUIRED arpack${LIBSUFFIX}${ITF64SUFFIX})" >> CMakeLists.txt
@@ -157,6 +170,18 @@ echo "target_include_directories(icb_parpack_c_pkg INTERFACE PkgConfig::ARPACK)"
echo "target_link_libraries(icb_parpack_c_pkg PkgConfig::ARPACK)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_c_pkg INTERFACE PkgConfig::PARPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_c_pkg PkgConfig::PARPACK)" >> CMakeLists.txt
echo "" >> CMakeLists.txt
echo "add_executable(icb_parpack_cpp_pkg icb_parpack_cpp.cpp)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp_pkg INTERFACE BLAS::BLAS)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp_pkg BLAS::BLAS)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp_pkg INTERFACE LAPACK::LAPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp_pkg LAPACK::LAPACK)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp_pkg INTERFACE MPI::MPI_CXX)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp_pkg MPI::MPI_CXX)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp_pkg INTERFACE PkgConfig::ARPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp_pkg PkgConfig::ARPACK)" >> CMakeLists.txt
echo "target_include_directories(icb_parpack_cpp_pkg INTERFACE PkgConfig::PARPACK)" >> CMakeLists.txt
echo "target_link_libraries(icb_parpack_cpp_pkg PkgConfig::PARPACK)" >> CMakeLists.txt
# 5. Build and test this new project with cmake: for this to be possible, find_package must work.
@@ -171,9 +196,11 @@ make all VERBOSE=1 || exit 1
./icb_arpack_cpp || exit 1
mpirun -n 2 ./pdndrv1 || exit 1
mpirun -n 2 ./icb_parpack_c || exit 1
mpirun -n 2 ./icb_parpack_cpp || exit 1
./dnbdr3 || exit 1
./icb_arpack_c_pkg || exit 1
./icb_arpack_cpp_pkg || exit 1
mpirun -n 2 ./pdndrv3 || exit 1
mpirun -n 2 ./icb_parpack_c_pkg || exit 1
mpirun -n 2 ./icb_parpack_cpp_pkg || exit 1
pkg-config/tstAutotoolsInstall.sh.in
+13 -1
View File
@@ -45,6 +45,7 @@ cp -fr "${PROJECT_SOURCE_DIR}/m4" .
cp "${PROJECT_SOURCE_DIR}/TESTS/icb_arpack_c.c" .
cp "${PROJECT_SOURCE_DIR}/TESTS/icb_arpack_cpp.cpp" .
cp "${PROJECT_SOURCE_DIR}/PARPACK/TESTS/MPI/icb_parpack_c.c" .
cp "${PROJECT_SOURCE_DIR}/PARPACK/TESTS/MPI/icb_parpack_cpp.cpp" .
echo "AC_PREREQ([2.68]) " > configure.ac
echo "AC_INIT([tstAutotoolsInstall], 1.0) " >> configure.ac
@@ -75,6 +76,12 @@ echo "AC_SUBST([MPI_C_LIBS], ["\$MPILIBS \$FCLIBS"]) "
echo "CC=\$MPICC " >> configure.ac
echo "AC_LANG_POP([C]) " >> configure.ac
echo " " >> configure.ac
echo "AC_LANG_PUSH([C++]) " >> configure.ac
echo "AX_MPI([], AC_MSG_ERROR([could not compile a C++ MPI test program])) " >> configure.ac
echo "AC_SUBST([MPI_CXX_LIBS], ["\$MPILIBS \$FCLIBS"]) " >> configure.ac
echo "CXX=\$MPICXX " >> configure.ac
echo "AC_LANG_POP([C++]) " >> configure.ac
echo " " >> configure.ac
echo "PKG_CHECK_MODULES([ARPACK], [arpack${LIBSUFFIX}${ITF64SUFFIX}]) " >> configure.ac
echo "AC_SUBST([ARPACK_CFLAGS]) " >> configure.ac
echo "AC_SUBST([ARPACK_LIBS]) " >> configure.ac
@@ -93,7 +100,7 @@ echo "ACLOCAL_AMFLAGS = -I m4
echo " " >> Makefile.am
echo "EXTRA_DIST = debug.h stat.h " >> Makefile.am
echo " " >> Makefile.am
echo "bin_PROGRAMS = dnbdr1 pdndrv1 icb_arpack_c icb_arpack_cpp icb_parpack_c " >> Makefile.am
echo "bin_PROGRAMS = dnbdr1 pdndrv1 icb_arpack_c icb_arpack_cpp icb_parpack_c icb_parpack_cpp " >> Makefile.am
echo " " >> Makefile.am
echo "dnbdr1_SOURCES = dnbdr1.f dnband.f " >> Makefile.am
echo "dnbdr1_FFLAGS = \$(ARPACK_CFLAGS) " >> Makefile.am
@@ -114,6 +121,10 @@ echo "
echo "icb_parpack_c_SOURCES = icb_parpack_c.c " >> Makefile.am
echo "icb_parpack_c_CPPFLAGS = \$(AM_CPPFLAGS) \$(PARPACK_CFLAGS) \$(ARPACK_CFLAGS) " >> Makefile.am
echo "icb_parpack_c_LDADD = \$(PARPACK_LIBS) \$(ARPACK_LIBS) \$(LAPACK_LIBS) \$(BLAS_LIBS) \$(MPI_C_LIBS) " >> Makefile.am
echo " " >> Makefile.am
echo "icb_parpack_cpp_SOURCES = icb_parpack_cpp.cpp " >> Makefile.am
echo "icb_parpack_cpp_CPPFLAGS = \$(AM_CPPFLAGS) \$(PARPACK_CFLAGS) \$(ARPACK_CFLAGS) " >> Makefile.am
echo "icb_parpack_cpp_LDADD = \$(PARPACK_LIBS) \$(ARPACK_LIBS) \$(LAPACK_LIBS) \$(BLAS_LIBS) \$(MPI_CXX_LIBS) " >> Makefile.am
# 5. Build and test this new project with configure: for this to be possible, PKG_CHECK_MODULES must work.
@@ -128,3 +139,4 @@ make all || exit 1
mpirun -n 2 ./pdndrv1 || exit 1
mpirun -n 2 ./icb_parpack_c || exit 1
mpirun -n 2 ./icb_parpack_cpp || exit 1