Merge 5ad7b10 into 42f5a64

kewlbear · Jan 31, 2022 · 62f1768 · 62f1768
2 parents 42f5a64 + 5ad7b10
commit 62f1768
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/Package.swift b/Package.swift
@@ -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",
@@ -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.20220131031249/Assimp.xcframework.zip", checksum: "a6a65d6b4215953bcae26f75bee5d47d49c30b08f8ba4537bf9b32c9757bcf23"),
+        .binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/Faiss.xcframework.zip", checksum: "967edc509c5d873661a413ab8c5027cdfe4eee7385e5ead3309f918bd122397a"),
+        .binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/IrrXML.xcframework.zip", checksum: "8b61273601063754d0a9166e9b21bd541c77f122d25c42bdf7db114a76072cbb"),
+        .binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/JPEG.xcframework.zip", checksum: "d67fe2e051742bd11b9b7f133f710c37e47123c6d7aa7e2ad778dd4e801fa9b2"),
+        .binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/jsoncpp.xcframework.zip", checksum: "256365c335f8e73f8262c3a94f585bb62c4ef74e1c3e775285f078c33abf42b0"),
+        .binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "023bf1332cdb299435586c0efad851bf73a0b0b22af7e10ffe66335e7ec43e0f"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "1227fbfedd2975e4575fb8ebd477f4892f09e0277e2fb27fe27fe87000b31a1a"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "e0be183cb58e6dc37cbc493c80223a0532cc53704be18991867e0a4e54bc3b57"),
+        .binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "2195ca7e116768fe9d6de70686d807f48fc49425401bd34f09e8cd6576e506b8"),
+        .binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/libOpen3D.a.xcframework.zip", checksum: "70d4c0e08eba0340b036c4c35a63f8153235d9e99250994455d4451784e23a0e"),
+        .binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/png.xcframework.zip", checksum: "0250df2cd826433de5a2766c8d5ae47979b2404c4c8d3a181e1c502f97a2f6ba"),
+        .binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/pybind.a.xcframework.zip", checksum: "9124a2611ffd68956b69791d68ff7c0f39db7496d833077d01e5f6be57096a69"),
+        .binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131031249/TBB.xcframework.zip", checksum: "516d7681a057ededad89d39a54e50c54a517791ee3b9dfb311e7c4a262f000f1"),
         .target(
             name: "LinkOpen3D",
             dependencies: [
@@ -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",

diff --git a/Package.swift.in b/Package.swift.in
@@ -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",
@@ -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"),
@@ -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",

diff --git a/README.md b/README.md
@@ -31,3 +31,8 @@ If you want to build XCFrameworks yourself, see https://github.com/kewlbear/Open
 
 MIT
 
+
+
+
+
+
diff --git a/Sources/Open3DSupport/site-packages/open3d/__init__.py b/Sources/Open3DSupport/site-packages/open3d/__init__.py
@@ -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"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,3 +31,8 @@ If you want to build XCFrameworks yourself, see https://github.com/kewlbear/Open

		MIT