Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 22 additions & 0 deletions ports/libscran-umappp/0001-make-find-dependency-not-required.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
index 54ae53d..603cf93 100644
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -1,11 +1,11 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
-find_dependency(ltla_aarand 1.1.0 CONFIG REQUIRED)
-find_dependency(ltla_sanisizer 0.2.0 CONFIG REQUIRED)
-find_dependency(ltla_subpar 0.5.0 CONFIG REQUIRED)
-find_dependency(ltla_irlba 3.1.0 CONFIG REQUIRED)
-find_dependency(Eigen3 5.0.0 CONFIG REQUIRED)
-find_dependency(knncolle_knncolle 3.1.0 CONFIG REQUIRED)
+find_dependency(ltla_aarand 1.1.0 CONFIG)
+find_dependency(ltla_irlba 3.1.0 CONFIG)
+find_dependency(Eigen3 5.0.0 CONFIG)
+find_dependency(ltla_subpar 0.5.0 CONFIG)
+find_dependency(ltla_sanisizer 0.2.0 CONFIG)
+find_dependency(knncolle_knncolle 3.1.0 CONFIG)

include("${CMAKE_CURRENT_LIST_DIR}/libscran_umapppTargets.cmake")
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d1e04b..9c40958 100644
index 942157c..8b4ee79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ if(UMAPPP_FETCH_EXTERN)
Expand All @@ -12,15 +12,15 @@ index 5d1e04b..9c40958 100644
find_package(ltla_sanisizer 0.2.0 CONFIG REQUIRED)
find_package(knncolle_knncolle 3.1.0 CONFIG REQUIRED)
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
index 8e51dd2..e588153 100644
index 603cf93..c4f72ab 100644
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -5,7 +5,7 @@ find_dependency(ltla_aarand 1.1.0 CONFIG REQUIRED)
find_dependency(ltla_sanisizer 0.2.0 CONFIG REQUIRED)
find_dependency(ltla_subpar 0.5.0 CONFIG REQUIRED)
find_dependency(ltla_irlba 3.0.0 CONFIG REQUIRED)
-find_dependency(Eigen3 5.0.0 CONFIG REQUIRED)
+find_dependency(Eigen3 CONFIG REQUIRED)
find_dependency(knncolle_knncolle 3.1.0 CONFIG REQUIRED)

include("${CMAKE_CURRENT_LIST_DIR}/libscran_umapppTargets.cmake")
@@ -3,7 +3,7 @@
include(CMakeFindDependencyMacro)
find_dependency(ltla_aarand 1.1.0 CONFIG)
find_dependency(ltla_irlba 3.1.0 CONFIG)
-find_dependency(Eigen3 5.0.0 CONFIG)
+find_dependency(Eigen3 CONFIG)
find_dependency(ltla_subpar 0.5.0 CONFIG)
find_dependency(ltla_sanisizer 0.2.0 CONFIG)
find_dependency(knncolle_knncolle 3.1.0 CONFIG)
5 changes: 3 additions & 2 deletions ports/libscran-umappp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libscran/umappp
REF "v${VERSION}"
SHA512 a4706321d6129194520e909b7978b297cb114dffe7a3a449960cf1c3f06ca1dc1903ca8f1a23c924706d9fc44e3af7479f9fac05b3d5f710414b37b0cca9fdf6
SHA512 73f4979a0d8b15fc7bc62de04210fba2a95dd8a30480882c3e88a8e2ea3b48e2e9f37d02f39c09648a79ad27a10906b0b1c26600afe573539070d77696ef44f7
HEAD_REF master
PATCHES
0001-fix-eigen3-dependency.patch
0001-make-find-dependency-not-required.diff # https://github.com/libscran/umappp/pull/35
0002-remove-eigen3-version-constraint.diff
)

set(VCPKG_BUILD_TYPE "release") # header-only port
Expand Down
2 changes: 1 addition & 1 deletion ports/libscran-umappp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "libscran-umappp",
"version": "3.2.1",
"version": "3.3.0",
"description": "UMAP C++ implementation",
"homepage": "https://github.com/libscran/umappp",
"license": "BSD-2-Clause",
Expand Down
2 changes: 1 addition & 1 deletion ports/ltla-cppirlba/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LTLA/CppIrlba
REF "v${VERSION}"
SHA512 17e84cf3d5de06dc9c599695a9d2b5b6d48f9ec1c3f04b6c1f875ab809d42dfddc7a97e400d02e7fd55e88e708df6162ba4e7aadf0a47f8eea6004e3efbb4dd3
SHA512 a060c12a6d2c00efb632ab89f14f12fd57598e6e563aa50d4bfd44100c29f3178509e9bd0f3b2cd34c82042caa1b8c2dc6dab3c0f6c3da2c4d169175064605fe
HEAD_REF master
PATCHES
0001-fix-eigen3.patch
Expand Down
3 changes: 1 addition & 2 deletions ports/ltla-cppirlba/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "ltla-cppirlba",
"version": "3.0.1",
"port-version": 1,
"version": "3.1.0",
"description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.",
"homepage": "https://github.com/LTLA/CppIrlba",
"license": "MIT",
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5541,7 +5541,7 @@
"port-version": 0
},
"libscran-umappp": {
"baseline": "3.2.1",
"baseline": "3.3.0",
"port-version": 0
},
"libsecret": {
Expand Down Expand Up @@ -6133,8 +6133,8 @@
"port-version": 0
},
"ltla-cppirlba": {
"baseline": "3.0.1",
"port-version": 1
"baseline": "3.1.0",
"port-version": 0
},
"ltla-cppkmeans": {
"baseline": "4.0.6",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libscran-umappp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7ab13a4280e75342a69be6abbb01d8384f793d6d",
"version": "3.3.0",
"port-version": 0
},
{
"git-tree": "fda71d1c69700a3fc9de5dd81153647dd4966fca",
"version": "3.2.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/ltla-cppirlba.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "78cc7dce411f7977354df995cbb338cba48043c6",
"version": "3.1.0",
"port-version": 0
},
{
"git-tree": "3b0436e9ba1d03149bc0c83f9e81b61d2d596fe1",
"version": "3.0.1",
Expand Down