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.

Sign up for GitHub

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

[ginkgo] Update to 1.6.0 #34280

Merged
merged 18 commits into from
Oct 13, 2023
Merged

[ginkgo] Update to 1.6.0 #34280

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c891555
[ginkgo] update to version 1.5.0
upsj Oct 5, 2023
a67a544
update version
upsj Oct 5, 2023
a2829fa
[ginkgo] Update to version 1.6.0
upsj Oct 5, 2023
1ef874f
update version
upsj Oct 5, 2023
74f4e0c
disable UWP and android support
upsj Oct 5, 2023
4dc6388
update version
upsj Oct 5, 2023
8b6a97f
change flags in-tree
upsj Oct 8, 2023
ae23a92
update version
upsj Oct 8, 2023
889dd69
support only static builds on Windows
upsj Oct 13, 2023
7120952
update version
upsj Oct 13, 2023
48f4be9
allow building with Ninja again
upsj Oct 13, 2023
98f53ff
update version
upsj Oct 13, 2023
4d532c0
add android support again
upsj Oct 13, 2023
c2ba880
update version
upsj Oct 13, 2023
5d95063
remove android again
upsj Oct 13, 2023
90278d3
update version
upsj Oct 13, 2023
e6fb3c8
use version parameter
upsj Oct 13, 2023
9ef139f
update version
upsj Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions ports/ginkgo/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH
URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff?full_index=1
FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff
SHA512 f2997dc1af55db2a152092b70097238af77d7345329b9033a19301cfc4d8d494c5c41fbbd9a63b3303697764fc5f799dfe93647bafbbefae8981a978ecaa6a68
)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ginkgo-project/ginkgo
REF v1.4.0
SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
REF v1.6.0
SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50
HEAD_REF master
PATCHES
${WINDOWS_SYMBOLS_PATCH}
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
openmp GINKGO_BUILD_OMP
cuda GINKGO_BUILD_CUDA
mpi GINKGO_BUILD_MPI
)

vcpkg_cmake_configure(
Expand All @@ -33,20 +30,13 @@ vcpkg_cmake_configure(
-DGINKGO_DEVEL_TOOLS=OFF
-DGINKGO_SKIP_DEPENDENCY_UPDATE=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
-DGinkgo_NAME=ginkgo
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo)
vcpkg_fixup_pkgconfig()

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" [[string(REPLACE "lib/cmake/Ginkgo" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")]] "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "GINKGO_INSTALL_PREFIX" "_IMPORT_PREFIX")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo\"" "/share/ginkgo\"")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo/Modules\"" "/share/ginkgo/Modules/Modules\"")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "\"${SOURCE_PATH}/cmake/Modules/\"" "")

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
Expand Down
10 changes: 8 additions & 2 deletions ports/ginkgo/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "ginkgo",
"version-semver": "1.4.0",
"port-version": 2,
"version-semver": "1.6.0",
"description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.",
"homepage": "https://github.com/ginkgo-project/ginkgo",
"license": "BSD-3-Clause",
"supports": "!(x86 | android)",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand All @@ -22,6 +22,12 @@
"cuda"
]
},
"mpi": {
"description": "Build the distributed MPI backend of Ginkgo",
"dependencies": [
"mpi"
]
},
"openmp": {
"description": "Build the OpenMP backend of Ginkgo"
}
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2885,8 +2885,8 @@
"port-version": 3
},
"ginkgo": {
"baseline": "1.4.0",
"port-version": 2
"baseline": "1.6.0",
"port-version": 0
},
"gklib": {
"baseline": "2022-07-27",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/ginkgo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b7967d05ff6b556dcc9b3a12d5e716ae43d67898",
"version-semver": "1.6.0",
"port-version": 0
},
{
"git-tree": "779490458d51f75bc22ed324afceffe0c3b0ee12",
"version-semver": "1.4.0",
Expand Down