Skip to content

Commit

Permalink
Merge 5622768 into 42f5a64
Browse files Browse the repository at this point in the history
  • Loading branch information
@kewlbear
kewlbear authored Feb 6, 2022
2 parents 42f5a64 + 5622768 commit 9b9939f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 21 deletions.
30 changes: 15 additions & 15 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
"IrrXML",
"JPEG",
"jsoncpp",
"libOpen3D_3rdparty_lzf.a",
"libOpen3D_3rdparty_liblzf.a",
"libOpen3D_3rdparty_qhull_r.a",
"libOpen3D_3rdparty_qhullcpp.a",
"libOpen3D_3rdparty_rply.a",
Expand All @@ -31,19 +31,19 @@ let package = Package(
.package(url: "https://github.com/kewlbear/BLAS-LAPACK-AppStore-Workaround.git", .branch("main")),
],
targets: [
.binaryTarget(name: "Assimp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/Assimp.xcframework.zip", checksum: "2b161463b0175184c2532b9b5b433e63ed98f88a4b39e80dc837035cec865751"),
.binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/Faiss.xcframework.zip", checksum: "c39bff39ece59f118a2e1f7d84c0688d3b37138aa4798be5b9c3c6a64f9e7a10"),
.binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/IrrXML.xcframework.zip", checksum: "513e797936eb5efa7d55905f36a764a580c2879494f78cf93e6cd3624da63fa3"),
.binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/JPEG.xcframework.zip", checksum: "d8334010a38d2d3d0e97157b8cebcd516c4b06cbcc0036eba318afbb779295fa"),
.binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/jsoncpp.xcframework.zip", checksum: "708cb5b4d706efe31a6f70e6323af533b7a4769c07854e021eb21ddfe12bcc1d"),
.binaryTarget(name: "libOpen3D_3rdparty_lzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/libOpen3D_3rdparty_lzf.a.xcframework.zip", checksum: "libOpen3D_3rdparty_lzf.a.xcframework_CHECKSUM"),
.binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "b7cd46210eb46b08d794107449c8f92a60e368eb803b90f6a4bc89c14722ccb8"),
.binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "2a0bc70bb9c3d52efcd47a32373e105a01f052c79f26eb5bf5ce34a64689c40b"),
.binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "0c730ea7169884bedec827fd04dc64131728e5aac8654f9a692b7533cedd198a"),
.binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/libOpen3D.a.xcframework.zip", checksum: "9c2cf6abdc90882db7ff46ad294311dd0aa4c92913cdd706f91d119c45efc871"),
.binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/png.xcframework.zip", checksum: "6d6ff79a46f8bef83857b2f50b2753155283ccd7d144f674ae2a5c6d53f8124f"),
.binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/pybind.a.xcframework.zip", checksum: "pybind.a.xcframework_CHECKSUM"),
.binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220123160749/TBB.xcframework.zip", checksum: "d45712847f4e84abc393d5b964cf47830a526046aa3b32b20e56b03e8f9ad8e9"),
.binaryTarget(name: "Assimp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/Assimp.xcframework.zip", checksum: "149fd124b2581d011f3bbc89094f42e70a7f57b09cebf56bb6eb95b04fa77564"),
.binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/Faiss.xcframework.zip", checksum: "17a9ee3b631d1dc104525a1b82168ca4c432bc99e53bb354d2a93d064a204e95"),
.binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/IrrXML.xcframework.zip", checksum: "1f28d784287d71e203f2399d8be50286ed9f65705c94f6c4751623cc87b72885"),
.binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/JPEG.xcframework.zip", checksum: "1855b7a5f1e9a12c3e62aace962dc8b03978d5e95d91b4a5877155af147eacb5"),
.binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/jsoncpp.xcframework.zip", checksum: "16685c0cf82d4bf55dc151a68bd16f39da25b3c490b18b5bb03598260813b132"),
.binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "ef6b8444be1b8192ac809992ef3c612c7a9b2433575aed9c82b1226ba795548b"),
.binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "ab91c658d0a2b74decf31b41cb7e3b646e075617876b30194ac008070ec0f084"),
.binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "41c0c58bec4b24a4675046612a29919ce20c45e282afc692bda836923a56227c"),
.binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "016ed39e0faac000b7e4aecde513c81e24cae086bf27b3d6c8c1773b262ceee2"),
.binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/libOpen3D.a.xcframework.zip", checksum: "d48577e5319df093e39ca192b7b40e7b3cb6a528841d5018ab93046259279a8b"),
.binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/png.xcframework.zip", checksum: "0888b349a6bf034cf4f66a57180c25de93a64a2fc3125bd5231251f3602b08d9"),
.binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/pybind.a.xcframework.zip", checksum: "b408e1b47c9acf868b54efaa929afae8a69bac8906e717fb4335d8d8f01c4269"),
.binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131091120/TBB.xcframework.zip", checksum: "366d733654fd04bbd4b3215984162fc5ee3187257ad4917646a98a4af697c9b7"),
.target(
name: "LinkOpen3D",
dependencies: [
Expand All @@ -54,7 +54,7 @@ let package = Package(
"IrrXML",
"JPEG",
"jsoncpp",
"libOpen3D_3rdparty_lzf.a",
"libOpen3D_3rdparty_liblzf.a",
"libOpen3D_3rdparty_qhull_r.a",
"libOpen3D_3rdparty_qhullcpp.a",
"libOpen3D_3rdparty_rply.a",
Expand Down
6 changes: 3 additions & 3 deletions Package.swift.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
"IrrXML",
"JPEG",
"jsoncpp",
"libOpen3D_3rdparty_lzf.a",
"libOpen3D_3rdparty_liblzf.a",
"libOpen3D_3rdparty_qhull_r.a",
"libOpen3D_3rdparty_qhullcpp.a",
"libOpen3D_3rdparty_rply.a",
Expand All @@ -36,7 +36,7 @@ let package = Package(
.binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/IrrXML.xcframework.zip", checksum: "IrrXML.xcframework_CHECKSUM"),
.binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/JPEG.xcframework.zip", checksum: "JPEG.xcframework_CHECKSUM"),
.binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/jsoncpp.xcframework.zip", checksum: "jsoncpp.xcframework_CHECKSUM"),
.binaryTarget(name: "libOpen3D_3rdparty_lzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/libOpen3D_3rdparty_lzf.a.xcframework.zip", checksum: "libOpen3D_3rdparty_lzf.a.xcframework_CHECKSUM"),
.binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "libOpen3D_3rdparty_liblzf.a.xcframework_CHECKSUM"),
.binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "libOpen3D_3rdparty_qhull_r.a.xcframework_CHECKSUM"),
.binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "libOpen3D_3rdparty_qhullcpp.a.xcframework_CHECKSUM"),
.binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/TAG/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "libOpen3D_3rdparty_rply.a.xcframework_CHECKSUM"),
Expand All @@ -54,7 +54,7 @@ let package = Package(
"IrrXML",
"JPEG",
"jsoncpp",
"libOpen3D_3rdparty_lzf.a",
"libOpen3D_3rdparty_liblzf.a",
"libOpen3D_3rdparty_qhull_r.a",
"libOpen3D_3rdparty_qhullcpp.a",
"libOpen3D_3rdparty_rply.a",
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ If you want to build XCFrameworks yourself, see https://github.com/kewlbear/Open
## License

MIT

3 changes: 1 addition & 2 deletions Sources/Open3DSupport/site-packages/open3d/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,10 @@
"binding library.", ImportWarning)

if __DEVICE_API__ == 'cpu':
from open3d.cpu.pybind import (camera, geometry, io, pipelines, utility, t)
from open3d.cpu.pybind import (camera, geometry, io, pipelines, utility)
from open3d.cpu import pybind

import open3d.core
import open3d.visualization

__version__ = "0.14.1+69d3cc5"

Expand Down
Binary file modified Sources/Open3DSupport/site-packages/open3d/cpu/pybind.cpython-38-darwin.so
View file
Binary file not shown.

0 comments on commit 9b9939f

Please sign in to comment.