Skip to content

Commit

Permalink
Merge 76699ab 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 + 76699ab commit 237a407
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 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.20220206023744/Assimp.xcframework.zip", checksum: "cb2b4d91af98e2481d9f473c7d09e79e5fa728fc6b444b9200deb6c804a0a477"),
.binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/Faiss.xcframework.zip", checksum: "4ca48de4d65fd217c0d6388d15e89cbb9d0f005e83249778e56012525283d947"),
.binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/IrrXML.xcframework.zip", checksum: "55f84bc1c9a81af697d7ad04486350a710afaa11468e1e497e6c28ef37c0e6f4"),
.binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/JPEG.xcframework.zip", checksum: "53d141000084f1e0b4165d65630708e839ebb110f3c1e37ee9ed8039a1956886"),
.binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/jsoncpp.xcframework.zip", checksum: "7943e0adbc72969478204592105c6f979ee9210ac49b5083086dac133867931e"),
.binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "3f21a4d26f8a5342b22d02cd72aa985939fa25cfcc59ca50df786b839590d96f"),
.binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "1128c1e68ea26d3cb4c0e470366684f040e58875632a462854254e5d626dc848"),
.binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "6f09736638b2fea8510ec4d1fa066a5fff4cb58140ee65fbde4196e1410f5bd3"),
.binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "3ca5e242c33745ff278f5eec25bcd2a5ab26ced6bd23e0c292f0fdb8f0d17013"),
.binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/libOpen3D.a.xcframework.zip", checksum: "0aca86e0f3bcdd99dc051399ffa2ab3f95bc99d601e918028a85c20c23e038a0"),
.binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/png.xcframework.zip", checksum: "994d13b7e89e4767c6d0942e82a6c6dc9a927698ee1644524d22967382d60d99"),
.binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/pybind.a.xcframework.zip", checksum: "e37a2b02ac5f09d0f5a6d051307e662fd03f692cb28610a3bcd3e15c33daeb22"),
.binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220206023744/TBB.xcframework.zip", checksum: "a75134d02719ee8fd647b69e52ea99b08bbdd3294195131ac92da99f247f131e"),
.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
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 237a407

Please sign in to comment.