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

[coreml-tools] Update to 7.2, fix linker errors for Foundation.framework #219

Merged
merged 3 commits into from
Jul 13, 2024
Merged

[coreml-tools] Update to 7.2, fix linker errors for Foundation.framework #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c3a744
[coreml-tools] update to 7.2
luncliff Jul 12, 2024
0346aa5
[coreml-tools] change patches
luncliff Jul 12, 2024
03b3013
[coreml-tools] update baseline
luncliff Jul 13, 2024
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
7 changes: 2 additions & 5 deletions ports/coreml-tools/fix-cmake.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ index d462525..1f97838 100644

if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
message(FATAL_ERROR "
@@ -31,34 +32,49 @@ if(HAS_CCACHE)
@@ -31,34 +32,46 @@ if(HAS_CCACHE)
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
endif()

Expand Down Expand Up @@ -38,12 +38,9 @@ index d462525..1f97838 100644
-message("Found python version ${PYTHON_VERSION_STRING}")
-message("Found python includes ${PYTHON_INCLUDE_DIRS}")
+find_package(protobuf CONFIG REQUIRED) # protobuf::libprotobuf
+link_libraries("-framework Foundation")
+
+add_subdirectory(mlmodel)
+
+message(STATUS "Found python at ${Python3_EXECUTABLE}")
+message(STATUS "Found python version ${Python3_VERSION}")
+message(STATUS "Found python includes ${Python3_INCLUDE_DIRS}")

include_directories(
.
Expand Down
4 changes: 2 additions & 2 deletions ports/coreml-tools/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apple/coremltools
REF 7.1
SHA512 64a8f9f9a47266d58b5c19fb7ad21458a481ea7d11309bd46ffc3390771f70c7ccb958abfdeedad86e7785fe320d532928441cc120d0e3570e96d149ec458b72
REF 7.2
SHA512 0b86c3a424376a432985d327935439ce215257201372d781f710ea4177b94bb404c315fb3a00e4efa2d8c4c8693fe97ec0f969d62c2e86f465a92f1c8074d158
HEAD_REF master
PATCHES
fix-cmake.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/coreml-tools/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "coreml-tools",
"version": "7.1",
"version": "7.2",
"description": "Core ML tools contain supporting tools for Core ML model conversion, editing, and validation.",
"homepage": "https://coremltools.readme.io/",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"port-version": 0
},
"coreml-tools": {
"baseline": "7.1",
"baseline": "7.2",
"port-version": 0
},
"cpuinfo": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/coreml-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ada2a92a3d198d069caaf9f5b02ba1384b53a0bc",
"version": "7.2",
"port-version": 0
},
{
"git-tree": "6023229599457eec35aa0d825d4d30e23eb5e5ea",
"version": "7.1",
Expand Down
Loading