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

Rename icbexmm option into eigen option.

Browse Source
This commit is contained in:
Franck HOUSSEN
2023-02-18 10:21:19 +01:00
parent ae350abfed
commit 5a963c4d31
9 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/jobs.yml
+3 -3
View File
@@ -21,7 +21,7 @@ jobs:
run: |
mkdir build
cd build
cmake -DEXAMPLES=ON -DMPI=ON -DICB=ON -DICBEXMM=ON ..
cmake -DEXAMPLES=ON -DMPI=ON -DICB=ON -DEIGEN=ON ..
make all
CTEST_OUTPUT_ON_FAILURE=1 make test
make package_source
@@ -69,7 +69,7 @@ jobs:
- name: Run job
run: |
./bootstrap
./configure --enable-mpi --enable-icb --enable-icbexmm
./configure --enable-mpi --enable-icb --enable-eigen
make all
make check
make distcheck
@@ -129,7 +129,7 @@ jobs:
run: |
mkdir build
cd build
cmake -DEXAMPLES=ON -DMPI=ON -DICB=ON -DICBEXMM=ON -DPYTHON3=ON ..
cmake -DEXAMPLES=ON -DMPI=ON -DICB=ON -DEIGEN=ON -DPYTHON3=ON ..
make all
CTEST_OUTPUT_ON_FAILURE=1 make test
ubuntu_latest_autotools_ilp64:
CHANGES
+1
View File
@@ -3,6 +3,7 @@ arpack-ng - 3.9.1
[ Franck Houssen ]
* [BUG FIX] Fix install: headers in /path/to/local/include/arpack
* arpackmm: allow for using LA/SA magnitudes.
* Rename icbexmm option into eigen option.
-- Franck Houssen <fghoussen@users.noreply.github.com> Sat, 11 Feb 2023 13:52:57 +0100
CMakeLists.txt
+6 -6
View File
@@ -27,7 +27,7 @@ endif ()
option(BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" ON)
option(MPI "Enable parallel support" OFF)
option(ICB "Enable support for *[ae]upd_c with ISO_C_BINDING" OFF)
option(ICBEXMM "Enable support for matrix market example based on ICB" OFF)
option(EIGEN "Enable support for C++ eigen solved based on ICB and eigen" OFF)
option(PYTHON3 "Enable python3 support" OFF)
set(BOOST_PYTHON_LIBSUFFIX "" CACHE STRING "suffix to add to custom boost python libs")
option(EXAMPLES "Compile ARPACK examples" OFF)
@@ -84,10 +84,10 @@ if (PYTHON3)
find_package(PythonLibs 3 REQUIRED)
find_package(Boost 1.78 COMPONENTS python${BOOST_PYTHON_LIBSUFFIX} numpy${BOOST_PYTHON_LIBSUFFIX} REQUIRED)
set(ICBEXMM "ON")
set(EIGEN "ON")
endif ()
if (ICBEXMM)
if (EIGEN)
find_package(Eigen3 3.3 QUIET)
if (NOT EIGEN3_FOUND) # If not found, piggy-back pkg-config files.
message(WARNING "CMake didn't find the Eigen3 package. Try to look for pkg-config file...")
@@ -689,7 +689,7 @@ function(build_tests)
target_link_libraries(icb_arpack_cpp arpack BLAS::BLAS LAPACK::LAPACK ${EXTRA_LDFLAGS})
add_test(icb_arpack_cpp_tst ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/icb_arpack_cpp)
if (ICBEXMM)
if (EIGEN)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/EXAMPLES/MATRIX_MARKET)
add_executable(arpackmm EXAMPLES/MATRIX_MARKET/arpackmm.cpp)
@@ -851,7 +851,7 @@ if(ICB)
install(FILES ICB/parpack.h DESTINATION ${ARPACK_INSTALL_INCLUDEDIR})
install(FILES ICB/parpack.hpp DESTINATION ${ARPACK_INSTALL_INCLUDEDIR})
endif()
if (ICBEXMM)
if (EIGEN)
install(FILES EXAMPLES/MATRIX_MARKET/arpackSolver.hpp DESTINATION ${ARPACK_INSTALL_INCLUDEDIR})
install(FILES "${PROJECT_BINARY_DIR}/arpackSolver${LIBSUFFIX}${ITF64SUFFIX}.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()
@@ -959,7 +959,7 @@ if (MPI)
endif()
libsummary("BLAS" "" "${BLAS_LIBRARIES}")
libsummary("LAPACK" "" "${LAPACK_LIBRARIES}")
if (ICBEXMM)
if (EIGEN)
libsummary("EIGEN3" "${EIGEN3_INCLUDE_DIR}" "")
endif()
if (PYTHON3)
EXAMPLES/MATRIX_MARKET/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ TESTS = arpackmm.sh
arpackmm_SOURCES = arpackmm.cpp
if ICBEXMM
if EIGEN
pkginclude_HEADERS = arpackSolver.hpp
endif
EXAMPLES/MATRIX_MARKET/README
+2 -2
View File
@@ -34,6 +34,6 @@ To build this utility, you need:
- to have installed eigen3 (to deal with the RCI).
- to configure arpack-ng this way:
- autotools:
~arpack-ng> ./configure --enable-icb-exmm; make all check
~arpack-ng> ./configure --enable-eigen; make all check
- cmake:
~arpack-ng/build> cmake -D ICBEXMM=ON ..; make all test
~arpack-ng/build> cmake -D EIGEN=ON ..; make all test
EXAMPLES/Makefile.am
+1 -1
View File
@@ -1,5 +1,5 @@
SUBDIRS = BAND COMPLEX NONSYM SIMPLE SVD SYM
if ICBEXMM
if EIGEN
SUBDIRS += MATRIX_MARKET
endif
Makefile.am
+2 -2
View File
@@ -11,8 +11,8 @@ if ICB
AM_DISTCHECK_CONFIGURE_FLAGS += --enable-icb
pkginclude_HEADERS += arpackicb.h
endif
if ICBEXMM
AM_DISTCHECK_CONFIGURE_FLAGS += --enable-icb-exmm
if EIGEN
AM_DISTCHECK_CONFIGURE_FLAGS += --enable-eigen
endif
SUBDIRS = .
README.md
+2 -2
View File
@@ -98,7 +98,7 @@ Check out `./EXAMPLES/MATRIX_MARKET/README` for more details.
```bash
$ mkdir build
$ cd build
$ cmake -D EXAMPLES=ON -D ICB=ON -D ICBEXMM=ON ..
$ cmake -D EXAMPLES=ON -D ICB=ON -D EIGEN=ON ..
$ make all check
```
@@ -114,7 +114,7 @@ Check out `./EXAMPLES/PYARPACK/README` for more details.
```bash
$ mkdir build
$ cd build
$ cmake -D EXAMPLES=ON -D ICB=ON -D ICBEXMM=ON -D PYTHON3=ON ..
$ cmake -D EXAMPLES=ON -D ICB=ON -D EIGEN=ON -D PYTHON3=ON ..
$ make all check
```
configure.ac
+5 -5
View File
@@ -83,13 +83,13 @@ if test x"$enable_icb" != x"no"; then
fi
dnl See if compiling matrix market example based on ICB
AC_ARG_ENABLE([icb-exmm],
[AS_HELP_STRING([--enable-icb-exmm],
AC_ARG_ENABLE([eigen],
[AS_HELP_STRING([--enable-eigen],
[matrix market example based on ISO_C_BINDING])],
[AS_VAR_SET([enable_icb], [$enableval])],
[AS_VAR_SET([enable_icb_exmm], [no])])
[AS_VAR_SET([enable_eigen], [no])])
if test x"$enable_icb_exmm" != x"no"; then
if test x"$enable_eigen" != x"no"; then
PKG_CHECK_MODULES([EIGEN3], [eigen3 >= 3.3])
AC_LANG_PUSH([C++])
CPPFLAGS_SAVE=$CPPFLAGS
@@ -340,7 +340,7 @@ dnl Set conditional for Makefiles.
AM_CONDITIONAL([MPI], [test x"$enable_mpi" != x"no"])
AM_CONDITIONAL([BLACS], [false])
AM_CONDITIONAL([ICB], [test x"$enable_icb" != x"no"])
AM_CONDITIONAL([ICBEXMM], [test x"$enable_icb_exmm" != x"no"])
AM_CONDITIONAL([EIGEN], [test x"$enable_eigen" != x"no"])
m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], [${libdir}/pkgconfig])])
AC_SUBST([ARPACK_PC_LIBS_PRIVATE], ["$LAPACK_LIBS $BLAS_LIBS"])