Merge bf3ce51 into 42f5a64

kewlbear · Jan 31, 2022 · 8f8bbfa · 8f8bbfa
2 parents 42f5a64 + bf3ce51
commit 8f8bbfa
Show file tree

Hide file tree

Showing 4 changed files with 23 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.20220130165142/Assimp.xcframework.zip", checksum: "b2f21f234f51ec2142f2630515044c6feb3140a608257159d622ee2b18e69b9d"),
+        .binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/Faiss.xcframework.zip", checksum: "c8301408e0997edb1cb1f194df61f115bdc85160c78c8c451d8e4cfbf7b82d15"),
+        .binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/IrrXML.xcframework.zip", checksum: "89d58c772ad221b2e8e27b1a1fdb9dc24745e87bc0e1669109b677cae6e329f8"),
+        .binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/JPEG.xcframework.zip", checksum: "a6d1b8a5889ecf6b738f222e1a6b8e7282b82160d59cfe5543c98f40a4eb2665"),
+        .binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/jsoncpp.xcframework.zip", checksum: "b19b127790c60ae58302654a0868b5a356a8e0cf5b120d429cf9e8413cdefd36"),
+        .binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "e6c5ccef45063640c16bbc9abf6fc6951973f159d2a3aca489d6ad63a801568c"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "cccaa59f50964a9ceae24963ca2f9db32a0ab85f5f7ba0ceda06dc350a56753d"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "32334851095773ccf330173eca01e9eecf21038af4e03199bfde86bcea85e71a"),
+        .binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "f088f0804d8dd17f980421675524080577f351c372a0c8fc7ea19e3fda4e4e44"),
+        .binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/libOpen3D.a.xcframework.zip", checksum: "fb226c826977ce4e7558c70f7cae76eccde60687318a1ce3241ca3f8191238b8"),
+        .binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/png.xcframework.zip", checksum: "9896b8671f2f4eefbf0dafe36d63478c09b1306acf3ba8cda3f3a18c23a710fe"),
+        .binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/pybind.a.xcframework.zip", checksum: "632a9b6f3366e73927f5669cb5fa76279b44a0af152bdc04e41df6864d756143"),
+        .binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130165142/TBB.xcframework.zip", checksum: "270b7e564b1cea1985d0f08b6de6efcbcc652392296bc4fb7915ca0ad3d05c1a"),
         .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,7 @@ 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,7 @@ If you want to build XCFrameworks yourself, see https://github.com/kewlbear/Open

		MIT