Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix PackageConfig and Create the test #1109

Merged
merged 10 commits into from
Nov 6, 2022
Merged

Fix PackageConfig and Create the test #1109

merged 10 commits into from
Nov 6, 2022

Conversation

yhmtsai
Copy link
Member

@yhmtsai yhmtsai commented Aug 31, 2022

This PR create the test and fix for PackageConfig
The error is mentioned in #1104.
close #1104

I add the existed lib into the list, and remove the duplication in the reversed to keep the last not first library in the list.
To keep the ordering of the libraries, this pr can not support circular dependence.
Also, pkgconfig of ginkgo isn't supported in MSVC.

From CMake PkgConfig TARGET, they only put the -framework, -L, -l to link_libraries but others in link_options.
Thus, the linking library with absolute path will be in link_option and cmake will put it before the compiled target such that it destroy the lib order. g++ <link_options> *.o <link_libraries> Ref: https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/FindPkgConfig.cmake#L251

@yhmtsai yhmtsai added the 1:ST:WIP This PR is a work in progress. Not ready for review. label Aug 31, 2022
@yhmtsai yhmtsai requested a review from a team August 31, 2022 16:16
@yhmtsai yhmtsai self-assigned this Aug 31, 2022
@ginkgo-bot ginkgo-bot added reg:build This is related to the build system. reg:ci-cd This is related to the continuous integration system. labels Aug 31, 2022
Copy link
Member

@upsj upsj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial review, didn't look at the algorithm yet

test/test_exportbuild_pkgconfig/CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
test/test_exportbuild_pkgconfig/CMakeLists.txt Outdated Show resolved Hide resolved
Comment on lines 17 to 21
target_link_libraries(test_exportbuild_pkgconfig PRIVATE ${GINKGO_LIBRARIES})
target_link_libraries(test_exportbuild_pkgconfig PRIVATE ${GINKGO_LDFLAGS})
target_include_directories(test_exportbuild_pkgconfig PRIVATE ${GINKGO_INCLUDE_DIRS})
target_compile_features(test_exportbuild_pkgconfig PUBLIC cxx_std_14)
target_link_libraries(test_exportbuild_pkgconfig PRIVATE ${GINKGO_CFLAGS})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the pkgconfig support already provides CMake target support. We should probably also add the -std=c++14 flag to cflags

Suggested change
target_link_libraries(test_exportbuild_pkgconfig PRIVATE ${GINKGO_LIBRARIES})
target_link_libraries(test_exportbuild_pkgconfig PRIVATE ${GINKGO_LDFLAGS})
target_include_directories(test_exportbuild_pkgconfig PRIVATE ${GINKGO_INCLUDE_DIRS})
target_compile_features(test_exportbuild_pkgconfig PUBLIC cxx_std_14)
target_link_libraries(test_exportbuild_pkgconfig PRIVATE ${GINKGO_CFLAGS})
target_link_libraries(test_exportbuild_pkgconfig PRIVATE PkgConfig::GINKGO)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think using package config is more close to the original way not the CMake way

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer the CMake approach, since that way we can't accidentally miss any part of the pkg-config settings.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although using the target approach make make adds -pthread to compile flag, it changes the linking order to lead failure.

/usr/bin/c++ /usr/lib/libhwloc.so /usr/lib/libpapi.so -Wl,-rpath -Wl,/usr/lib -Wl,--enable-new-dtags -pthread \
/usr/lib/libmpi.so CMakeFiles/test_exportbuild_pkgconfig.dir/root/ginkgo/test/test_install/test_install.cpp.o -o \
test_exportbuild_pkgconfig  -Wl,-rpath,/usr/local/lib /usr/local/lib/libginkgo.so /usr/local/lib/libginkgo_omp.so \
/usr/local/lib/libginkgo_cuda.so /usr/local/lib/libginkgo_reference.so /usr/local/lib/libginkgo_hip.so \
/usr/local/lib/libginkgo_dpcpp.so /usr/local/lib/libginkgo_device.so 

leads /usr/bin/ld: CMakeFiles/test_exportbuild_pkgconfig.dir/root/ginkgo/test/test_install/test_install.cpp.o: undefined reference to symbol 'papi_sde_init'

ginkgo.pc

-L/usr/local/lib -lginkgo /usr/lib/libhwloc.so -lginkgo_omp -lginkgo_cuda -lginkgo_reference -lginkgo_hip \
-lginkgo_dpcpp -lginkgo_device /usr/lib/libpapi.so -Wl,-rpath -Wl,/usr/lib -Wl,--enable-new-dtags -pthread \
/usr/lib/libmpi.so

it seems to put the lib with absolute path like hwloc, papi, mpi before the object file.
However, they should be after object file.
Do you know any documentation or keyword for this behavior?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the correct way to do things would be to output -L/usr/lib -lhwloc -lpapi -lmpi. Since pkg-config is Linux-only, we can rely on libraries being prefixed lib with a .so or .a suffix. I can't find any pkg-config file on my system that uses absolute paths

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think it is the requirement from the png-config. cmake also change -L -l to the absolute path in the end. pkg-config may prefer we have hwloc.pc, papi.pc, mpi.pc, and any pkg-config file from the outside or third-party package. pkg-config is also supported on Windows, but I can not make it work in this pr

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkg-config has few explicit limitations, but on my entire system, I couldn't find a pkg-config file that uses absolute library paths directly, so we are definitely doing something unusual here. CMake's pkg-config support relies on that implicit assumption, treating every -l and -L parameter as library information and all other parameters as link options. This causes the order to be lost.
On the Windows side: We can use CMAKE_SHARED_LIBRARY_SUFFIX and friends to make it portable.

test/test_exportbuild_pkgconfig/CMakeLists.txt Outdated Show resolved Hide resolved
cmake/information_helpers.cmake Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Sep 1, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@yhmtsai yhmtsai force-pushed the fix_lib_order branch 6 times, most recently from f4f95c8 to 0cd0fe3 Compare October 19, 2022 15:10
@yhmtsai yhmtsai force-pushed the fix_lib_order branch 4 times, most recently from 650d876 to a090b45 Compare October 24, 2022 16:51
@yhmtsai yhmtsai added 1:ST:ready-for-review This PR is ready for review and removed 1:ST:WIP This PR is a work in progress. Not ready for review. labels Oct 25, 2022
@yhmtsai yhmtsai requested a review from a team October 25, 2022 06:16
@pratikvn pratikvn added the 1:ST:high-importance This issue/PR is of high importance and must be addressed as soon as possible. label Oct 28, 2022
@thoasm thoasm self-requested a review October 28, 2022 12:18
Copy link
Member

@thoasm thoasm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Member

@upsj upsj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to figure out how to deal correctly with pkg-config, but it might be best not to use the IMPORTED_TARGET approach, otherwise things might get reordered arbitrarily, as you said.

CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
cmake/information_helpers.cmake Show resolved Hide resolved
cmake/information_helpers.cmake Outdated Show resolved Hide resolved
@yhmtsai
Copy link
Member Author

yhmtsai commented Nov 1, 2022

Using IMPORTED_TARGET can handle the pthread in compile and linking.
if using the original way, I can not put CFLAGS into compile_options directly.
that's why I still change the property of target not use the original plain link/compile

@upsj
Copy link
Member

upsj commented Nov 1, 2022

Makes sense, then let's leave it how it is

@upsj
Copy link
Member

upsj commented Nov 1, 2022

I attempted to get this right, since there are at least two bugs in the current implementation:

  1. the link line should be -Lpath -lname
  2. compile definitions do not need to have a leading -D, so we may need to add it.

Finally, more recent CMake versions add a $<HOST_LINK:...> generator expression to the MPI link flags, which honestly just makes me want to give up on this entirely.

The cleanest thing I could come up with is a59cc01, which includes a bit of cleanup

@yhmtsai
Copy link
Member Author

yhmtsai commented Nov 2, 2022

we can not give it up because at least one user is using it.
If the absolute link path is not correct, we should fix it in our own target. If the target is made from the package, we should keep it.
When is the compile definition without -D? Is it from cmake?

@tcojean tcojean added this to the Ginkgo 1.5.0 milestone Nov 3, 2022
Copy link
Member

@tcojean tcojean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. The new logic here seems good to me. I think getting a generic solution is out of scope for this so it's OK that it cannot deal with circular deps or MSVC. We only want to provide something reasonable that the user can work from if they really have to.

This at least seems to be working with OpenCARP which relies on pkg-config.

CMakeLists.txt Outdated Show resolved Hide resolved
@yhmtsai yhmtsai added 1:ST:ready-to-merge This PR is ready to merge. and removed 1:ST:ready-for-review This PR is ready for review labels Nov 4, 2022
@yhmtsai yhmtsai force-pushed the fix_lib_order branch 4 times, most recently from af12f1f to b86f044 Compare November 5, 2022 04:54
@sonarcloud
Copy link

sonarcloud bot commented Nov 5, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@codecov
Copy link

codecov bot commented Nov 6, 2022

Codecov Report

Base: 91.13% // Head: 91.63% // Increases project coverage by +0.49% 🎉

Coverage data is based on head (2c9e4ac) compared to base (bb21691).
Patch has no changes to coverable lines.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1109      +/-   ##
===========================================
+ Coverage    91.13%   91.63%   +0.49%     
===========================================
  Files          555      555              
  Lines        47614    47554      -60     
===========================================
+ Hits         43395    43576     +181     
+ Misses        4219     3978     -241     
Impacted Files Coverage Δ
omp/reorder/rcm_kernels.cpp 94.44% <0.00%> (-3.09%) ⬇️
reference/base/index_set_kernels.cpp 94.20% <0.00%> (+0.08%) ⬆️
core/test/base/iterator_factory.cpp 100.00% <0.00%> (+32.43%) ⬆️
omp/factorization/factorization_kernels.cpp 79.45% <0.00%> (+79.45%) ⬆️
test/factorization/par_ilu_kernels.cpp 89.65% <0.00%> (+89.65%) ⬆️
omp/factorization/par_ilu_kernels.cpp 100.00% <0.00%> (+100.00%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@yhmtsai yhmtsai merged commit ca2a213 into develop Nov 6, 2022
@yhmtsai yhmtsai deleted the fix_lib_order branch November 6, 2022 04:07
tcojean added a commit that referenced this pull request Nov 12, 2022
Advertise release 1.5.0 and last changes

+ Add changelog,
+ Update third party libraries
+ A small fix to a CMake file

See PR: #1195

The Ginkgo team is proud to announce the new Ginkgo minor release 1.5.0. This release brings many important new features such as:
- MPI-based multi-node support for all matrix formats and most solvers;
- full DPC++/SYCL support,
- functionality and interface for GPU-resident sparse direct solvers,
- an interface for wrapping solvers with scaling and reordering applied,
- a new algebraic Multigrid solver/preconditioner,
- improved mixed-precision support,
- support for device matrix assembly,

and much more.

If you face an issue, please first check our [known issues page](https://github.com/ginkgo-project/ginkgo/wiki/Known-Issues) and the [open issues list](https://github.com/ginkgo-project/ginkgo/issues) and if you do not find a solution, feel free to [open a new issue](https://github.com/ginkgo-project/ginkgo/issues/new/choose) or ask a question using the [github discussions](https://github.com/ginkgo-project/ginkgo/discussions).

Supported systems and requirements:
+ For all platforms, CMake 3.13+
+ C++14 compliant compiler
+ Linux and macOS
  + GCC: 5.5+
  + clang: 3.9+
  + Intel compiler: 2018+
  + Apple LLVM: 8.0+
  + NVHPC: 22.7+
  + Cray Compiler: 14.0.1+
  + CUDA module: CUDA 9.2+ or NVHPC 22.7+
  + HIP module: ROCm 4.0+
  + DPC++ module: Intel OneAPI 2021.3 with oneMKL and oneDPL. Set the CXX compiler to `dpcpp`.
+ Windows
  + MinGW and Cygwin: GCC 5.5+
  + Microsoft Visual Studio: VS 2019
  + CUDA module: CUDA 9.2+, Microsoft Visual Studio
  + OpenMP module: MinGW or Cygwin.


Algorithm and important feature additions:
+ Add MPI-based multi-node for all matrix formats and solvers (except GMRES and IDR). ([#676](#676), [#908](#908), [#909](#909), [#932](#932), [#951](#951), [#961](#961), [#971](#971), [#976](#976), [#985](#985), [#1007](#1007), [#1030](#1030), [#1054](#1054), [#1100](#1100), [#1148](#1148))
+ Porting the remaining algorithms (preconditioners like ISAI, Jacobi, Multigrid, ParILU(T) and ParIC(T)) to DPC++/SYCL, update to SYCL 2020, and improve support and performance ([#896](#896), [#924](#924), [#928](#928), [#929](#929), [#933](#933), [#943](#943), [#960](#960), [#1057](#1057), [#1110](#1110),  [#1142](#1142))
+ Add a Sparse Direct interface supporting GPU-resident numerical LU factorization, symbolic Cholesky factorization, improved triangular solvers, and more ([#957](#957), [#1058](#1058), [#1072](#1072), [#1082](#1082))
+ Add a ScaleReordered interface that can wrap solvers and automatically apply reorderings and scalings ([#1059](#1059))
+ Add a Multigrid solver and improve the aggregation based PGM coarsening scheme ([#542](#542), [#913](#913), [#980](#980), [#982](#982),  [#986](#986))
+ Add infrastructure for unified, lambda-based, backend agnostic, kernels and utilize it for some simple kernels ([#833](#833), [#910](#910), [#926](#926))
+ Merge different CUDA, HIP, DPC++ and OpenMP tests under a common interface ([#904](#904), [#973](#973), [#1044](#1044), [#1117](#1117))
+ Add a device_matrix_data type for device-side matrix assembly ([#886](#886), [#963](#963), [#965](#965))
+ Add support for mixed real/complex BLAS operations ([#864](#864))
+ Add a FFT LinOp for all but DPC++/SYCL ([#701](#701))
+ Add FBCSR support for NVIDIA and AMD GPUs and CPUs with OpenMP ([#775](#775))
+ Add CSR scaling ([#848](#848))
+ Add array::const_view and equivalent to create constant matrices from non-const data ([#890](#890))
+ Add a RowGatherer LinOp supporting mixed precision to gather dense matrix rows ([#901](#901))
+ Add mixed precision SparsityCsr SpMV support ([#970](#970))
+ Allow creating CSR submatrix including from (possibly discontinuous) index sets ([#885](#885), [#964](#964))
+ Add a scaled identity addition (M <- aI + bM) feature interface and impls for Csr and Dense ([#942](#942))


Deprecations and important changes:
+ Deprecate AmgxPgm in favor of the new Pgm name. ([#1149](#1149)).
+ Deprecate specialized residual norm classes in favor of a common `ResidualNorm` class ([#1101](#1101))
+ Deprecate CamelCase non-polymorphic types in favor of snake_case versions (like array, machine_topology, uninitialized_array, index_set) ([#1031](#1031), [#1052](#1052))
+ Bug fix: restrict gko::share to rvalue references (*possible interface break*) ([#1020](#1020))
+ Bug fix: when using cuSPARSE's triangular solvers, specifying the factory parameter `num_rhs` is now required when solving for more than one right-hand side, otherwise an exception is thrown ([#1184](#1184)).
+ Drop official support for old CUDA < 9.2 ([#887](#887))


Improved performance additions:
+ Reuse tmp storage in reductions in solvers and add a mutable workspace to all solvers ([#1013](#1013), [#1028](#1028))
+ Add HIP unsafe atomic option for AMD ([#1091](#1091))
+ Prefer vendor implementations for Dense dot, conj_dot and norm2 when available ([#967](#967)).
+ Tuned OpenMP SellP, COO, and ELL SpMV kernels for a small number of RHS ([#809](#809))


Fixes:
+ Fix various compilation warnings ([#1076](#1076), [#1183](#1183), [#1189](#1189))
+ Fix issues with hwloc-related tests ([#1074](#1074))
+ Fix include headers for GCC 12 ([#1071](#1071))
+ Fix for simple-solver-logging example ([#1066](#1066))
+ Fix for potential memory leak in Logger ([#1056](#1056))
+ Fix logging of mixin classes ([#1037](#1037))
+ Improve value semantics for LinOp types, like moved-from state in cross-executor copy/clones ([#753](#753))
+ Fix some matrix SpMV and conversion corner cases ([#905](#905), [#978](#978))
+ Fix uninitialized data ([#958](#958))
+ Fix CUDA version requirement for cusparseSpSM ([#953](#953))
+ Fix several issues within bash-script ([#1016](#1016))
+ Fixes for `NVHPC` compiler support ([#1194](#1194))


Other additions:
+ Simplify and properly name GMRES kernels ([#861](#861))
+ Improve pkg-config support for non-CMake libraries ([#923](#923), [#1109](#1109))
+ Improve gdb pretty printer ([#987](#987), [#1114](#1114))
+ Add a logger highlighting inefficient allocation and copy patterns ([#1035](#1035))
+ Improved and optimized test random matrix generation ([#954](#954), [#1032](#1032))
+ Better CSR strategy defaults ([#969](#969))
+ Add `move_from` to `PolymorphicObject` ([#997](#997))
+ Remove unnecessary device_guard usage ([#956](#956))
+ Improvements to the generic accessor for mixed-precision ([#727](#727))
+ Add a naive lower triangular solver implementation for CUDA ([#764](#764))
+ Add support for int64 indices from CUDA 11 onward with SpMV and SpGEMM ([#897](#897))
+ Add a L1 norm implementation ([#900](#900))
+ Add reduce_add for arrays ([#831](#831))
+ Add utility to simplify Dense View creation from an existing Dense vector ([#1136](#1136)).
+ Add a custom transpose implementation for Fbcsr and Csr transpose for unsupported vendor types ([#1123](#1123))
+ Make IDR random initilization deterministic ([#1116](#1116))
+ Move the algorithm choice for triangular solvers from Csr::strategy_type to a factory parameter ([#1088](#1088))
+ Update CUDA archCoresPerSM ([#1175](#1116))
+ Add kernels for Csr sparsity pattern lookup ([#994](#994))
+ Differentiate between structural and numerical zeros in Ell/Sellp ([#1027](#1027))
+ Add a binary IO format for matrix data ([#984](#984))
+ Add a tuple zip_iterator implementation ([#966](#966))
+ Simplify kernel stubs and declarations ([#888](#888))
+ Simplify GKO_REGISTER_OPERATION with lambdas ([#859](#859))
+ Simplify copy to device in tests and examples ([#863](#863))
+ More verbose output to array assertions ([#858](#858))
+ Allow parallel compilation for Jacobi kernels ([#871](#871))
+ Change clang-format pointer alignment to left ([#872](#872))
+ Various improvements and fixes to the benchmarking framework ([#750](#750), [#759](#759), [#870](#870), [#911](#911), [#1033](#1033), [#1137](#1137))
+ Various documentation improvements ([#892](#892), [#921](#921), [#950](#950), [#977](#977), [#1021](#1021), [#1068](#1068), [#1069](#1069), [#1080](#1080), [#1081](#1081), [#1108](#1108), [#1153](#1153), [#1154](#1154))
+ Various CI improvements ([#868](#868), [#874](#874), [#884](#884), [#889](#889), [#899](#899), [#903](#903),  [#922](#922), [#925](#925), [#930](#930), [#936](#936), [#937](#937), [#958](#958), [#882](#882), [#1011](#1011), [#1015](#1015), [#989](#989), [#1039](#1039), [#1042](#1042), [#1067](#1067), [#1073](#1073), [#1075](#1075), [#1083](#1083), [#1084](#1084), [#1085](#1085), [#1139](#1139), [#1178](#1178), [#1187](#1187))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1:ST:high-importance This issue/PR is of high importance and must be addressed as soon as possible. 1:ST:ready-to-merge This PR is ready to merge. reg:build This is related to the build system. reg:ci-cd This is related to the continuous integration system.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Linking to static Ginkgo libs using pkg-config does not work
6 participants