Merge ac5656d into 42f5a64

kewlbear · Jan 31, 2022 · 51acc27 · 51acc27
2 parents 42f5a64 + ac5656d
commit 51acc27
Show file tree

Hide file tree

Showing 4 changed files with 25 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.20220131053146/Assimp.xcframework.zip", checksum: "54eaae9547ffc761a2de6bed843cda79c7cb4eeaaf633f612560f513acc0f0a1"),
+        .binaryTarget(name: "Faiss", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/Faiss.xcframework.zip", checksum: "0baeb45886e2a6d1542487f063f80bc24cef07599a20147b1afb40d558d7dbd3"),
+        .binaryTarget(name: "IrrXML", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/IrrXML.xcframework.zip", checksum: "453d536acf795de3040c3f2a5216cf7ed8b7045be9c95db232f55dd34f720811"),
+        .binaryTarget(name: "JPEG", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/JPEG.xcframework.zip", checksum: "8f9ed218e2f23b4a10c78bd775ac3cae3864b7b4e177e97a2f03b41b3b348416"),
+        .binaryTarget(name: "jsoncpp", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/jsoncpp.xcframework.zip", checksum: "53c1a20175d7f87abdb62cd0b022bb38b7cded857ced1cfe7f2fe3f592dbb77d"),
+        .binaryTarget(name: "libOpen3D_3rdparty_liblzf.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/libOpen3D_3rdparty_liblzf.a.xcframework.zip", checksum: "aac9395eede0e9f059e1fcfd3b18f049f077e1486b89688d27f4d4a8e7f418d7"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhull_r.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/libOpen3D_3rdparty_qhull_r.a.xcframework.zip", checksum: "083ea1b64f6cca5b0554f49108d5aacf5f69c89266145de37ee604837b4d895e"),
+        .binaryTarget(name: "libOpen3D_3rdparty_qhullcpp.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/libOpen3D_3rdparty_qhullcpp.a.xcframework.zip", checksum: "714dedc82b76c8dc97c0a4801aca62383433822425357fca0b924abba86e398b"),
+        .binaryTarget(name: "libOpen3D_3rdparty_rply.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/libOpen3D_3rdparty_rply.a.xcframework.zip", checksum: "e33dd789859ba96905e3b8f8077c50993761385154606c3ae6c98677f60f9c90"),
+        .binaryTarget(name: "libOpen3D.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/libOpen3D.a.xcframework.zip", checksum: "fca753fdfca3a192304bdc1e57261e795fc2b9c38570591512691e191fdf68bb"),
+        .binaryTarget(name: "png", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/png.xcframework.zip", checksum: "5affb9cc1f2187cc7bda69f7bf58da71c28310d1fe0efc678562241acef5bf71"),
+        .binaryTarget(name: "pybind.a", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/pybind.a.xcframework.zip", checksum: "409e6e884d9099c2bc1d4e4802e10b742eddf58ec69bbf6698ae91e6d3288608"),
+        .binaryTarget(name: "TBB", url: "https://github.com/kewlbear/Open3D-iOS/releases/download/0.0.20220131053146/TBB.xcframework.zip", checksum: "0fa830c8ad6a2a3528b219faca827374e8351fa0f4cfe6068b7c475460a716d9"),
         .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,9 @@ 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,9 @@ If you want to build XCFrameworks yourself, see https://github.com/kewlbear/Open

		MIT