Skip to content

Commit

Permalink
[ginkgo] Update to 1.4.0 (#19731)
Browse files Browse the repository at this point in the history
* [ginkgo] add release 1.4.0

* [ginkgo] x-add-version

* Update ports/ginkgo/usage

* [ginkgo] download large patch on demand

* [ginkgo] x-add-version
  • Loading branch information
upsj authored Aug 26, 2021
1 parent dd3d6df commit 410a157
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 210 deletions.
86 changes: 0 additions & 86 deletions ports/ginkgo/cmake-fixes.patch

This file was deleted.

16 changes: 12 additions & 4 deletions ports/ginkgo/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH
URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff
FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff
SHA512 f81c57aacc30680383ccfb21ca08987d8ea19a23c0c7bbc5ae590c3c7eca4eed72cea84410357e080e5bb35f08f6b57834b3cdace6d91cc3fde0a1930aa4270a
)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ginkgo-project/ginkgo
REF v1.3.0
SHA512 40db39666730a2120d0c5e197518f784aab71655781c037fb83302a346f6bf717e5c58491e9b29b9adacb492328e11bc60960f99323c220d53505ecab6489871
REF v1.4.0
SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807
HEAD_REF master
PATCHES
cmake-fixes.patch
windows-iterator.patch
${WINDOWS_SYMBOLS_PATCH}
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -23,6 +28,8 @@ vcpkg_cmake_configure(
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_EXAMPLES=OFF
-DGINKGO_BUILD_HIP=OFF
-DGINKGO_BUILD_DPCPP=OFF
-DGINKGO_BUILD_HWLOC=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_DEVEL_TOOLS=OFF
-DGINKGO_SKIP_DEPENDENCY_UPDATE=ON
Expand All @@ -36,5 +43,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo)
vcpkg_fixup_pkgconfig()

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")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
4 changes: 4 additions & 0 deletions ports/ginkgo/usage
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
The package ginkgo provides CMake targets:

find_package(Ginkgo CONFIG REQUIRED)
target_link_libraries(main PRIVATE Ginkgo::ginkgo)
4 changes: 2 additions & 2 deletions ports/ginkgo/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ginkgo",
"version-semver": "1.3.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, and the CUDA feature on Windows requires the CUDACXX environment variable to point to the CUDA nvcc.exe compiler with VCPKG_KEEP_ENV_VARS set to CUDACXX to pass its value through to the vcpkg environment.",
"version-semver": "1.4.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.",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
117 changes: 0 additions & 117 deletions ports/ginkgo/windows-iterator.patch

This file was deleted.

2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2309,7 +2309,7 @@
"port-version": 0
},
"ginkgo": {
"baseline": "1.3.0",
"baseline": "1.4.0",
"port-version": 0
},
"gl2ps": {
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/ginkgo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "da56f7ca349bebb4061a04d4d3b3d9b8fde9a1c8",
"version-semver": "1.4.0",
"port-version": 0
},
{
"git-tree": "b204eef5f779c05c2160e28cc07f411258ddcbfc",
"version-semver": "1.3.0",
Expand Down

0 comments on commit 410a157

Please sign in to comment.