open3d-ml main branch in bundle open3d_ml, style fix

isl-org · Dec 10, 2023 · 609bbda · 609bbda
1 parent 531f9e9
commit 609bbda
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/cpp/open3d/core/Indexer.isph b/cpp/open3d/core/Indexer.isph
@@ -106,23 +106,23 @@ static inline uint8_t* Indexer_GetWorkloadDataPtr(
 /// Get data pointer from a TensorRef with \p workload_idx.
 /// Note: can be optimized by computing all input ptrs and output ptr
 /// together.
-#define TEMPLATE(T)                                                     \
-    static inline T* OPEN3D_SPECIALIZED(T, Indexer_GetWorkloadDataPtr)( \
-            const uniform Indexer* const uniform self,                  \
-            const uniform TensorRef* const uniform tr,                  \
-            uniform bool tr_contiguous, int64_t workload_idx) {         \
-        cif(workload_idx < 0) { return NULL; }                          \
-        if (tr_contiguous) {                                            \
-            return (T*)(tr->data_ptr_) + workload_idx;                  \
-        } else {                                                        \
-            int64_t offset = 0;                                         \
-            for (uniform int64_t i = 0; i < self->ndims_; ++i) {        \
+#define TEMPLATE(T)                                                      \
+    static inline T* OPEN3D_SPECIALIZED(T, Indexer_GetWorkloadDataPtr)(  \
+            const uniform Indexer* const uniform self,                   \
+            const uniform TensorRef* const uniform tr,                   \
+            uniform bool tr_contiguous, int64_t workload_idx) {          \
+        cif(workload_idx < 0) { return NULL; }                           \
+        if (tr_contiguous) {                                             \
+            return (T*)(tr->data_ptr_) + workload_idx;                   \
+        } else {                                                         \
+            int64_t offset = 0;                                          \
+            for (uniform int64_t i = 0; i < self->ndims_; ++i) {         \
                 offset += workload_idx / self->primary_strides_[i] *     \
-                          tr->byte_strides_[i];                         \
+                          tr->byte_strides_[i];                          \
                 workload_idx = workload_idx % self->primary_strides_[i]; \
-            }                                                           \
-            return (T*)((uint8_t*)(tr->data_ptr_) + offset);            \
-        }                                                               \
+            }                                                            \
+            return (T*)((uint8_t*)(tr->data_ptr_) + offset);             \
+        }                                                                \
     }
 #pragma ignore warning(perf)
 OPEN3D_INSTANTIATE_TEMPLATE_WITH_BOOL()

diff --git a/cpp/pybind/CMakeLists.txt b/cpp/pybind/CMakeLists.txt
@@ -171,6 +171,8 @@ if (BUNDLE_OPEN3D_ML)
         open3d_ml
         PREFIX "${CMAKE_BINARY_DIR}/open3d_ml"
         GIT_REPOSITORY "${OPEN3D_ML_ROOT}"
+        GIT_TAG origin/main
+        GIT_SHALLOW
         BUILD_IN_SOURCE ON
         # do not configure
         CONFIGURE_COMMAND ""

diff --git a/cpp/tests/core/Indexer.cpp b/cpp/tests/core/Indexer.cpp
@@ -67,7 +67,8 @@ TEST_P(IndexerPermuteDevices, IndexerCopyConstructor) {
     EXPECT_EQ(indexer_a.GetOutput(), indexer_b.GetOutput());
     EXPECT_EQ(indexer_a.NumDims(), indexer_b.NumDims());
     for (int64_t i = 0; i < indexer_a.NumDims(); i++) {
-        EXPECT_EQ(indexer_a.GetPrimaryShape()[i], indexer_b.GetPrimaryShape()[i]);
+        EXPECT_EQ(indexer_a.GetPrimaryShape()[i],
+                  indexer_b.GetPrimaryShape()[i]);
         EXPECT_EQ(indexer_a.GetPrimaryStrides()[i],
                   indexer_b.GetPrimaryStrides()[i]);
         EXPECT_EQ(indexer_a.IsReductionDim(i), indexer_b.IsReductionDim(i));