Merge c820b46 into 42f5a64

kewlbear · Jan 30, 2022 · 6370216 · 6370216
2 parents 42f5a64 + c820b46
commit 6370216
Show file tree

Hide file tree

Showing 4 changed files with 22 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.20220130133238/Assimp.xcframework.zip", checksum: "a15382facdded78d267ba1786659b887cf29397fd3efaca81b1d42713fc4593a"),
+        .binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/Faiss.xcframework.zip", checksum: "ae0bf061428d5845afa7ec291c0fa36a0d8f9dc94ec3310beea1034582379c28"),
+        .binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/IrrXML.xcframework.zip", checksum: "02717796e2ec6654e9354d87024b3265a9fdfad9005c928d68adf7efb82b2643"),
+        .binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/JPEG.xcframework.zip", checksum: "2736f59e4023e467f9b907742660f2c487fddc26cfcccced1e1989a06fdfec7f"),
+        .binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/jsoncpp.xcframework.zip", checksum: "cbd0723eccd251c773b7ec2e1e7ea13e300c3718e8a8b862e7d794c7a0480c7e"),
+        .binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "3c779b25f3972b16a52f0c3bd83d22422224196271db7f8cbb2cc84039cabf93"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "e293838fb2e4351ef0a656b4d83735a753292e8f0d43c8e89b47a145afa04a0c"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "db7f93168e31688ece98e05cb020e148e60269bba42c0fa121aaddf07b8115d1"),
+        .binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "a1aeca12d3ec3df401696a856c606b22e3de311f9c1c5af04913dacd02b5761a"),
+        .binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/libOpen3D.a.xcframework.zip", checksum: "01d958ca81e2fe4fe72e67743937fe7ed1c755179da02919a7ea7be9ac0b9424"),
+        .binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/png.xcframework.zip", checksum: "639c7887674db16b7a41de488d2f143fb80f46136078eb4959c39db16c220fd8"),
+        .binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/pybind.a.xcframework.zip", checksum: "e8cc78e942a9053959043cc9e44caa7d4d46d0fa6ff6e94077bdbb29dcb9e7f2"),
+        .binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220130133238/TBB.xcframework.zip", checksum: "366407202bd95bf80bc68a01466ef21dd7f015f7ef53239675185fc5045fec08"),
         .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,6 @@ 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,6 @@ If you want to build XCFrameworks yourself, see https://github.com/kewlbear/Open

		MIT